Changeset 71910a for molecuilder/src/linkedcell.cpp

Timestamp:

Apr 7, 2010, 3:45:38 PM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

0f55b2

Parents:

770138

Message:

Made data internal data-structure of vector class private

• Replaced occurences of access to internals with operator
• moved Vector-class into LinAlg-Module
• Reworked Vector to allow clean modularization
• Added Plane class to describe arbitrary planes in 3d space

File:

• molecuilder/src/linkedcell.cpp (modified) (9 diffs)

molecuilder/src/linkedcell.cpp

@@ -54 +54 @@
   Walker = set->GetPoint();
   for (int i=0;i<NDIM;i++) {
-    max.x[i] = Walker->node->x[i];
-    min.x[i] = Walker->node->x[i];
+    max[i] = Walker->node->at(i);
+    min[i] = Walker->node->at(i);
   }
   set->GoToFirst();
@@ -61 +61 @@
     Walker = set->GetPoint();
     for (int i=0;i<NDIM;i++) {
-      if (max.x[i] < Walker->node->x[i])
-        max.x[i] = Walker->node->x[i];
-      if (min.x[i] > Walker->node->x[i])
-        min.x[i] = Walker->node->x[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);
     }
     set->GoToNext();
@@ -72 +72 @@
   // 2. find then number of cells per axis
   for (int i=0;i<NDIM;i++) {
-    N[i] = (int)floor((max.x[i] - min.x[i])/RADIUS)+1;
+    N[i] = static_cast<int>(floor((max[i] - min[i])/RADIUS)+1);
   }
   Log() << Verbose(2) << "Number of cells per axis are " << N[0] << ", " << N[1] << " and " << N[2] << "." << endl;
@@ -94 +94 @@
     Walker = set->GetPoint();
     for (int i=0;i<NDIM;i++) {
-      n[i] = (int)floor((Walker->node->x[i] - min.x[i])/RADIUS);
+      n[i] = static_cast<int>(floor((Walker->node->at(i) - min[i])/RADIUS));
     }
     index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
@@ -128 +128 @@
   LinkedNodes::iterator Runner = set->begin();
   for (int i=0;i<NDIM;i++) {
-    max.x[i] = (*Runner)->node->x[i];
-    min.x[i] = (*Runner)->node->x[i];
+    max[i] = (*Runner)->node->at(i);
+    min[i] = (*Runner)->node->at(i);
   }
   for (LinkedNodes::iterator Runner = set->begin(); Runner != set->end(); Runner++) {
     Walker = *Runner;
     for (int i=0;i<NDIM;i++) {
-      if (max.x[i] < Walker->node->x[i])
-        max.x[i] = Walker->node->x[i];
-      if (min.x[i] > Walker->node->x[i])
-        min.x[i] = Walker->node->x[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);
     }
   }
@@ -144 +144 @@
   // 2. find then number of cells per axis
   for (int i=0;i<NDIM;i++) {
-    N[i] = (int)floor((max.x[i] - min.x[i])/RADIUS)+1;
+    N[i] = static_cast<int>(floor((max[i] - min[i])/RADIUS)+1);
   }
   Log() << Verbose(2) << "Number of cells per axis are " << N[0] << ", " << N[1] << " and " << N[2] << "." << endl;
@@ -165 +165 @@
     Walker = *Runner;
     for (int i=0;i<NDIM;i++) {
-      n[i] = (int)floor((Walker->node->x[i] - min.x[i])/RADIUS);
+      n[i] = static_cast<int>(floor((Walker->node->at(i) - min[i])/RADIUS));
     }
     index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
@@ -252 +252 @@
   bool status = false;
   for (int i=0;i<NDIM;i++) {
-    n[i] = (int)floor((Walker->node->x[i] - min.x[i])/RADIUS);
+    n[i] = static_cast<int>(floor((Walker->node->at(i) - min[i])/RADIUS));
   }
   index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2];
@@ -293 +293 @@
   bool status = true;
   for (int i=0;i<NDIM;i++) {
-    n[i] = (int)floor((x->x[i] - min.x[i])/RADIUS);
-    if (max.x[i] < x->x[i])
+    n[i] = static_cast<int>(floor((x->at(i) - min[i])/RADIUS));
+    if (max[i] < x->at(i))
       status = false;
-    if (min.x[i] > x->x[i])
+    if (min[i] > x->at(i))
       status = false;
   }