deleted call function to CFFD to highlight the working principle

Author: guglielmopadula

pygem/cffd.py

@@ -82,7 +82,7 @@ def __init__(self, n_control_points=None, fun=None, fixval=None, weight_matrix=N
         if weight_matrix==None:
             self.weight_matrix=np.eye(np.sum(self.mask.astype(int)))
 
-    def __call__(self, src_pts):
+    def adjust_control_points(self,src_pts):
         saved_parameters = self._save_parameters()
         indices=np.arange(np.prod(self.n_control_points)*3)[self.mask.reshape(-1)]
         A, b = self._compute_linear_map(src_pts, saved_parameters.copy(),indices)
@@ -91,7 +91,6 @@ def __call__(self, src_pts):
         deltax = np.linalg.multi_dot([invM , A.T , np.linalg.inv(np.linalg.multi_dot([A, invM, A.T])) , (self.fixval - d)])
         saved_parameters[indices] = saved_parameters[indices] + deltax
         self._load_parameters(saved_parameters)
-        return self.ffd(src_pts)
 
     def ffd(self, src_pts):
         '''

pygem/vffd.py

@@ -71,7 +71,7 @@ def volume(x):
 
         self.fun = volume
 
-    def __call__(self, src_pts):
+    def adjust_control_points(self, src_pts):
         self.vweight = np.abs(self.vweight) / np.sum(np.abs(self.vweight))
         mask_bak=self.mask.copy()        
         diffvolume = self.fixval - self.fun(self.ffd(src_pts))
@@ -81,7 +81,5 @@ def __call__(self, src_pts):
             self.weight_matrix = np.eye(np.sum(self.mask.astype(int)))
             self.fixval = self.fun(
                 self.ffd(src_pts)) + self.vweight[i] * (diffvolume)
-            _ = super().__call__(src_pts)
-        tmp = super().__call__(src_pts)
-        self.mask = mask_bak
-        return tmp
+            super().adjust_control_points(src_pts)
+   

tests/test_bffd.py

@@ -14,7 +14,8 @@ def test_nothing_happens(self):
         A = np.random.rand(3, original_mesh_points.reshape(-1).shape[0])
         b = cffd.fun(original_mesh_points)
         cffd.fixval = b
-        new_mesh_points = cffd(original_mesh_points)
+        cffd.adjust_control_points(original_mesh_points)
+        new_mesh_points = cffd.ffd(original_mesh_points)
         assert np.array_equal(original_mesh_points, new_mesh_points)
 
     def test_constraint(self):
@@ -26,6 +27,7 @@ def test_constraint(self):
             "tests/test_datasets/meshpoints_sphere_orig.npy")
         b = cffd.fun(original_mesh_points)
         cffd.fixval = b
-        new_mesh_points = cffd(original_mesh_points)
+        cffd.adjust_control_points(original_mesh_points)
+        new_mesh_points = cffd.ffd(original_mesh_points)
         assert np.isclose(np.linalg.norm(cffd.fun(new_mesh_points) - b),
                           np.array([0.0]))

tests/test_cffd.py

@@ -34,7 +34,8 @@ def fun(x):
         b = fun(original_mesh_points)
         cffd.fun = fun
         cffd.fixval = b
-        new_mesh_points = cffd(original_mesh_points)
+        cffd.adjust_control_points(original_mesh_points)
+        new_mesh_points = cffd.ffd(original_mesh_points)
         assert np.array_equal(original_mesh_points, new_mesh_points)
 
     def test_constraint(self):
@@ -53,7 +54,8 @@ def fun(x):
         b = fun(original_mesh_points)
         cffd.fun = fun
         cffd.fixval = b
-        new_mesh_points = cffd(original_mesh_points)
+        cffd.adjust_control_points(original_mesh_points)
+        new_mesh_points = cffd.ffd(original_mesh_points)
         assert np.isclose(np.linalg.norm(fun(new_mesh_points) - b),
                           np.array([0.0]),atol=1e-7)
 

tests/test_vffd.py

@@ -38,7 +38,8 @@ def test_nothing_happens(self):
         cffd.vweight = np.array([1 / 3, 1 / 3, 1 / 3])
         b = cffd.fun(points)
         cffd.fixval = np.array([b])
-        new_mesh_points = cffd(points)
+        cffd.adjust_control_points(points)
+        new_mesh_points = cffd.ffd(points)
         assert np.allclose(np.linalg.norm(points - new_mesh_points), 0.0)
 
     def test_constraint(self):
@@ -74,6 +75,7 @@ def test_constraint(self):
         cffd.read_parameters(
             "tests/test_datasets/parameters_test_ffd_sphere.prm")
         cffd.fixval = np.array([b])
-        new_mesh_points = cffd(points)
+        cffd.adjust_control_points(points)
+        new_mesh_points = cffd.ffd(points)
         assert np.isclose(np.linalg.norm(cffd.fun(new_mesh_points) - b),
                           np.array([0.0]))