From 774625853d47c9cd4c8ea88f1d18b823f9958467 Mon Sep 17 00:00:00 2001
From: Justin Lin <caterpillar@openhome.cc>
Date: Thu, 2 Apr 2020 07:36:42 +0800
Subject: [PATCH] rename

---
 .../_impl/{_nz_cells_impl.scad => _nz_cell_impl.scad}       | 4 ++--
 .../demo/{nz_cells_demo.scad => nz_cell_demo.scad}          | 6 +++---
 src/experimental/nz_cell.scad                               | 5 +++++
 src/experimental/nz_cells.scad                              | 5 -----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename src/experimental/_impl/{_nz_cells_impl.scad => _nz_cell_impl.scad} (91%)
 rename src/experimental/demo/{nz_cells_demo.scad => nz_cell_demo.scad} (72%)
 create mode 100644 src/experimental/nz_cell.scad
 delete mode 100644 src/experimental/nz_cells.scad

diff --git a/src/experimental/_impl/_nz_cells_impl.scad b/src/experimental/_impl/_nz_cell_impl.scad
similarity index 91%
rename from src/experimental/_impl/_nz_cells_impl.scad
rename to src/experimental/_impl/_nz_cell_impl.scad
index aed978b6..cd9b08c7 100644
--- a/src/experimental/_impl/_nz_cells_impl.scad
+++ b/src/experimental/_impl/_nz_cell_impl.scad
@@ -6,7 +6,7 @@ function _manhattan(v) = sum([for(d = v) abs(d)]);
 function _chebyshev(p1, p2) =
     max([for(i = [0:len(p1) - 1]) abs(p1[i] - p2[i])]); 
 
-function _nz_cells_classic(cells, p, dist) =
+function _nz_cell_classic(cells, p, dist) =
     let(
         dists = [
             for(i = [0:len(cells) - 1])
@@ -18,7 +18,7 @@ function _nz_cells_classic(cells, p, dist) =
     )
     min(dists); 
 
-function _nz_cells_border(cells, p) =
+function _nz_cell_border(cells, p) =
     let(
         dists = [
             for(i = [0:len(cells) - 1])
diff --git a/src/experimental/demo/nz_cells_demo.scad b/src/experimental/demo/nz_cell_demo.scad
similarity index 72%
rename from src/experimental/demo/nz_cells_demo.scad
rename to src/experimental/demo/nz_cell_demo.scad
index 87f72b64..1efbf336 100644
--- a/src/experimental/demo/nz_cells_demo.scad
+++ b/src/experimental/demo/nz_cell_demo.scad
@@ -1,4 +1,4 @@
-use <experimental/nz_cells.scad>;
+use <experimental/nz_cell.scad>;
 use <golden_spiral.scad>;
 
 size = [100, 50];
@@ -10,11 +10,11 @@ pts_angles = golden_spiral(
     point_distance = 3
 );
 
-cells = [for(pt_angle = pts_angles) pt_angle[0] + half_size];
+feature_points = [for(pt_angle = pts_angles) pt_angle[0] + half_size];
 noised = [
     for(y = [0:size[1] - 1]) 
         for(x = [0:size[0] - 1]) 
-            [x, y, nz_cells(cells, [x, y])]
+            [x, y, nz_cell(feature_points, [x, y])]
 ];
 
 max_dist = max([for(n = noised) n[2]]);
diff --git a/src/experimental/nz_cell.scad b/src/experimental/nz_cell.scad
new file mode 100644
index 00000000..d5302b9f
--- /dev/null
+++ b/src/experimental/nz_cell.scad
@@ -0,0 +1,5 @@
+use <experimental/_impl/_nz_cell_impl.scad>;
+    
+function nz_cell(points, p, dist = "euclidean") =
+    dist == "border" ? _nz_cell_border(points, p) :
+                       _nz_cell_classic(points, p, dist); 
\ No newline at end of file
diff --git a/src/experimental/nz_cells.scad b/src/experimental/nz_cells.scad
deleted file mode 100644
index c06035a6..00000000
--- a/src/experimental/nz_cells.scad
+++ /dev/null
@@ -1,5 +0,0 @@
-use <experimental/_impl/_nz_cells_impl.scad>;
-    
-function nz_cells(cells, p, dist = "euclidean") =
-    dist == "border" ? _nz_cells_border(cells, p) :
-                       _nz_cells_classic(cells, p, dist); 
\ No newline at end of file