Changeset ef5521 for molecuilder

Timestamp:

Aug 7, 2009, 12:46:27 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

609e48

Parents:

0fc0b5

Message:

BUGFIX: PointCloud implementation in molecule stopped one before last, IsLast() -> IsEnd()

• PointCloud function rename: IsLast() -> IsEnd()
• molecule::GoToNext() goes till end, not till end->previous

Location:

molecuilder/src

Files:

• linkedcell.cpp (modified) (2 diffs)
• molecules.cpp (modified) (2 diffs)
• molecules.hpp (modified) (1 diff)
• tesselation.cpp (modified) (2 diffs)
• tesselation.hpp (modified) (1 diff)

molecuilder/src/linkedcell.cpp

@@ -54 +54 @@
   }
   set->GoToFirst();
-  while (!set->IsLast()) {
+  while (!set->IsEnd()) {
     Walker = set->GetPoint();
     for (int i=0;i<NDIM;i++) {
@@ -87 +87 @@
   cout << Verbose(2) << "Filling cells ... ";
   set->GoToFirst();
-  while (!set->IsLast()) {
+  while (!set->IsEnd()) {
     Walker = set->GetPoint();
     for (int i=0;i<NDIM;i++) {

molecuilder/src/molecules.cpp

@@ -124 +124 @@
 void molecule::GoToNext()
 {
-  if (InternalPointer->next != end)
+  if (InternalPointer != end)
     InternalPointer = InternalPointer->next;
 };
@@ -162 +162 @@
  * \return true - current atom is last one, false - is not last one
  */
-bool molecule::IsLast()
-{
-  return (InternalPointer->next == end);
+bool molecule::IsEnd()
+{
+  return (InternalPointer == end);
 };
 

molecuilder/src/molecules.hpp

@@ -150 +150 @@
   void GoToLast();
   bool IsEmpty();
-  bool IsLast();
+  bool IsEnd();
 
   /// remove atoms from molecule.

molecuilder/src/tesselation.cpp

@@ -912 +912 @@
 
   cloud->GoToFirst();
-  while (!cloud->IsLast()) {  // we only have to go once through all points, as boundary can become only bigger
+  while (!cloud->IsEnd()) {  // we only have to go once through all points, as boundary can become only bigger
     Walker = cloud->GetPoint();
     *out << Verbose(2) << "Current point is " << *Walker << "." << endl;
@@ -1325 +1325 @@
   cout << Verbose(0) << "Begin of Find_next_suitable_triangle\n";
   bool result = true;
-  bool degenerateTriangle = false;
   CandidateList *Opt_Candidates = new CandidateList();
 

molecuilder/src/tesselation.hpp

@@ -163 +163 @@
   virtual void GoToLast() {};
   virtual bool IsEmpty() { return false; };
-  virtual bool IsLast() { return false; };
+  virtual bool IsEnd() { return false; };
 };