Orb: my_volume -> orb_volume.

Author: unhyperbolic

src/snappy/extensions/Orb/cython_src/Orb.pxi

@@ -16,7 +16,6 @@ cdef extern from "SnapPea.h":
     extern void free_triangulation(c_Triangulation *manifold) except *
 
     extern c_SolutionType find_structure(c_Triangulation *manifold, Boolean) except *
-    extern Real my_volume(c_Triangulation *manifold, Boolean * ok) except *
 
     extern int get_num_cusps(c_Triangulation *manifold) except *
     extern int get_num_or_cusps(c_Triangulation *manifold) except *
@@ -31,6 +30,7 @@ cdef extern from "Orb.h":
         c_Triangulation * manifold,
         int singular_index,
         double singular_order) except *
+    extern Real orb_volume(c_Triangulation *manifold, Boolean * ok) except *
 
 cdef extern from "kernel_prototypes.h":
     extern void remove_finite_vertices(c_Triangulation *manifold)

src/snappy/extensions/Orb/cython_src/core/orbifold.pyx

@@ -43,4 +43,4 @@ cdef class Orbifold(OrbTriangulation):
 
         find_structure(self.c_triangulation, False)
 
-        return self._number_(Real2Number(my_volume(self.c_triangulation, &ok)))
+        return self._number_(Real2Number(orb_volume(self.c_triangulation, &ok)))

src/snappy/extensions/Orb/kernel/code/my_identify_solution_type.c

@@ -80,13 +80,13 @@ void my_identify_solution_type(
 		return;
 	}
 
-	if (my_solution_is_geometric(manifold) && my_volume(manifold, &ok) > VOLUME_EPSILON )
+	if (my_solution_is_geometric(manifold) && orb_volume(manifold, &ok) > VOLUME_EPSILON )
 	{
 		manifold->solution_type[filled] = geometric_solution;
 		return;
 	}
 
-	if (my_volume(manifold, &ok) > VOLUME_EPSILON)
+	if (orb_volume(manifold, &ok) > VOLUME_EPSILON)
 	{
 		manifold->solution_type[filled] = nongeometric_solution;
 		return;

…y/extensions/Orb/kernel/code/my_volume.c …/extensions/Orb/kernel/code/orb_volume.csrc/snappy/extensions/Orb/kernel/code/my_volume.c renamed to src/snappy/extensions/Orb/kernel/code/orb_volume.c src/snappy/extensions/Orb/kernel/code/my_volume.c renamed to src/snappy/extensions/Orb/kernel/code/orb_volume.c

@@ -6,7 +6,7 @@ static Complex U( Complex z, double *angles, Boolean *ok );
 
 /* Volume computed using formula in "A volume forumla for generalized hyperbolic tetrahedra" by Ushijima */
 
-extern double my_volume( Triangulation *manifold, Boolean *ok )
+extern double orb_volume( Triangulation *manifold, Boolean *ok )
 {
   Tetrahedron *tet;
   double       volume=0,angles[6], tet_vol=0;
@@ -28,7 +28,7 @@ extern double my_volume( Triangulation *manifold, Boolean *ok )
 		if (!flat_tet(tet))
 		{	
 			*ok = FALSE;
-			uFatalError("my_volume", "my_volume");
+			uFatalError("orb_volume", "orb_volume");
 		}
 	}
 

src/snappy/extensions/Orb/kernel/headers/Orb.h

@@ -5,14 +5,29 @@
 
 SNAPPEA_NAMESPACE_BEGIN_SCOPE
 
-void get_singular_orders(Triangulation	*manifold,
+/************************************************************************/
+/*                                                                      */
+/*                            orb_interface.c                           */
+/*                                                                      */
+/************************************************************************/
+
+extern void get_singular_orders(Triangulation *manifold,
                          int * num_singular_arcs,
                          double ** singular_orders);
 
-void set_singular_order(Triangulation *manifold,
+extern void set_singular_order(Triangulation *manifold,
                         int singular_index,
                         double singular_order);
 
+/************************************************************************/
+/*                                                                      */
+/*                              orb_volume.c                            */
+/*                                                                      */
+/************************************************************************/
+
+extern double tetrahedron_volume(double *angles, Boolean *ok);
+extern double orb_volume(Triangulation *manifold, Boolean *ok);
+
 SNAPPEA_NAMESPACE_END_SCOPE
 
 #endif

src/snappy/extensions/Orb/kernel/headers/SnapPea.h

@@ -2573,8 +2573,6 @@ extern void two_bridge(	Triangulation *manifold,
 /************************************************************************/
 
 extern double volume(Triangulation *manifold, int *precision);
-extern double my_volume(Triangulation *manifold, Boolean *ok ); /* DJH */
-extern double  tetrahedron_volume(double *angles, Boolean *ok ); /* DJH */
 /*
  *	Computes and returns the volume of the manifold.
  *	If the pointer "precision" is not NULL, estimates the number