added regression tests

Author: oesteban

nipype/algorithms/mesh.py

@@ -20,6 +20,7 @@
 
 from ..interfaces.base import (BaseInterface, traits, TraitedSpec, File,
                                BaseInterfaceInputSpec)
+from warnings import warn
 iflogger = logging.getLogger('interface')
 
 
@@ -87,7 +88,7 @@ def _triangle_area(self, A, B, C):
     def _run_interface(self, runtime):
         from numpy import linalg as nla
         try:
-            from tvtk.api import tvtk, write_data
+            from tvtk.api import tvtk
         except ImportError:
             raise ImportError('Interface ComputeMeshWarp requires tvtk')
 
@@ -173,6 +174,6 @@ class P2PDistance(ComputeMeshWarp):
 
     def __init__(self, **inputs):
         super(P2PDistance, self).__init__(**inputs)
-        warnings.warn(("This interface has been deprecated since 1.0,"
-                       " please use nipype.algorithms.metrics.Distance"),
-                      DeprecationWarning)
+        warn(('This interface has been deprecated since 1.0, please use '
+              'ComputeMeshWarp'),
+             DeprecationWarning)

nipype/algorithms/tests/test_mesh_ops.py

@@ -15,20 +15,63 @@
 
 from nipype.algorithms import mesh as m
 
+notvtk = True
+try:
+    from tvtk.api import tvtk
+    notvtk = False
+except ImportError:
+    pass
 
-def test_distances():
+
+def test_ident_distances():
     tempdir = mkdtemp()
+    curdir = os.getcwd()
+    os.chdir(tempdir)
     in_surf = example_data('surf01.vtk')
 
-    dist_ident = m.P2PDistance()
+    dist_ident = m.ComputeMeshWarp()
     dist_ident.inputs.surface1 = in_surf
     dist_ident.inputs.surface2 = in_surf
     dist_ident.inputs.out_file = os.path.join(tempdir, 'distance.npy')
     res = dist_ident.run()
-    yield assert_equal, res.outputs.distance, 0.0
+    yield assert_equal, res.outputs.distance == 0.0
+
+    dist_ident.inputs.weighting = 'area'
+    res = dist_ident.run()
+    yield assert_equal, res.outputs.distance == 0.0
+
+    os.chdir(curdir)
+    rmtree(tempdir)
+
+
+@skipif(notvtk)
+def test_trans_distances():
+    tempdir = mkdtemp()
+    in_surf = example_data('surf01.vtk')
+    warped_surf = os.path.join(tempdir, 'warped.vtk')
+
+    curdir = os.getcwd()
+    os.chdir(tempdir)
+    inc = np.array([0.7, 0.3, -0.2])
+
+    r1 = tvtk.PolyDataReader(file_name=in_surf)
+    vtk1 = r1.output
+    r1.update()
+    vtk1.points = np.array(vtk1.points) + inc
+
+    writer = tvtk.PolyDataWriter(file_name=warped_surf)
+    writer.set_input_data(vtk1)
+    writer.write()
 
+    dist = m.ComputeMeshWarp()
+    dist.inputs.surface1 = in_surf
+    dist.inputs.surface2 = warped_surf
+    dist.inputs.out_file = os.path.join(tempdir, 'distance.npy')
+    res = dist.run()
+    yield assert_equal, np.isclose(res.outputs.distance, np.norm(inc))
     dist_ident.inputs.weighting = 'area'
     res = dist_ident.run()
-    yield assert_equal, res.outputs.distance, 0.0
+    yield assert_equal, np.isclose(res.outputs.distance, np.norm(inc))
 
+    os.chdir(curdir)
     rmtree(tempdir)