From e1e16535e7d7d1e7e5dc675278b675b5a338f338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Granstr=C3=B6m?=
 <5092565+HugoGranstrom@users.noreply.github.com>
Date: Fri, 29 Mar 2024 10:00:13 +0100
Subject: [PATCH] avoid name collisions of `meshgrid` (#42)

* avoid name collisions of `meshgrid`
---
 src/numericalnim/rbf.nim   | 2 +-
 tests/test_interpolate.nim | 8 ++++----
 tests/test_utils.nim       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/numericalnim/rbf.nim b/src/numericalnim/rbf.nim
index f9ac005..1eb7153 100644
--- a/src/numericalnim/rbf.nim
+++ b/src/numericalnim/rbf.nim
@@ -72,7 +72,7 @@ proc constructMeshedPatches*[T](grid: RbfGrid[T]): Tensor[float] =
   if grid.gridSize == 1:
     @[@[0.5].cycle(grid.gridDim)].toTensor
   else:
-    meshgrid(@[arraymancer.linspace(0 + grid.gridDelta / 2, 1 - grid.gridDelta / 2, grid.gridSize)].cycle(grid.gridDim))
+    utils.meshgrid(@[arraymancer.linspace(0 + grid.gridDelta / 2, 1 - grid.gridDelta / 2, grid.gridSize)].cycle(grid.gridDim))
 
 template dist2(p1, p2: Tensor[float]): float =
   var result = 0.0
diff --git a/tests/test_interpolate.nim b/tests/test_interpolate.nim
index 576efe5..81d92c3 100644
--- a/tests/test_interpolate.nim
+++ b/tests/test_interpolate.nim
@@ -481,12 +481,12 @@ test "Trilinear f = x*y*z T: Tensor[float]":
                check abs(spline.eval(i, j, k)[2] - 1) < 1e-16
 
 test "rbfBase f=x*y*z":
-    let pos = meshgrid(arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5))
+    let pos = numericalnim.meshgrid(arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5))
     let vals = pos[_, 0] *. pos[_, 1] *. pos[_, 2]
     let rbfObj = newRbfBase(pos, vals)
 
     # We want test points in the interior to avoid the edges
-    let xTest = meshgrid(arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10))
+    let xTest = numericalnim.meshgrid(arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10))
     let yTest = rbfObj.eval(xTest)
     let yCorrect = xTest[_, 0] *. xTest[_, 1] *. xTest[_, 2]
     for x in abs(yCorrect - yTest):
@@ -494,12 +494,12 @@ test "rbfBase f=x*y*z":
     check mean_squared_error(yTest, yCorrect) < 2e-4
     
 test "rbf f=x*y*z":
-    let pos = meshgrid(arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5))
+    let pos = numericalnim.meshgrid(arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5), arraymancer.linspace(0.0, 1.0, 5))
     let vals = pos[_, 0] *. pos[_, 1] *. pos[_, 2]
     let rbfObj = newRbf(pos, vals)
 
     # We want test points in the interior to avoid the edges
-    let xTest = meshgrid(arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10))
+    let xTest = numericalnim.meshgrid(arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10), arraymancer.linspace(0.1, 0.9, 10))
     let yTest = rbfObj.eval(xTest)
     let yCorrect = xTest[_, 0] *. xTest[_, 1] *. xTest[_, 2]
     for x in abs(yCorrect - yTest):
diff --git a/tests/test_utils.nim b/tests/test_utils.nim
index 0d832d2..97c29c1 100644
--- a/tests/test_utils.nim
+++ b/tests/test_utils.nim
@@ -88,7 +88,7 @@ test "meshgrid":
   let x = [0, 1].toTensor
   let y = [2, 3].toTensor
   let z = [4, 5].toTensor
-  let grid = meshgrid(x, y, z)
+  let grid = numericalnim.meshgrid(x, y, z)
   check grid == [[0, 2, 4], [1, 2, 4], [0, 3, 4], [1, 3, 4], [0, 2, 5], [1, 2, 5], [0, 3, 5], [1, 3, 5]].toTensor
 
 test "chi2 Tensor":