@@ -227,113 +227,3 @@ def test_dot_operator_server_fields_container(local_server):
227
227
out = add .outputs .fields_container ()
228
228
assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
229
229
assert np .allclose (out [0 ].data , - field .data )
230
-
231
-
232
- def test_add_operator_server_fields_container (local_server ):
233
- field = dpf .core .fields_factory .create_3d_vector_field (2 , server = local_server )
234
- field .data = [0.0 , 1.0 , 2.0 , 3.0 , 4.0 , 5.0 ]
235
- field .scoping .ids = [1 , 2 ]
236
-
237
- fc = dpf .core .fields_container_factory .over_time_freq_fields_container (
238
- [field , field ], server = local_server
239
- )
240
-
241
- # operator with field out
242
- forward = ops .utility .forward_field (field , server = local_server )
243
- add = fc + forward
244
- assert type (add ) == ops .math .add_fc
245
- out = add .outputs .fields_container ()
246
- assert len (out ) == 2
247
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
248
- assert np .allclose (out [0 ].data , np .array (field .data ) * 2.0 )
249
-
250
- # fc + list
251
- add = fc + [0.0 , 1.0 , 2.0 ]
252
- assert type (add ) == ops .math .add_fc
253
- out = add .outputs .fields_container ()
254
- assert len (out ) == 2
255
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
256
- assert np .allclose (out [0 ].data , field .data + np .array ([[0.0 , 1.0 , 2.0 ], [0.0 , 1.0 , 2.0 ]]))
257
-
258
- # fc + float
259
- add = fc + 1.0
260
- assert type (add ) == ops .math .add_fc
261
- out = add .outputs .fields_container ()
262
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
263
- assert np .allclose (out [0 ].data , np .array ([[1.0 , 2.0 , 3.0 ], [4.0 , 5.0 , 6.0 ]]))
264
-
265
-
266
- def test_minus_operator_server_fields_container (local_server ):
267
- field = dpf .core .fields_factory .create_3d_vector_field (2 , server = local_server )
268
- field .data = [0.0 , 1.0 , 2.0 , 3.0 , 4.0 , 5.0 ]
269
- field .scoping .ids = [1 , 2 ]
270
-
271
- fc = dpf .core .fields_container_factory .over_time_freq_fields_container (
272
- [field , field ], server = local_server
273
- )
274
-
275
- # operator with field out
276
- forward = ops .utility .forward_field (field , server = local_server )
277
- add = fc - forward
278
- assert type (add ) == ops .math .minus_fc
279
- out = add .outputs .fields_container ()
280
- assert len (out ) == 2
281
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
282
- assert np .allclose (out [0 ].data , np .zeros ((2 , 3 )))
283
-
284
- # fc - list
285
- add = fc - [0.0 , 1.0 , 2.0 ]
286
- assert type (add ) == ops .math .minus_fc
287
- out = add .outputs .fields_container ()
288
- assert len (out ) == 2
289
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
290
- assert np .allclose (out [0 ].data , np .array ([[0.0 , 0.0 , 0.0 ], [3.0 , 3.0 , 3.0 ]]))
291
-
292
- # fc - float
293
- add = fc - 1.0
294
- assert type (add ) == ops .math .minus_fc
295
- out = add .outputs .fields_container ()
296
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
297
- assert np .allclose (out [0 ].data , np .array ([[- 1.0 , 0.0 , 1.0 ], [2.0 , 3.0 , 4.0 ]]))
298
-
299
-
300
- def test_dot_operator_server_fields_container (local_server ):
301
- field = dpf .core .fields_factory .create_3d_vector_field (2 , server = local_server )
302
- field .data = [0.0 , 1.0 , 2.0 , 3.0 , 4.0 , 5.0 ]
303
- field .scoping .ids = [1 , 2 ]
304
-
305
- fc = dpf .core .fields_container_factory .over_time_freq_fields_container (
306
- [field , field ], server = local_server
307
- )
308
-
309
- # fc * op
310
- forward = ops .utility .forward_field (field , server = local_server )
311
- add = fc * forward
312
- assert type (add ) == ops .math .generalized_inner_product_fc
313
- out = add .outputs .fields_container ()
314
- assert len (out ) == 2
315
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
316
- assert np .allclose (out [0 ].data , np .array ([5.0 , 50.0 ]))
317
-
318
- # fc * field
319
- add = fc * field
320
- assert type (add ) == ops .math .generalized_inner_product_fc
321
- out = add .outputs .fields_container ()
322
- assert len (out ) == 2
323
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
324
- assert np .allclose (out [0 ].data , np .array ([5.0 , 50.0 ]))
325
-
326
- # fc * list
327
- add = fc * [0.0 , 1.0 , 2.0 ]
328
- assert type (add ) == ops .math .generalized_inner_product_fc
329
- out = add .outputs .fields_container ()
330
- assert len (out ) == 2
331
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
332
- assert np .allclose (out [0 ].data , np .array ([5.0 , 14.0 ]))
333
-
334
- # fc * float
335
- add = fc * - 1.0
336
- assert type (add ) == ops .math .generalized_inner_product_fc
337
- out = add .outputs .fields_container ()
338
- assert np .allclose (out [0 ].scoping .ids , [1 , 2 ])
339
- assert np .allclose (out [0 ].data , - field .data )
0 commit comments