Changeset a9b2a0a for molecuilder/src/ellipsoid.cpp

Timestamp:

Oct 27, 2009, 4:11:22 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

069034

Parents:

55a71b

Message:

Huge refactoring to make const what is const (ticket #38), continued.

• too many changes because of too many cross-references to be able to list them up here.
• NOTE that "make check" runs fine and did catch several error.
• note that we had to use const_iterator several times when the map, ... was declared const.
• at times we changed an allocated LinkedCell LCList(...) into

const LinkedCell *LCList;
LCList = new LinkedCell(...);

• also mutable (see ticket #5) was used, e.g. for molecule::InternalPointer (PointCloud changes are allowed, because they are just accounting).

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/ellipsoid.cpp (modified) (5 diffs)

molecuilder/src/ellipsoid.cpp

@@ -234 +234 @@
   int index;
   TesselPoint *Candidate = NULL;
-  LinkedNodes *List = NULL;
   *out << Verbose(2) << "Begin of PickRandomPointSet" << endl;
 
@@ -249 +248 @@
     *out << Verbose(2) << "INFO: Center cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " ... ";
     // get random cell
-    List = LC->GetCurrentCell();
+    const LinkedNodes *List = LC->GetCurrentCell();
     if (List == NULL) {  // set index to it
       continue;
@@ -268 +267 @@
       for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
         for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
-          List = LC->GetCurrentCell();
+          const LinkedNodes *List = LC->GetCurrentCell();
           PointsLeft += List->size();
         }
@@ -293 +292 @@
       for (LC->n[1] = Nlower[1]; LC->n[1] <= Nupper[1]; LC->n[1]++)
         for (LC->n[2] = Nlower[2]; LC->n[2] <= Nupper[2]; LC->n[2]++) {
-          List = LC->GetCurrentCell();
+          const LinkedNodes *List = LC->GetCurrentCell();
 //          *out << Verbose(2) << "Current cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points." << endl;
           if (List != NULL) {
@@ -300 +299 @@
 //            else
 //              *out << Verbose(2) << "Cell is empty ... " << endl;
-            for (LinkedNodes::iterator Runner = List->begin(); Runner != List->end(); Runner++) {
+            for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
               if ((current != PickedAtomNrs.end()) && (*current == index)) {
                 Candidate = (*Runner);