@@ -9,15 +9,15 @@ extern crate rmp_serde;
9
9
#[ cfg( feature = "ron" ) ]
10
10
extern crate ron;
11
11
12
- use ndarray:: { arr0, arr1, arr2, s, ArrayD , IxDyn , RcArray , RcArray1 , RcArray2 } ;
12
+ use ndarray:: { arr0, arr1, arr2, s, ArcArray , ArrayD , Ix2 , IxDyn } ;
13
13
14
14
#[ test]
15
15
fn serial_many_dim_serde ( ) {
16
16
{
17
17
let a = arr0 :: < f32 > ( 2.72 ) ;
18
18
let serial = serde_json:: to_string ( & a) . unwrap ( ) ;
19
19
println ! ( "Serde encode {:?} => {:?}" , a, serial) ;
20
- let res = serde_json:: from_str :: < RcArray < f32 , _ > > ( & serial) ;
20
+ let res = serde_json:: from_str :: < ArcArray < f32 , _ > > ( & serial) ;
21
21
println ! ( "{:?}" , res) ;
22
22
assert_eq ! ( a, res. unwrap( ) ) ;
23
23
}
@@ -26,7 +26,7 @@ fn serial_many_dim_serde() {
26
26
let a = arr1 :: < f32 > ( & [ 2.72 , 1. , 2. ] ) ;
27
27
let serial = serde_json:: to_string ( & a) . unwrap ( ) ;
28
28
println ! ( "Serde encode {:?} => {:?}" , a, serial) ;
29
- let res = serde_json:: from_str :: < RcArray1 < f32 > > ( & serial) ;
29
+ let res = serde_json:: from_str :: < ArcArray < f32 , _ > > ( & serial) ;
30
30
println ! ( "{:?}" , res) ;
31
31
assert_eq ! ( a, res. unwrap( ) ) ;
32
32
}
@@ -35,21 +35,21 @@ fn serial_many_dim_serde() {
35
35
let a = arr2 ( & [ [ 3. , 1. , 2.2 ] , [ 3.1 , 4. , 7. ] ] ) ;
36
36
let serial = serde_json:: to_string ( & a) . unwrap ( ) ;
37
37
println ! ( "Serde encode {:?} => {:?}" , a, serial) ;
38
- let res = serde_json:: from_str :: < RcArray2 < f32 > > ( & serial) ;
38
+ let res = serde_json:: from_str :: < ArcArray < f32 , _ > > ( & serial) ;
39
39
println ! ( "{:?}" , res) ;
40
40
assert_eq ! ( a, res. unwrap( ) ) ;
41
41
let text = r##"{"v":1,"dim":[2,3],"data":[3,1,2.2,3.1,4,7]}"## ;
42
- let b = serde_json:: from_str :: < RcArray2 < f32 > > ( text) ;
42
+ let b = serde_json:: from_str :: < ArcArray < f32 , _ > > ( text) ;
43
43
assert_eq ! ( a, b. unwrap( ) ) ;
44
44
}
45
45
46
46
{
47
47
// Test a sliced array.
48
- let mut a = RcArray :: linspace ( 0. , 31. , 32 ) . reshape ( ( 2 , 2 , 2 , 4 ) ) ;
48
+ let mut a = ArcArray :: linspace ( 0. , 31. , 32 ) . reshape ( ( 2 , 2 , 2 , 4 ) ) ;
49
49
a. slice_collapse ( s ! [ ..; -1 , .., .., ..2 ] ) ;
50
50
let serial = serde_json:: to_string ( & a) . unwrap ( ) ;
51
51
println ! ( "Encode {:?} => {:?}" , a, serial) ;
52
- let res = serde_json:: from_str :: < RcArray < f32 , _ > > ( & serial) ;
52
+ let res = serde_json:: from_str :: < ArcArray < f32 , _ > > ( & serial) ;
53
53
println ! ( "{:?}" , res) ;
54
54
assert_eq ! ( a, res. unwrap( ) ) ;
55
55
}
@@ -61,7 +61,7 @@ fn serial_ixdyn_serde() {
61
61
let a = arr0 :: < f32 > ( 2.72 ) . into_dyn ( ) ;
62
62
let serial = serde_json:: to_string ( & a) . unwrap ( ) ;
63
63
println ! ( "Serde encode {:?} => {:?}" , a, serial) ;
64
- let res = serde_json:: from_str :: < RcArray < f32 , _ > > ( & serial) ;
64
+ let res = serde_json:: from_str :: < ArcArray < f32 , _ > > ( & serial) ;
65
65
println ! ( "{:?}" , res) ;
66
66
assert_eq ! ( a, res. unwrap( ) ) ;
67
67
}
@@ -98,13 +98,13 @@ fn serial_ixdyn_serde() {
98
98
fn serial_wrong_count_serde ( ) {
99
99
// one element too few
100
100
let text = r##"{"v":1,"dim":[2,3],"data":[3,1,2.2,3.1,4]}"## ;
101
- let arr = serde_json:: from_str :: < RcArray2 < f32 > > ( text) ;
101
+ let arr = serde_json:: from_str :: < ArcArray < f32 , Ix2 > > ( text) ;
102
102
println ! ( "{:?}" , arr) ;
103
103
assert ! ( arr. is_err( ) ) ;
104
104
105
105
// future version
106
106
let text = r##"{"v":200,"dim":[2,3],"data":[3,1,2.2,3.1,4,7]}"## ;
107
- let arr = serde_json:: from_str :: < RcArray2 < f32 > > ( text) ;
107
+ let arr = serde_json:: from_str :: < ArcArray < f32 , Ix2 > > ( text) ;
108
108
println ! ( "{:?}" , arr) ;
109
109
assert ! ( arr. is_err( ) ) ;
110
110
}
@@ -120,7 +120,7 @@ fn serial_many_dim_serde_msgpack() {
120
120
. unwrap ( ) ;
121
121
122
122
let mut deserializer = rmp_serde:: Deserializer :: new ( & buf[ ..] ) ;
123
- let a_de: RcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
123
+ let a_de: ArcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
124
124
125
125
assert_eq ! ( a, a_de) ;
126
126
}
@@ -134,7 +134,7 @@ fn serial_many_dim_serde_msgpack() {
134
134
. unwrap ( ) ;
135
135
136
136
let mut deserializer = rmp_serde:: Deserializer :: new ( & buf[ ..] ) ;
137
- let a_de: RcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
137
+ let a_de: ArcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
138
138
139
139
assert_eq ! ( a, a_de) ;
140
140
}
@@ -148,14 +148,14 @@ fn serial_many_dim_serde_msgpack() {
148
148
. unwrap ( ) ;
149
149
150
150
let mut deserializer = rmp_serde:: Deserializer :: new ( & buf[ ..] ) ;
151
- let a_de: RcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
151
+ let a_de: ArcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
152
152
153
153
assert_eq ! ( a, a_de) ;
154
154
}
155
155
156
156
{
157
157
// Test a sliced array.
158
- let mut a = RcArray :: linspace ( 0. , 31. , 32 ) . reshape ( ( 2 , 2 , 2 , 4 ) ) ;
158
+ let mut a = ArcArray :: linspace ( 0. , 31. , 32 ) . reshape ( ( 2 , 2 , 2 , 4 ) ) ;
159
159
a. slice_collapse ( s ! [ ..; -1 , .., .., ..2 ] ) ;
160
160
161
161
let mut buf = Vec :: new ( ) ;
@@ -164,7 +164,7 @@ fn serial_many_dim_serde_msgpack() {
164
164
. unwrap ( ) ;
165
165
166
166
let mut deserializer = rmp_serde:: Deserializer :: new ( & buf[ ..] ) ;
167
- let a_de: RcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
167
+ let a_de: ArcArray < f32 , _ > = serde:: Deserialize :: deserialize ( & mut deserializer) . unwrap ( ) ;
168
168
169
169
assert_eq ! ( a, a_de) ;
170
170
}
@@ -181,7 +181,7 @@ fn serial_many_dim_ron() {
181
181
182
182
let a_s = ron_serialize ( & a) . unwrap ( ) ;
183
183
184
- let a_de: RcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
184
+ let a_de: ArcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
185
185
186
186
assert_eq ! ( a, a_de) ;
187
187
}
@@ -191,7 +191,7 @@ fn serial_many_dim_ron() {
191
191
192
192
let a_s = ron_serialize ( & a) . unwrap ( ) ;
193
193
194
- let a_de: RcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
194
+ let a_de: ArcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
195
195
196
196
assert_eq ! ( a, a_de) ;
197
197
}
@@ -201,19 +201,19 @@ fn serial_many_dim_ron() {
201
201
202
202
let a_s = ron_serialize ( & a) . unwrap ( ) ;
203
203
204
- let a_de: RcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
204
+ let a_de: ArcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
205
205
206
206
assert_eq ! ( a, a_de) ;
207
207
}
208
208
209
209
{
210
210
// Test a sliced array.
211
- let mut a = RcArray :: linspace ( 0. , 31. , 32 ) . reshape ( ( 2 , 2 , 2 , 4 ) ) ;
211
+ let mut a = ArcArray :: linspace ( 0. , 31. , 32 ) . reshape ( ( 2 , 2 , 2 , 4 ) ) ;
212
212
a. slice_collapse ( s ! [ ..; -1 , .., .., ..2 ] ) ;
213
213
214
214
let a_s = ron_serialize ( & a) . unwrap ( ) ;
215
215
216
- let a_de: RcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
216
+ let a_de: ArcArray < f32 , _ > = ron_deserialize ( & a_s) . unwrap ( ) ;
217
217
218
218
assert_eq ! ( a, a_de) ;
219
219
}
0 commit comments