From 9a86aba2263e4729bf0b0c396b9fc514f0ae5b3a Mon Sep 17 00:00:00 2001 From: "Josh Warner (Mac)" Date: Sun, 17 Mar 2013 08:48:32 -0500 Subject: [PATCH] rename files to conform with naming conventions --- skimage/measure/{marching_cubes.py => _marching_cubes.py} | 7 +++---- .../{_marching_cubes.pyx => _marching_cubes_cy.pyx} | 2 +- skimage/measure/setup.py | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) rename skimage/measure/{marching_cubes.py => _marching_cubes.py} (97%) rename skimage/measure/{_marching_cubes.pyx => _marching_cubes_cy.pyx} (99%) diff --git a/skimage/measure/marching_cubes.py b/skimage/measure/_marching_cubes.py similarity index 97% rename from skimage/measure/marching_cubes.py rename to skimage/measure/_marching_cubes.py index 10980580..d375c9fe 100644 --- a/skimage/measure/marching_cubes.py +++ b/skimage/measure/_marching_cubes.py @@ -1,5 +1,5 @@ import numpy as np -from . import _marching_cubes +from . import _marching_cubes_cy def marching_cubes(volume, level, sampling=(1., 1., 1.)): @@ -111,8 +111,8 @@ def marching_cubes(volume, level, sampling=(1., 1., 1.)): # Note: this algorithm is fast, but returns degenerate "triangles" which # have repeated vertices - and equivalent vertices are redundantly # placed in every triangle they connect with. - raw_tris = _marching_cubes.iterate_and_store_3d(volume, float(level), - sampling) + raw_tris = _marching_cubes_cy.iterate_and_store_3d(volume, float(level), + sampling) # Find and collect unique vertices, storing triangle verts as indices. # Removes much redundancy and eliminates degenerate "triangles". @@ -169,7 +169,6 @@ def mesh_surface_area(verts, tris): verts : list List of length-3 NumPy arrays containing vertex coordinates. Units in each dimension should be consistent. - tris : list List of length-3 lists of integers, referencing vertex coordinates as provided in `verts` diff --git a/skimage/measure/_marching_cubes.pyx b/skimage/measure/_marching_cubes_cy.pyx similarity index 99% rename from skimage/measure/_marching_cubes.pyx rename to skimage/measure/_marching_cubes_cy.pyx index be7c601f..68faa8de 100644 --- a/skimage/measure/_marching_cubes.pyx +++ b/skimage/measure/_marching_cubes_cy.pyx @@ -166,7 +166,7 @@ def iterate_and_store_3d(cnp.ndarray[double, ndim=3] arr, e3 = r0 + _get_fraction(v4, v3, level), c1, d0 e4 = r0, c0 + _get_fraction(v1, v4, level), d0 - # These must be calculated at each point uunless we implemented a + # These must be calculated at each point unless we implemented a # large, growing lookup table for all adjacent values; could save # ~30% in terms of runtime at the expense of memory usage and # much greater complexity. diff --git a/skimage/measure/setup.py b/skimage/measure/setup.py index 4b18a3a0..19d69429 100644 --- a/skimage/measure/setup.py +++ b/skimage/measure/setup.py @@ -14,13 +14,13 @@ def configuration(parent_package='', top_path=None): cython(['_find_contours.pyx'], working_path=base_path) cython(['_moments.pyx'], working_path=base_path) - cython(['_marching_cubes.pyx'], working_path=base_path) + cython(['_marching_cubes_cy.pyx'], working_path=base_path) config.add_extension('_find_contours', sources=['_find_contours.c'], include_dirs=[get_numpy_include_dirs()]) config.add_extension('_moments', sources=['_moments.c'], include_dirs=[get_numpy_include_dirs()]) - config.add_extension('_marching_cubes', sources=['_marching_cubes.c'], + config.add_extension('_marching_cubes_cy', sources=['_marching_cubes.c'], include_dirs=[get_numpy_include_dirs()]) return config