[cig-commits] r11562 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-03-26 03:27:53 -0700 (Wed, 26 Mar 2008)
New Revision: 11562

Modified:
   cs/benchmark/cigma/trunk/src/Points.cpp
   cs/benchmark/cigma/trunk/src/Points.h
Log:
Don't assume Points refers to global coords (used for refcoords as well)


Modified: cs/benchmark/cigma/trunk/src/Points.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Points.cpp	2008-03-26 10:27:52 UTC (rev 11561)
+++ cs/benchmark/cigma/trunk/src/Points.cpp	2008-03-26 10:27:53 UTC (rev 11562)
@@ -5,8 +5,8 @@
 
 cigma::Points::Points()
 {
-    num = 0;
-    dim = 0;
+    npts = 0;
+    ndim = 0;
     data = 0;
 }
 
@@ -17,11 +17,11 @@
 // ---------------------------------------------------------------------------
 
 
-void cigma::Points::set_data(double *data, int num, int dim)
+void cigma::Points::set_data(double *data, int npts, int ndim)
 {
     this->data = data;
-    this->num = num;
-    this->dim = dim;
+    this->npts = npts;
+    this->ndim = ndim;
 }
 
 void cigma::Points::set_locator(Locator *locator)
@@ -33,14 +33,14 @@
 
 // ---------------------------------------------------------------------------
 
-bool cigma::Points::find_ann_index(double *globalPoint, int *annIndex)
+bool cigma::Points::find_ann_index(double *point, int *annIndex)
 {
 
     *annIndex = -1;
 
     if (locator != 0)
     {
-        locator->search(globalPoint);
+        locator->search(point);
         *annIndex = locator->idx(0);
         return true;
     }
@@ -54,15 +54,15 @@
 
     i_min = -1;
     r2_min = std::numeric_limits<double>::infinity();
-    for (i = 0; i < num; i++)
+    for (i = 0; i < npts; i++)
     {
-        double *pt = &data[dim*i];
+        double *pt = &data[ndim*i];
 
         r2 = 0;
-        for (j = 0; j < dim; j++)
+        for (j = 0; j < ndim; j++)
         {
-            double dx[dim];
-            dx[j] = globalPoint[j] - pt[j];
+            double dx[ndim];
+            dx[j] = point[j] - pt[j];
             r2 += dx[j] * dx[j];
         }
 

Modified: cs/benchmark/cigma/trunk/src/Points.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Points.h	2008-03-26 10:27:52 UTC (rev 11561)
+++ cs/benchmark/cigma/trunk/src/Points.h	2008-03-26 10:27:53 UTC (rev 11562)
@@ -21,7 +21,7 @@
     ~Points();
 
 public:
-    void set_data(double *data, int num, int dim);
+    void set_data(double *data, int npts, int ndim);
     void set_locator(Locator *locator);
 
 public:
@@ -34,45 +34,45 @@
     int index(int i, int j) const;
 
 public:
-    int num;
-    int dim;
+    int npts;
+    int ndim;
     double *data;
 
 public:
     Locator *locator;
-    bool find_ann_index(double *globalPoint, int *annIndex);
+    bool find_ann_index(double *point, int *annIndex);
 };
 
 // ---------------------------------------------------------------------------
 
 inline double cigma::Points::operator()(int i, int j)
 {
-    //assert(0 <= i); assert(i < num);
+    //assert(0 <= i); assert(i < npts);
     //assert(0 <= j); assert(j < dim);
     return data[index(i,j)];
 }
 
 inline double *cigma::Points::operator[](int i)
 {
-    //assert(0 <= i); assert(i < num);
-    return &data[dim*i];
+    //assert(0 <= i); assert(i < npts);
+    return &data[ndim*i];
 }
 
 inline int cigma::Points::n_points() const
 {
-    return num;
+    return npts;
 }
 
 inline int cigma::Points::n_dim() const
 {
-    return dim;
+    return ndim;
 }
 
 inline int cigma::Points::index(int i, int j) const
 {
-    //assert(0 <= i); assert(i < num);
-    //assert(0 <= j); assert(j < dim);
-    return dim*i + j;
+    //assert(0 <= i); assert(i < npts);
+    //assert(0 <= j); assert(j < ndim);
+    return ndim*i + j;
 }
 
 // ---------------------------------------------------------------------------