@@ -110,15 +110,15 @@ def test_x2sys_cross_input_two_dataframes(mock_x2sys_home):
110
110
# Create pandas.DataFrame track tables
111
111
tracks = []
112
112
for i in range (2 ):
113
- np .random .seed (seed = i )
114
- track = pd .DataFrame (data = np .random . rand ( 10 , 3 ), columns = ("x" , "y" , "z" ))
113
+ rng = np .random .default_rng (seed = i )
114
+ track = pd .DataFrame (data = rng .random (( 10 , 3 ) ), columns = ("x" , "y" , "z" ))
115
115
track ["time" ] = pd .date_range (start = f"2020-{ i } 1-01" , periods = 10 , freq = "min" )
116
116
tracks .append (track )
117
117
118
118
output = x2sys_cross (tracks = tracks , tag = tag , coe = "e" )
119
119
120
120
assert isinstance (output , pd .DataFrame )
121
- assert output .shape == (30 , 12 )
121
+ assert output .shape == (26 , 12 )
122
122
columns = list (output .columns )
123
123
assert columns [:6 ] == ["x" , "y" , "t_1" , "t_2" , "dist_1" , "dist_2" ]
124
124
assert columns [6 :] == ["head_1" , "head_2" , "vel_1" , "vel_2" , "z_X" , "z_M" ]
@@ -160,16 +160,16 @@ def test_x2sys_cross_input_two_filenames(mock_x2sys_home):
160
160
161
161
# Create temporary xyz files
162
162
for i in range (2 ):
163
- np .random .seed (seed = i )
163
+ rng = np .random .default_rng (seed = i )
164
164
with open (
165
165
os .path .join (os .getcwd (), f"track_{ i } .xyz" ), mode = "w" , encoding = "utf8"
166
166
) as fname :
167
- np .savetxt (fname = fname , X = np .random . rand ( 10 , 3 ))
167
+ np .savetxt (fname = fname , X = rng .random (( 10 , 3 ) ))
168
168
169
169
output = x2sys_cross (tracks = ["track_0.xyz" , "track_1.xyz" ], tag = tag , coe = "e" )
170
170
171
171
assert isinstance (output , pd .DataFrame )
172
- assert output .shape == (24 , 12 )
172
+ assert output .shape == (18 , 12 )
173
173
columns = list (output .columns )
174
174
assert columns [:6 ] == ["x" , "y" , "i_1" , "i_2" , "dist_1" , "dist_2" ]
175
175
assert columns [6 :] == ["head_1" , "head_2" , "vel_1" , "vel_2" , "z_X" , "z_M" ]
0 commit comments