Changeset cc6dfb for molecuilder

Timestamp:

May 9, 2008, 2:38:27 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

0e348e

Parents:

0716ff4

Message:

CyclicStructureAnalysis(): forget to check whether we actually have found rings or not (only then MinimumRingSize needs to be checked for non-set neighbours also)

File:

• molecuilder/src/molecules.cpp (modified) (1 diff)

molecuilder/src/molecules.cpp ¶

@@ -1735 +1735 @@
     }
   }
-  // go over all atoms 
-  Root = start;
-  while(Root->next != end) {
-    Root = Root->next;
+  if (MinRingSize != -1) {
+    // go over all atoms 
+    Root = start;
+    while(Root->next != end) {
+      Root = Root->next;
+      
+      if (MinimumRingSize[Root->GetTrueFather()->nr] == AtomCount) { // check whether MinimumRingSize is set, if not BFS to next where it is
+        ShortestPathList[Walker->nr] = 0;
+        BFSStack->ClearStack();  // start with empty BFS stack
+        BFSStack->Push(Walker);
+        TouchedStack->Push(Walker);
+        //*out << Verbose(1) << "---------------------------------------------------------------------------------------------------------" << endl;
+        OtherAtom = Walker;
+        while ((Walker != Root) && (OtherAtom != NULL)) {  // look for Root
+          Walker = BFSStack->PopFirst();
+          //*out << Verbose(2) << "Current Walker is " << *Walker << ", we look for SP to Root " << *Root << "." << endl;
+          for(int i=0;i<NumberOfBondsPerAtom[Walker->nr];i++) {
+            Binder = ListOfBondsPerAtom[Walker->nr][i];
+            if (Binder != BackEdge) { // only walk along DFS spanning tree (otherwise we always find SP of one being backedge Binder)
+              OtherAtom = Binder->GetOtherAtom(Walker);
+              //*out << Verbose(2) << "Current OtherAtom is: " << OtherAtom->Name << " for bond " << *Binder << "." << endl;
+              if (ColorList[OtherAtom->nr] == white) {
+                TouchedStack->Push(OtherAtom);
+                ColorList[OtherAtom->nr] = lightgray;
+                PredecessorList[OtherAtom->nr] = Walker;  // Walker is the predecessor
+                ShortestPathList[OtherAtom->nr] = ShortestPathList[Walker->nr]+1;
+                //*out << Verbose(2) << "Coloring OtherAtom " << OtherAtom->Name << " lightgray, its predecessor is " << Walker->Name << " and its Shortest Path is " << ShortestPathList[OtherAtom->nr] << " egde(s) long." << endl;
+                if (MinimumRingSize[OtherAtom->GetTrueFather()->nr] != AtomCount) { // if the other atom is connected to a ring
+                  MinimumRingSize[Root->GetTrueFather()->nr] = ShortestPathList[OtherAtom->nr]+MinimumRingSize[OtherAtom->GetTrueFather()->nr];
+                  OtherAtom = NULL; //break;
+                  break;
+                } else
+                  BFSStack->Push(OtherAtom);
+              } else {
+                //*out << Verbose(3) << "Not Adding, has already been visited." << endl;
+              }
+            } else {
+              //*out << Verbose(3) << "Not Visiting, is a back edge." << endl;
+            }
+          }
+          ColorList[Walker->nr] = black;
+          //*out << Verbose(1) << "Coloring Walker " << Walker->Name << " black." << endl; 
+        }
     
-    if (MinimumRingSize[Root->GetTrueFather()->nr] == AtomCount) { // check whether MinimumRingSize is set, if not BFS to next where it is
-      ShortestPathList[Walker->nr] = 0;
-      BFSStack->ClearStack();  // start with empty BFS stack
-      BFSStack->Push(Walker);
-      TouchedStack->Push(Walker);
-      //*out << Verbose(1) << "---------------------------------------------------------------------------------------------------------" << endl;
-      OtherAtom = Walker;
-      while ((Walker != Root) && (OtherAtom != NULL)) {  // look for Root
-        Walker = BFSStack->PopFirst();
-        //*out << Verbose(2) << "Current Walker is " << *Walker << ", we look for SP to Root " << *Root << "." << endl;
-        for(int i=0;i<NumberOfBondsPerAtom[Walker->nr];i++) {
-          Binder = ListOfBondsPerAtom[Walker->nr][i];
-          if (Binder != BackEdge) { // only walk along DFS spanning tree (otherwise we always find SP of one being backedge Binder)
-            OtherAtom = Binder->GetOtherAtom(Walker);
-            //*out << Verbose(2) << "Current OtherAtom is: " << OtherAtom->Name << " for bond " << *Binder << "." << endl;
-            if (ColorList[OtherAtom->nr] == white) {
-              TouchedStack->Push(OtherAtom);
-              ColorList[OtherAtom->nr] = lightgray;
-              PredecessorList[OtherAtom->nr] = Walker;  // Walker is the predecessor
-              ShortestPathList[OtherAtom->nr] = ShortestPathList[Walker->nr]+1;
-              //*out << Verbose(2) << "Coloring OtherAtom " << OtherAtom->Name << " lightgray, its predecessor is " << Walker->Name << " and its Shortest Path is " << ShortestPathList[OtherAtom->nr] << " egde(s) long." << endl;
-              if (MinimumRingSize[OtherAtom->GetTrueFather()->nr] != AtomCount) { // if the other atom is connected to a ring
-                MinimumRingSize[Root->GetTrueFather()->nr] = ShortestPathList[OtherAtom->nr]+MinimumRingSize[OtherAtom->GetTrueFather()->nr];
-                OtherAtom = NULL; //break;
-                break;
-              } else
-                BFSStack->Push(OtherAtom);
-            } else {
-              //*out << Verbose(3) << "Not Adding, has already been visited." << endl;
-            }
-          } else {
-            //*out << Verbose(3) << "Not Visiting, is a back edge." << endl;
-          }
+        // now clean the lists
+        while (!TouchedStack->IsEmpty()){
+          Walker = TouchedStack->PopFirst();
+          PredecessorList[Walker->nr] = NULL;
+          ShortestPathList[Walker->nr] = -1;
+          ColorList[Walker->nr] = white;
         }
-        ColorList[Walker->nr] = black;
-        //*out << Verbose(1) << "Coloring Walker " << Walker->Name << " black." << endl; 
-      }
-
-      // now clean the lists
-      while (!TouchedStack->IsEmpty()){
-        Walker = TouchedStack->PopFirst();
-        PredecessorList[Walker->nr] = NULL;
-        ShortestPathList[Walker->nr] = -1;
-        ColorList[Walker->nr] = white;
-      }
-    }
-    *out << Verbose(1) << "Minimum ring size of " << *Root << " is " << MinimumRingSize[Root->GetTrueFather()->nr] << "." << endl;
-  }
-  
-        
-  if (MinRingSize != -1)
+      }
+      *out << Verbose(1) << "Minimum ring size of " << *Root << " is " << MinimumRingSize[Root->GetTrueFather()->nr] << "." << endl;
+    }
     *out << Verbose(1) << "Minimum ring size is " << MinRingSize << ", over " << NumCycles << " cycles total." << endl;
-  else
+  } else
     *out << Verbose(1) << "No rings were detected in the molecular structure." << endl;