Renaming two subroutines in C ABI.

- `newton_refine` -> `newton_refine_curve` - `elevate_nodes` -> `elevate_nodes_curve`
dhermes · Nov 8, 2017 · 194ce95 · 194ce95
1 parent a4ccb2b
commit 194ce95
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/bezier/_curve.pxd b/src/bezier/_curve.pxd
@@ -33,13 +33,13 @@ cdef extern from "bezier/curve.h":
     void subdivide_nodes_curve(
         int *num_nodes, int *dimension, double *nodes,
         double *left_nodes, double *right_nodes)
-    void newton_refine(
+    void newton_refine_curve(
         int *num_nodes, int *dimension, double *nodes,
         double *point, double *s, double *updated_s)
     void locate_point_curve(
         int *num_nodes, int *dimension, double *nodes,
         double *point, double *s_approx)
-    void elevate_nodes(
+    void elevate_nodes_curve(
         int *num_nodes, int *dimension, double *nodes, double *elevated)
     void get_curvature(
         int *num_nodes, int *dimension, double *nodes, double *tangent_vec,

diff --git a/src/bezier/_curve_speedup.c b/src/bezier/_curve_speedup.c
diff --git a/src/bezier/_curve_speedup.pyx b/src/bezier/_curve_speedup.pyx
@@ -144,7 +144,7 @@ def newton_refine(
     num_nodes, dimension = np.shape(nodes)
     # NOTE: We don't check that ``np.shape(point) == (1, dimension)``.
 
-    bezier._curve.newton_refine(
+    bezier._curve.newton_refine_curve(
         &num_nodes,
         &dimension,
         &nodes[0, 0],
@@ -187,7 +187,7 @@ def elevate_nodes(double[::1, :] nodes):
     num_nodes, dimension = np.shape(nodes)
     elevated = np.empty((num_nodes + 1, dimension), order='F')
 
-    bezier._curve.elevate_nodes(
+    bezier._curve.elevate_nodes_curve(
         &num_nodes,
         &dimension,
         &nodes[0, 0],

diff --git a/src/bezier/curve.f90 b/src/bezier/curve.f90
@@ -367,7 +367,7 @@ end subroutine subdivide_nodes
 
   subroutine newton_refine( &
        num_nodes, dimension_, nodes, point, s, updated_s) &
-       bind(c, name='newton_refine')
+       bind(c, name='newton_refine_curve')
 
     integer(c_int), intent(in) :: num_nodes, dimension_
     real(c_double), intent(in) :: nodes(num_nodes, dimension_)
@@ -558,7 +558,7 @@ end subroutine locate_point
 
   subroutine elevate_nodes( &
        num_nodes, dimension_, nodes, elevated) &
-       bind(c, name='elevate_nodes')
+       bind(c, name='elevate_nodes_curve')
 
     integer(c_int), intent(in) :: num_nodes, dimension_
     real(c_double), intent(in) :: nodes(num_nodes, dimension_)

diff --git a/src/bezier/include/bezier/curve.h b/src/bezier/include/bezier/curve.h
@@ -35,13 +35,13 @@ void evaluate_hodograph(
 void subdivide_nodes_curve(
     int *num_nodes, int *dimension, double *nodes,
     double *left_nodes, double *right_nodes);
-void newton_refine(
+void newton_refine_curve(
     int *num_nodes, int *dimension, double *nodes,
     double *point, double *s, double *updated_s);
 void locate_point_curve(
     int *num_nodes, int *dimension, double *nodes,
     double *point, double *s_approx);
-void elevate_nodes(
+void elevate_nodes_curve(
     int *num_nodes, int *dimension, double *nodes, double *elevated);
 void get_curvature(
     int *num_nodes, int *dimension, double *nodes, double *tangent_vec,