diff --git a/test/test_arcs.py b/test/test_arcs.py index c9859e724..084986151 100644 --- a/test/test_arcs.py +++ b/test/test_arcs.py @@ -53,19 +53,19 @@ def test_pt_within_gcr(self): _lonlat_rad_to_xyz(0.0, -1.5) ] pt_same_lon_in = _lonlat_rad_to_xyz(0.0, 0.0) - self.assertTrue(point_within_gca(pt_same_lon_in, gcr_same_lon_cart)) + self.assertTrue(point_within_gca(np.asarray(pt_same_lon_in), np.asarray(gcr_same_lon_cart))) pt_same_lon_out = _lonlat_rad_to_xyz(0.0, 1.500000000000001) - res = point_within_gca(pt_same_lon_out, gcr_same_lon_cart) + res = point_within_gca(np.asarray(pt_same_lon_out), np.asarray(gcr_same_lon_cart)) self.assertFalse(res) pt_same_lon_out_2 = _lonlat_rad_to_xyz(0.1, 1.0) - res = point_within_gca(pt_same_lon_out_2, gcr_same_lon_cart) + res = point_within_gca(np.asarray(pt_same_lon_out_2), np.asarray(gcr_same_lon_cart)) self.assertFalse(res) # And if we increase the digital place by one, it should be true again pt_same_lon_out_add_one_place = _lonlat_rad_to_xyz(0.0, 1.5000000000000001) - res = point_within_gca(pt_same_lon_out_add_one_place, gcr_same_lon_cart) + res = point_within_gca(np.asarray(pt_same_lon_out_add_one_place), np.asarray(gcr_same_lon_cart)) self.assertTrue(res) # Normal case @@ -76,7 +76,7 @@ def test_pt_within_gcr(self): -0.997]]) pt_cart_within = np.array( [0.25616109352676675, 0.9246590335292105, -0.010021496695000144]) - self.assertTrue(point_within_gca(pt_cart_within, gcr_cart_2, True)) + self.assertTrue(point_within_gca(np.asarray(pt_cart_within), np.asarray(gcr_cart_2), True)) # Test other more complicate cases : The anti-meridian case @@ -87,16 +87,16 @@ def test_pt_within_gcr_antimeridian(self): gcr_cart = np.array([[0.351, -0.724, 0.593], [0.617, 0.672, 0.410]]) pt_cart = np.array( [0.9438777657502077, 0.1193199333436068, 0.922714737029319]) - self.assertTrue(point_within_gca(pt_cart, gcr_cart, is_directed=True)) + self.assertTrue(point_within_gca(np.asarray(pt_cart), np.asarray(gcr_cart), is_directed=True)) # If we swap the gcr, it should throw a value error since it's larger than 180 degree gcr_cart_flip = np.array([[0.617, 0.672, 0.410], [0.351, -0.724, 0.593]]) with self.assertRaises(ValueError): - point_within_gca(pt_cart, gcr_cart_flip, is_directed=True) + point_within_gca(np.asarray(pt_cart), np.asarray(gcr_cart_flip), is_directed=True) # If we flip the gcr in the undirected mode, it should still work self.assertTrue( - point_within_gca(pt_cart, gcr_cart_flip, is_directed=False)) + point_within_gca(np.asarray(pt_cart), np.asarray(gcr_cart_flip), is_directed=False)) # 2nd anti-meridian case # GCR vertex0 in radian : [4.104711496596806, 0.5352983676533828], @@ -107,9 +107,9 @@ def test_pt_within_gcr_antimeridian(self): pt_cart_within = np.array( [0.6136726305712109, 0.28442243941920053, -0.365605190899831]) self.assertFalse( - point_within_gca(pt_cart_within, gcr_cart_1, is_directed=True)) + point_within_gca(np.asarray(pt_cart_within), np.asarray(gcr_cart_1), is_directed=True)) self.assertFalse( - point_within_gca(pt_cart_within, gcr_cart_1, is_directed=False)) + point_within_gca(np.asarray(pt_cart_within), np.asarray(gcr_cart_1), is_directed=False)) # The first case should not work and the second should work v1_rad = [0.1, 0.0] @@ -119,10 +119,10 @@ def test_pt_within_gcr_antimeridian(self): gcr_cart = np.array([v1_cart, v2_cart]) pt_cart = _lonlat_rad_to_xyz(0.01, 0.0) with self.assertRaises(ValueError): - point_within_gca(pt_cart, gcr_cart, is_directed=True) + point_within_gca(np.asarray(pt_cart), np.asarray(gcr_cart), is_directed=True) gcr_car_flipped = np.array([v2_cart, v1_cart]) self.assertTrue( - point_within_gca(pt_cart, gcr_car_flipped, is_directed=True)) + point_within_gca(np.asarray(pt_cart), np.asarray(gcr_car_flipped), is_directed=True)) def test_pt_within_gcr_cross_pole(self): gcr_cart = np.array([[0.351, 0.0, 0.3], [-0.351, 0.0, 0.3]])