Changes in src/linkedcell.cpp [952f38:97b825]

File:

• src/linkedcell.cpp (modified) (11 diffs)

src/linkedcell.cpp

@@ -21 +21 @@
 /** Constructor for class LinkedCell.
  */
-LinkedCell::LinkedCell()
-{
-  LC = NULL;
+LinkedCell::LinkedCell() :
+  LC(NULL),
+  index(-1),
+  RADIUS(0.)
+{
   for(int i=0;i<NDIM;i++)
     N[i] = 0;
-  index = -1;
-  RADIUS = 0.;
   max.Zero();
   min.Zero();
@@ -36 +36 @@
  * \param RADIUS edge length of cells
  */
-LinkedCell::LinkedCell(const PointCloud * const set, const double radius)
+LinkedCell::LinkedCell(const PointCloud * const set, const double radius) :
+  RADIUS(radius),
+  LC(NULL),
+  index(-1)
 {
   TesselPoint *Walker = NULL;
 
-  RADIUS = radius;
-  LC = NULL;
   for(int i=0;i<NDIM;i++)
     N[i] = 0;
-  index = -1;
   max.Zero();
   min.Zero();
@@ -56 +56 @@
   Walker = set->GetPoint();
   for (int i=0;i<NDIM;i++) {
-    max[i] = Walker->node->at(i);
-    min[i] = Walker->node->at(i);
+    max[i] = Walker->at(i);
+    min[i] = Walker->at(i);
   }
   set->GoToFirst();
@@ -63 +63 @@
     Walker = set->GetPoint();
     for (int i=0;i<NDIM;i++) {
-      if (max[i] < Walker->node->at(i))
-        max[i] = Walker->node->at(i);
-      if (min[i] > Walker->node->at(i))
-        min[i] = Walker->node->at(i);
+      if (max[i] < Walker->at(i))
+        max[i] = Walker->at(i);
+      if (min[i] > Walker->at(i))
+        min[i] = Walker->at(i);
     }
     set->GoToNext();
@@ -96 +96 @@
     Walker = set->GetPoint();
     for (int i=0;i<NDIM;i++) {
-      n[i] = static_cast<int>(floor((Walker->node->at(i) - min[i])/RADIUS));
+      n[i] = static_cast<int>(floor((Walker->at(i) - min[i])/RADIUS));
     }
     index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
@@ -112 +112 @@
  * \param RADIUS edge length of cells
  */
-LinkedCell::LinkedCell(LinkedNodes *set, const double radius)
+LinkedCell::LinkedCell(LinkedNodes *set, const double radius) :
+  RADIUS(radius),
+  LC(NULL),
+  index(-1)
 {
   class TesselPoint *Walker = NULL;
-  RADIUS = radius;
-  LC = NULL;
   for(int i=0;i<NDIM;i++)
     N[i] = 0;
-  index = -1;
   max.Zero();
   min.Zero();
@@ -130 +130 @@
   LinkedNodes::iterator Runner = set->begin();
   for (int i=0;i<NDIM;i++) {
-    max[i] = (*Runner)->node->at(i);
-    min[i] = (*Runner)->node->at(i);
+    max[i] = (*Runner)->at(i);
+    min[i] = (*Runner)->at(i);
   }
   for (LinkedNodes::iterator Runner = set->begin(); Runner != set->end(); Runner++) {
     Walker = *Runner;
     for (int i=0;i<NDIM;i++) {
-      if (max[i] < Walker->node->at(i))
-        max[i] = Walker->node->at(i);
-      if (min[i] > Walker->node->at(i))
-        min[i] = Walker->node->at(i);
+      if (max[i] < Walker->at(i))
+        max[i] = Walker->at(i);
+      if (min[i] > Walker->at(i))
+        min[i] = Walker->at(i);
     }
   }
@@ -167 +167 @@
     Walker = *Runner;
     for (int i=0;i<NDIM;i++) {
-      n[i] = static_cast<int>(floor((Walker->node->at(i) - min[i])/RADIUS));
+      n[i] = static_cast<int>(floor((Walker->at(i) - min[i])/RADIUS));
     }
     index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
@@ -248 +248 @@
  * \return Vector is inside bounding box - true, else - false
  */
-bool LinkedCell::SetIndexToVector(const Vector * const x) const
+bool LinkedCell::SetIndexToVector(const Vector & x) const
 {
   for (int i=0;i<NDIM;i++)
-    n[i] = (int)floor((x->at(i) - min[i])/RADIUS);
+    n[i] = (int)floor((x.at(i) - min[i])/RADIUS);
 
   return CheckBounds();
@@ -264 +264 @@
   bool status = false;
   for (int i=0;i<NDIM;i++) {
-    n[i] = static_cast<int>(floor((Walker->node->at(i) - min[i])/RADIUS));
+    n[i] = static_cast<int>(floor((Walker->at(i) - min[i])/RADIUS));
   }
   index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
@@ -404 +404 @@
       Walker = *Runner;
       //Log() << Verbose(1) << "Current neighbour is at " << *Walker->node << "." << endl;
-      if ((center->DistanceSquared(*Walker->node) - radiusSquared) < MYEPSILON) {
+      if ((Walker->DistanceSquared(*center) - radiusSquared) < MYEPSILON) {
         TesselList->push_back(Walker);
       }