COMP: Changed GraphSearchNode to avoid being self-referential.

gandreadis · Jun 4, 2010 · 023a1d7 · 023a1d7
1 parent 2c0c1ee
commit 023a1d7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Temporary/itkFEMDiscConformalMap.cxx b/Temporary/itkFEMDiscConformalMap.cxx
@@ -157,7 +157,7 @@ ::ExtractSurfaceDisc()
 
 // assign scalars to the original surface mesh
 
-  typedef itk::SurfaceMeshCurvature<GraphSearchNode, GraphSearchNode> surfktype;
+  typedef itk::SurfaceMeshCurvature<GraphSearchNodeType, GraphSearchNodeType> surfktype;
   typename surfktype::Pointer surfk = surfktype::New();
 
   vtkPoints*     vtkpoints = m_SurfaceMesh->GetPoints();
@@ -530,7 +530,7 @@ void  FEMDiscConformalMap<TSurface, TImage, TDimension>::MakeFlatImage()
 template <typename TSurface, typename TImage, unsigned int TDimension>
 void  FEMDiscConformalMap<TSurface, TImage, TDimension>::BuildOutputMeshes(float tval)
 {
-  typedef GraphSearchNode::NodeLocationType loctype;
+  typedef GraphSearchNodeType::NodeLocationType loctype;
   // Get the number of points in the mesh
   int numPoints = m_Solver.node.size();
 
@@ -1060,7 +1060,7 @@ ::MapToSquare()
   float minv = 9.e9;
   float maxu = 0;
   float maxv = 0;
-  typedef itk::SurfaceMeshCurvature<GraphSearchNode, GraphSearchNode> surfktype;
+  typedef itk::SurfaceMeshCurvature<GraphSearchNodeType, GraphSearchNodeType> surfktype;
   typename surfktype::Pointer surfk = surfktype::New();
 
   float         totallengthdistortion = 0.;
@@ -1150,7 +1150,7 @@ ::ConjugateHarmonic()
     // then perform integration to the given point.  this set its V value.
     int pathsz=manifoldIntegrator->GetPathSize();
     float intval=0.0;
-    typedef GraphSearchNode::NodeLocationType loctype;
+    typedef GraphSearchNodeType::NodeLocationType loctype;
     for (int j=pathsz-2; j>=0; j--)
     {
       loctype delt=manifoldIntegrator->GetPathAtIndex(j+1)->GetLocation()-
@@ -1178,7 +1178,7 @@ ::ConjugateHarmonic()
   float maxu = 0;
   float maxv = 0;
 
-  typedef itk::SurfaceMeshCurvature<GraphSearchNode, GraphSearchNode> surfktype;
+  typedef itk::SurfaceMeshCurvature<GraphSearchNodeType, GraphSearchNodeType> surfktype;
   typename surfktype::Pointer surfk = surfktype::New();
 
   //    for (int DER=0; DER<4; DER++)

diff --git a/Temporary/itkFEMDiscConformalMap.h b/Temporary/itkFEMDiscConformalMap.h
@@ -119,13 +119,13 @@ class FEMDiscConformalMap : public ProcessObject
     FixedVectorType;
   typedef vnl_matrix<double> MatrixType;
 
-  typedef  Image<float, 2>                               FlatImageType;
-  typedef  typename FlatImageType::Pointer               FlatImageTypePointer;
-  typedef  GraphSearchNode<float, float, 3>              GraphSearchNode;
-  typedef  typename GraphSearchNode::Pointer             GraphSearchNodePointer;
-  typedef  typename GraphSearchNode::NodeLocationType    NodeLocationType;
-  typedef  ManifoldIntegrationAlgorithm<GraphSearchNode> ManifoldIntegratorType;
-//  typedef  TriangulatedDijkstrasAlgorithm<GraphSearchNode>  ManifoldIntegratorType;
+  typedef  Image<float, 2>                                   FlatImageType;
+  typedef  typename FlatImageType::Pointer                   FlatImageTypePointer;
+  typedef  GraphSearchNode<float, float, 3>                  GraphSearchNodeType;
+  typedef  typename GraphSearchNodeType::Pointer             GraphSearchNodePointer;
+  typedef  typename GraphSearchNodeType::NodeLocationType    NodeLocationType;
+  typedef  ManifoldIntegrationAlgorithm<GraphSearchNodeType> ManifoldIntegratorType;
+//  typedef  TriangulatedDijkstrasAlgorithm<GraphSearchNodeType>  ManifoldIntegratorType;
   typedef  typename ManifoldIntegratorType::Pointer ManifoldIntegratorTypePointer;
 
   /** FEM types */