Changes in src/molecule_graph.cpp [68f03d:e5ad5c]

File:

• src/molecule_graph.cpp (modified) (60 diffs)

src/molecule_graph.cpp

@@ -17 +17 @@
 #include "memoryallocator.hpp"
 #include "molecule.hpp"
-#include "World.hpp"
-#include "Helpers/fast_functions.hpp"
 
 struct BFSAccounting
@@ -60 +58 @@
 
   if (!input) {
-    DoLog(1) && (Log() << Verbose(1) << "Opening silica failed \n");
+    Log() << Verbose(1) << "Opening silica failed \n";
   };
 
   *input >> ws >> atom1;
   *input >> ws >> atom2;
-  DoLog(1) && (Log() << Verbose(1) << "Scanning file\n");
+  Log() << Verbose(1) << "Scanning file\n";
   while (!input->eof()) // Check whether we read everything already
   {
@@ -108 +106 @@
   LinkedCell *LC = NULL;
   bool free_BG = false;
-  double * const cell_size = World::getInstance().getDomain();
 
   if (BG == NULL) {
@@ -116 +113 @@
 
   BondDistance = bonddistance; // * ((IsAngstroem) ? 1. : 1./AtomicLengthToAngstroem);
-  DoLog(0) && (Log() << Verbose(0) << "Begin of CreateAdjacencyList." << endl);
+  Log() << Verbose(0) << "Begin of CreateAdjacencyList." << endl;
   // remove every bond from the list
   bond *Binder = NULL;
@@ -129 +126 @@
   // count atoms in molecule = dimension of matrix (also give each unique name and continuous numbering)
   CountAtoms();
-  DoLog(1) && (Log() << Verbose(1) << "AtomCount " << AtomCount << " and bonddistance is " << bonddistance << "." << endl);
+  Log() << Verbose(1) << "AtomCount " << AtomCount << " and bonddistance is " << bonddistance << "." << endl;
 
   if ((AtomCount > 1) && (bonddistance > 1.)) {
-    DoLog(2) && (Log() << Verbose(2) << "Creating Linked Cell structure ... " << endl);
+    Log() << Verbose(2) << "Creating Linked Cell structure ... " << endl;
     LC = new LinkedCell(this, bonddistance);
 
     // create a list to map Tesselpoint::nr to atom *
-    DoLog(2) && (Log() << Verbose(2) << "Creating TesselPoint to atom map ... " << endl);
+    Log() << Verbose(2) << "Creating TesselPoint to atom map ... " << endl;
     AtomMap = Calloc<atom *> (AtomCount, "molecule::CreateAdjacencyList - **AtomCount");
     Walker = start;
@@ -145 +142 @@
 
     // 3a. go through every cell
-    DoLog(2) && (Log() << Verbose(2) << "Celling ... " << endl);
+    Log() << Verbose(2) << "Celling ... " << endl;
     for (LC->n[0] = 0; LC->n[0] < LC->N[0]; LC->n[0]++)
       for (LC->n[1] = 0; LC->n[1] < LC->N[1]; LC->n[1]++)
         for (LC->n[2] = 0; LC->n[2] < LC->N[2]; LC->n[2]++) {
-          const LinkedCell::LinkedNodes *List = LC->GetCurrentCell();
+          const LinkedNodes *List = LC->GetCurrentCell();
 //          Log() << 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) {
-            for (LinkedCell::LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
+            for (LinkedNodes::const_iterator Runner = List->begin(); Runner != List->end(); Runner++) {
               Walker = AtomMap[(*Runner)->nr];
 //              Log() << Verbose(0) << "Current Atom is " << *Walker << "." << endl;
@@ -159 +156 @@
                 for (n[1] = -1; n[1] <= 1; n[1]++)
                   for (n[2] = -1; n[2] <= 1; n[2]++) {
-                    const LinkedCell::LinkedNodes *OtherList = LC->GetRelativeToCurrentCell(n);
+                    const LinkedNodes *OtherList = LC->GetRelativeToCurrentCell(n);
 //                    Log() << Verbose(2) << "Current relative cell is " << LC->n[0] << ", " << LC->n[1] << ", " << LC->n[2] << " with No. " << LC->index << " containing " << List->size() << " points." << endl;
                     if (OtherList != NULL) {
-                      for (LinkedCell::LinkedNodes::const_iterator OtherRunner = OtherList->begin(); OtherRunner != OtherList->end(); OtherRunner++) {
+                      for (LinkedNodes::const_iterator OtherRunner = OtherList->begin(); OtherRunner != OtherList->end(); OtherRunner++) {
                         if ((*OtherRunner)->nr > Walker->nr) {
                           OtherWalker = AtomMap[(*OtherRunner)->nr];
 //                          Log() << Verbose(0) << "Current other Atom is " << *OtherWalker << "." << endl;
-                          const double distance = OtherWalker->x.PeriodicDistanceSquared(Walker->x, cell_size);
+                          const double distance = OtherWalker->x.PeriodicDistanceSquared(&(Walker->x), cell_size);
 //                          Log() << Verbose(1) << "Checking distance " << distance << " against typical bond length of " << bonddistance*bonddistance << "." << endl;
                           (BG->*minmaxdistance)(Walker, OtherWalker, MinDistance, MaxDistance, IsAngstroem);
@@ -190 +187 @@
     Free(&AtomMap);
     delete (LC);
-    DoLog(1) && (Log() << Verbose(1) << "I detected " << BondCount << " bonds in the molecule with distance " << BondDistance << "." << endl);
+    Log() << Verbose(1) << "I detected " << BondCount << " bonds in the molecule with distance " << BondDistance << "." << endl;
 
     // correct bond degree by comparing valence and bond degree
-    DoLog(2) && (Log() << Verbose(2) << "Correcting bond degree ... " << endl);
+    Log() << Verbose(2) << "Correcting bond degree ... " << endl;
     CorrectBondDegree();
 
@@ -199 +196 @@
     ActOnAllAtoms( &atom::OutputBondOfAtom );
   } else
-    DoLog(1) && (Log() << Verbose(1) << "AtomCount is " << AtomCount << ", thus no bonds, no connections!." << endl);
-  DoLog(0) && (Log() << Verbose(0) << "End of CreateAdjacencyList." << endl);
+    Log() << Verbose(1) << "AtomCount is " << AtomCount << ", thus no bonds, no connections!." << endl;
+  Log() << Verbose(0) << "End of CreateAdjacencyList." << endl;
   if (free_BG)
     delete(BG);
@@ -211 +208 @@
 void molecule::OutputBondsList() const
 {
-  DoLog(1) && (Log() << Verbose(1) << endl << "From contents of bond chain list:");
+  Log() << Verbose(1) << endl << "From contents of bond chain list:";
   bond *Binder = first;
   while (Binder->next != last) {
     Binder = Binder->next;
-    DoLog(0) && (Log() << Verbose(0) << *Binder << "\t" << endl);
-  }
-  DoLog(0) && (Log() << Verbose(0) << endl);
+    Log() << Verbose(0) << *Binder << "\t" << endl;
+  }
+  Log() << Verbose(0) << endl;
 }
 ;
@@ -234 +231 @@
 
   if (BondCount != 0) {
-    DoLog(1) && (Log() << Verbose(1) << "Correcting Bond degree of each bond ... " << endl);
+    Log() << Verbose(1) << "Correcting Bond degree of each bond ... " << endl;
     do {
       OldNo = No;
       No = SumPerAtom( &atom::CorrectBondDegree );
     } while (OldNo != No);
-    DoLog(0) && (Log() << Verbose(0) << " done." << endl);
+    Log() << Verbose(0) << " done." << endl;
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "BondCount is " << BondCount << ", no bonds between any of the " << AtomCount << " atoms." << endl);
-  }
-  DoLog(0) && (Log() << Verbose(0) << No << " bonds could not be corrected." << endl);
+    Log() << Verbose(1) << "BondCount is " << BondCount << ", no bonds between any of the " << AtomCount << " atoms." << endl;
+  }
+  Log() << Verbose(0) << No << " bonds could not be corrected." << endl;
 
   return (No);
@@ -262 +259 @@
   bond *Binder = first;
   if ((Binder->next != last) && (Binder->next->Type == Undetermined)) {
-    DoLog(0) && (Log() << Verbose(0) << "No Depth-First-Search analysis performed so far, calling ..." << endl);
+    Log() << Verbose(0) << "No Depth-First-Search analysis performed so far, calling ..." << endl;
     Subgraphs = DepthFirstSearchAnalysis(BackEdgeStack);
     while (Subgraphs->next != NULL) {
@@ -317 +314 @@
     Walker->GraphNr = DFS.CurrentGraphNr;
     Walker->LowpointNr = DFS.CurrentGraphNr;
-    DoLog(1) && (Log() << Verbose(1) << "Setting Walker[" << Walker->getName() << "]'s number to " << Walker->GraphNr << " with Lowpoint " << Walker->LowpointNr << "." << endl);
+    Log() << Verbose(1) << "Setting Walker[" << Walker->Name << "]'s number to " << Walker->GraphNr << " with Lowpoint " << Walker->LowpointNr << "." << endl;
     DFS.AtomStack->Push(Walker);
     DFS.CurrentGraphNr++;
@@ -344 +341 @@
     if (Binder == NULL)
       break;
-    DoLog(2) && (Log() << Verbose(2) << "Current Unused Bond is " << *Binder << "." << endl);
+    Log() << Verbose(2) << "Current Unused Bond is " << *Binder << "." << endl;
     // (4) Mark Binder used, ...
     Binder->MarkUsed(black);
     OtherAtom = Binder->GetOtherAtom(Walker);
-    DoLog(2) && (Log() << Verbose(2) << "(4) OtherAtom is " << OtherAtom->getName() << "." << endl);
+    Log() << Verbose(2) << "(4) OtherAtom is " << OtherAtom->Name << "." << endl;
     if (OtherAtom->GraphNr != -1) {
       // (4a) ... if "other" atom has been visited (GraphNr != 0), set lowpoint to minimum of both, go to (3)
@@ -354 +351 @@
       DFS.BackEdgeStack->Push(Binder);
       Walker->LowpointNr = (Walker->LowpointNr < OtherAtom->GraphNr) ? Walker->LowpointNr : OtherAtom->GraphNr;
-      DoLog(3) && (Log() << Verbose(3) << "(4a) Visited: Setting Lowpoint of Walker[" << Walker->getName() << "] to " << Walker->LowpointNr << "." << endl);
+      Log() << Verbose(3) << "(4a) Visited: Setting Lowpoint of Walker[" << Walker->Name << "] to " << Walker->LowpointNr << "." << endl;
     } else {
       // (4b) ... otherwise set OtherAtom as Ancestor of Walker and Walker as OtherAtom, go to (2)
@@ -360 +357 @@
       OtherAtom->Ancestor = Walker;
       Walker = OtherAtom;
-      DoLog(3) && (Log() << Verbose(3) << "(4b) Not Visited: OtherAtom[" << OtherAtom->getName() << "]'s Ancestor is now " << OtherAtom->Ancestor->getName() << ", Walker is OtherAtom " << OtherAtom->getName() << "." << endl);
+      Log() << Verbose(3) << "(4b) Not Visited: OtherAtom[" << OtherAtom->Name << "]'s Ancestor is now " << OtherAtom->Ancestor->Name << ", Walker is OtherAtom " << OtherAtom->Name << "." << endl;
       break;
     }
@@ -382 +379 @@
 
   // (5) if Ancestor of Walker is ...
-  DoLog(1) && (Log() << Verbose(1) << "(5) Number of Walker[" << Walker->getName() << "]'s Ancestor[" << Walker->Ancestor->getName() << "] is " << Walker->Ancestor->GraphNr << "." << endl);
+  Log() << Verbose(1) << "(5) Number of Walker[" << Walker->Name << "]'s Ancestor[" << Walker->Ancestor->Name << "] is " << Walker->Ancestor->GraphNr << "." << endl;
 
   if (Walker->Ancestor->GraphNr != DFS.Root->GraphNr) {
@@ -389 +386 @@
       // (6a) set Ancestor's Lowpoint number to minimum of of its Ancestor and itself, go to Step(8)
       Walker->Ancestor->LowpointNr = (Walker->Ancestor->LowpointNr < Walker->LowpointNr) ? Walker->Ancestor->LowpointNr : Walker->LowpointNr;
-      DoLog(2) && (Log() << Verbose(2) << "(6) Setting Walker[" << Walker->getName() << "]'s Ancestor[" << Walker->Ancestor->getName() << "]'s Lowpoint to " << Walker->Ancestor->LowpointNr << "." << endl);
+      Log() << Verbose(2) << "(6) Setting Walker[" << Walker->Name << "]'s Ancestor[" << Walker->Ancestor->Name << "]'s Lowpoint to " << Walker->Ancestor->LowpointNr << "." << endl;
     } else {
       // (7) (Ancestor of Walker is a separating vertex, remove all from stack till Walker (including), these and Ancestor form a component
       Walker->Ancestor->SeparationVertex = true;
-      DoLog(2) && (Log() << Verbose(2) << "(7) Walker[" << Walker->getName() << "]'s Ancestor[" << Walker->Ancestor->getName() << "]'s is a separating vertex, creating component." << endl);
+      Log() << Verbose(2) << "(7) Walker[" << Walker->Name << "]'s Ancestor[" << Walker->Ancestor->Name << "]'s is a separating vertex, creating component." << endl;
       mol->SetNextComponentNumber(Walker->Ancestor, DFS.ComponentNumber);
-      DoLog(3) && (Log() << Verbose(3) << "(7) Walker[" << Walker->getName() << "]'s Ancestor's Compont is " << DFS.ComponentNumber << "." << endl);
+      Log() << Verbose(3) << "(7) Walker[" << Walker->Name << "]'s Ancestor's Compont is " << DFS.ComponentNumber << "." << endl;
       mol->SetNextComponentNumber(Walker, DFS.ComponentNumber);
-      DoLog(3) && (Log() << Verbose(3) << "(7) Walker[" << Walker->getName() << "]'s Compont is " << DFS.ComponentNumber << "." << endl);
+      Log() << Verbose(3) << "(7) Walker[" << Walker->Name << "]'s Compont is " << DFS.ComponentNumber << "." << endl;
       do {
         OtherAtom = DFS.AtomStack->PopLast();
         LeafWalker->Leaf->AddCopyAtom(OtherAtom);
         mol->SetNextComponentNumber(OtherAtom, DFS.ComponentNumber);
-        DoLog(3) && (Log() << Verbose(3) << "(7) Other[" << OtherAtom->getName() << "]'s Compont is " << DFS.ComponentNumber << "." << endl);
+        Log() << Verbose(3) << "(7) Other[" << OtherAtom->Name << "]'s Compont is " << DFS.ComponentNumber << "." << endl;
       } while (OtherAtom != Walker);
       DFS.ComponentNumber++;
     }
     // (8) Walker becomes its Ancestor, go to (3)
-    DoLog(2) && (Log() << Verbose(2) << "(8) Walker[" << Walker->getName() << "] is now its Ancestor " << Walker->Ancestor->getName() << ", backstepping. " << endl);
+    Log() << Verbose(2) << "(8) Walker[" << Walker->Name << "] is now its Ancestor " << Walker->Ancestor->Name << ", backstepping. " << endl;
     Walker = Walker->Ancestor;
     DFS.BackStepping = true;
@@ -431 +428 @@
     //DFS.AtomStack->Output(out);
     mol->SetNextComponentNumber(DFS.Root, DFS.ComponentNumber);
-    DoLog(3) && (Log() << Verbose(3) << "(9) Root[" << DFS.Root->getName() << "]'s Component is " << DFS.ComponentNumber << "." << endl);
+    Log() << Verbose(3) << "(9) Root[" << DFS.Root->Name << "]'s Component is " << DFS.ComponentNumber << "." << endl;
     mol->SetNextComponentNumber(Walker, DFS.ComponentNumber);
-    DoLog(3) && (Log() << Verbose(3) << "(9) Walker[" << Walker->getName() << "]'s Component is " << DFS.ComponentNumber << "." << endl);
+    Log() << Verbose(3) << "(9) Walker[" << Walker->Name << "]'s Component is " << DFS.ComponentNumber << "." << endl;
     do {
       OtherAtom = DFS.AtomStack->PopLast();
       LeafWalker->Leaf->AddCopyAtom(OtherAtom);
       mol->SetNextComponentNumber(OtherAtom, DFS.ComponentNumber);
-      DoLog(3) && (Log() << Verbose(3) << "(7) Other[" << OtherAtom->getName() << "]'s Compont is " << DFS.ComponentNumber << "." << endl);
+      Log() << Verbose(3) << "(7) Other[" << OtherAtom->Name << "]'s Compont is " << DFS.ComponentNumber << "." << endl;
     } while (OtherAtom != Walker);
     DFS.ComponentNumber++;
@@ -445 +442 @@
     Walker = DFS.Root;
     Binder = mol->FindNextUnused(Walker);
-    DoLog(1) && (Log() << Verbose(1) << "(10) Walker is Root[" << DFS.Root->getName() << "], next Unused Bond is " << Binder << "." << endl);
+    Log() << Verbose(1) << "(10) Walker is Root[" << DFS.Root->Name << "], next Unused Bond is " << Binder << "." << endl;
     if (Binder != NULL) { // Root is separation vertex
-      DoLog(1) && (Log() << Verbose(1) << "(11) Root is a separation vertex." << endl);
+      Log() << Verbose(1) << "(11) Root is a separation vertex." << endl;
       Walker->SeparationVertex = true;
     }
@@ -502 +499 @@
   bond *Binder = NULL;
 
-  if (AtomCount == 0)
-    return SubGraphs;
-  DoLog(0) && (Log() << Verbose(0) << "Begin of DepthFirstSearchAnalysis" << endl);
+  Log() << Verbose(0) << "Begin of DepthFirstSearchAnalysis" << endl;
   DepthFirstSearchAnalysis_Init(DFS, this);
 
@@ -514 +509 @@
     // put into new subgraph molecule and add this to list of subgraphs
     LeafWalker = new MoleculeLeafClass(LeafWalker);
-    LeafWalker->Leaf = World::getInstance().createMolecule();
+    LeafWalker->Leaf = new molecule(elemente);
     LeafWalker->Leaf->AddCopyAtom(DFS.Root);
 
@@ -526 +521 @@
 
         if (Binder == NULL) {
-          DoLog(2) && (Log() << Verbose(2) << "No more Unused Bonds." << endl);
+          Log() << Verbose(2) << "No more Unused Bonds." << endl;
           break;
         } else
@@ -543 +538 @@
 
     // From OldGraphNr to CurrentGraphNr ranges an disconnected subgraph
-    DoLog(0) && (Log() << Verbose(0) << "Disconnected subgraph ranges from " << OldGraphNr << " to " << DFS.CurrentGraphNr << "." << endl);
+    Log() << Verbose(0) << "Disconnected subgraph ranges from " << OldGraphNr << " to " << DFS.CurrentGraphNr << "." << endl;
     LeafWalker->Leaf->Output((ofstream *)&cout);
-    DoLog(0) && (Log() << Verbose(0) << endl);
+    Log() << Verbose(0) << endl;
 
     // step on to next root
@@ -563 +558 @@
   // free all and exit
   DepthFirstSearchAnalysis_Finalize(DFS);
-  DoLog(0) && (Log() << Verbose(0) << "End of DepthFirstSearchAnalysis" << endl);
+  Log() << Verbose(0) << "End of DepthFirstSearchAnalysis" << endl;
   return SubGraphs;
 }
@@ -589 +584 @@
 void molecule::OutputGraphInfoPerAtom() const
 {
-  DoLog(1) && (Log() << Verbose(1) << "Final graph info for each atom is:" << endl);
+  Log() << Verbose(1) << "Final graph info for each atom is:" << endl;
   ActOnAllAtoms( &atom::OutputGraphInfo );
 }
@@ -599 +594 @@
 void molecule::OutputGraphInfoPerBond() const
 {
-  DoLog(1) && (Log() << Verbose(1) << "Final graph info for each bond is:" << endl);
+  Log() << Verbose(1) << "Final graph info for each bond is:" << endl;
   bond *Binder = first;
   while (Binder->next != last) {
     Binder = Binder->next;
-    DoLog(2) && (Log() << Verbose(2) << ((Binder->Type == TreeEdge) ? "TreeEdge " : "BackEdge ") << *Binder << ": <");
-    DoLog(0) && (Log() << Verbose(0) << ((Binder->leftatom->SeparationVertex) ? "SP," : "") << "L" << Binder->leftatom->LowpointNr << " G" << Binder->leftatom->GraphNr << " Comp.");
+    Log() << Verbose(2) << ((Binder->Type == TreeEdge) ? "TreeEdge " : "BackEdge ") << *Binder << ": <";
+    Log() << Verbose(0) << ((Binder->leftatom->SeparationVertex) ? "SP," : "") << "L" << Binder->leftatom->LowpointNr << " G" << Binder->leftatom->GraphNr << " Comp.";
     Binder->leftatom->OutputComponentNumber();
-    DoLog(0) && (Log() << Verbose(0) << " ===  ");
-    DoLog(0) && (Log() << Verbose(0) << ((Binder->rightatom->SeparationVertex) ? "SP," : "") << "L" << Binder->rightatom->LowpointNr << " G" << Binder->rightatom->GraphNr << " Comp.");
+    Log() << Verbose(0) << " ===  ";
+    Log() << Verbose(0) << ((Binder->rightatom->SeparationVertex) ? "SP," : "") << "L" << Binder->rightatom->LowpointNr << " G" << Binder->rightatom->GraphNr << " Comp.";
     Binder->rightatom->OutputComponentNumber();
-    DoLog(0) && (Log() << Verbose(0) << ">." << endl);
+    Log() << Verbose(0) << ">." << endl;
     if (Binder->Cyclic) // cyclic ??
-      DoLog(3) && (Log() << Verbose(3) << "Lowpoint at each side are equal: CYCLIC!" << endl);
+      Log() << Verbose(3) << "Lowpoint at each side are equal: CYCLIC!" << endl;
   }
 }
@@ -685 +680 @@
   do { // look for Root
     Walker = BFS.BFSStack->PopFirst();
-    DoLog(2) && (Log() << Verbose(2) << "Current Walker is " << *Walker << ", we look for SP to Root " << *BFS.Root << "." << endl);
+    Log() << Verbose(2) << "Current Walker is " << *Walker << ", we look for SP to Root " << *BFS.Root << "." << endl;
     for (BondList::const_iterator Runner = Walker->ListOfBonds.begin(); Runner != Walker->ListOfBonds.end(); (++Runner)) {
       if ((*Runner) != BackEdge) { // only walk along DFS spanning tree (otherwise we always find SP of one being backedge Binder)
@@ -692 +687 @@
         if (OtherAtom->type->Z != 1) {
 #endif
-        DoLog(2) && (Log() << Verbose(2) << "Current OtherAtom is: " << OtherAtom->getName() << " for bond " << *(*Runner) << "." << endl);
+        Log() << Verbose(2) << "Current OtherAtom is: " << OtherAtom->Name << " for bond " << *(*Runner) << "." << endl;
         if (BFS.ColorList[OtherAtom->nr] == white) {
           BFS.TouchedStack->Push(OtherAtom);
@@ -698 +693 @@
           BFS.PredecessorList[OtherAtom->nr] = Walker; // Walker is the predecessor
           BFS.ShortestPathList[OtherAtom->nr] = BFS.ShortestPathList[Walker->nr] + 1;
-          DoLog(2) && (Log() << Verbose(2) << "Coloring OtherAtom " << OtherAtom->getName() << " lightgray, its predecessor is " << Walker->getName() << " and its Shortest Path is " << BFS.ShortestPathList[OtherAtom->nr] << " egde(s) long." << endl);
+          Log() << Verbose(2) << "Coloring OtherAtom " << OtherAtom->Name << " lightgray, its predecessor is " << Walker->Name << " and its Shortest Path is " << BFS.ShortestPathList[OtherAtom->nr] << " egde(s) long." << endl;
           //if (BFS.ShortestPathList[OtherAtom->nr] < MinimumRingSize[Walker->GetTrueFather()->nr]) { // Check for maximum distance
-          DoLog(3) && (Log() << Verbose(3) << "Putting OtherAtom into queue." << endl);
+          Log() << Verbose(3) << "Putting OtherAtom into queue." << endl;
           BFS.BFSStack->Push(OtherAtom);
           //}
         } else {
-          DoLog(3) && (Log() << Verbose(3) << "Not Adding, has already been visited." << endl);
+          Log() << Verbose(3) << "Not Adding, has already been visited." << endl;
         }
         if (OtherAtom == BFS.Root)
@@ -710 +705 @@
 #ifdef ADDHYDROGEN
       } else {
-        DoLog(2) && (Log() << Verbose(2) << "Skipping hydrogen atom " << *OtherAtom << "." << endl);
+        Log() << Verbose(2) << "Skipping hydrogen atom " << *OtherAtom << "." << endl;
         BFS.ColorList[OtherAtom->nr] = black;
       }
 #endif
       } else {
-        DoLog(2) && (Log() << Verbose(2) << "Bond " << *(*Runner) << " not Visiting, is the back edge." << endl);
+        Log() << Verbose(2) << "Bond " << *(*Runner) << " not Visiting, is the back edge." << endl;
       }
     }
     BFS.ColorList[Walker->nr] = black;
-    DoLog(1) && (Log() << Verbose(1) << "Coloring Walker " << Walker->getName() << " black." << endl);
+    Log() << Verbose(1) << "Coloring Walker " << Walker->Name << " black." << endl;
     if (OtherAtom == BFS.Root) { // if we have found the root, check whether this cycle wasn't already found beforehand
       // step through predecessor list
@@ -729 +724 @@
       }
       if (OtherAtom == BackEdge->rightatom) { // if each atom in found cycle is cyclic, loop's been found before already
-        DoLog(3) && (Log() << Verbose(3) << "This cycle was already found before, skipping and removing seeker from search." << endl);
+        Log() << Verbose(3) << "This cycle was already found before, skipping and removing seeker from search." << endl;
         do {
           OtherAtom = BFS.TouchedStack->PopLast();
           if (BFS.PredecessorList[OtherAtom->nr] == Walker) {
-            DoLog(4) && (Log() << Verbose(4) << "Removing " << *OtherAtom << " from lists and stacks." << endl);
+            Log() << Verbose(4) << "Removing " << *OtherAtom << " from lists and stacks." << endl;
             BFS.PredecessorList[OtherAtom->nr] = NULL;
             BFS.ShortestPathList[OtherAtom->nr] = -1;
@@ -767 +762 @@
     RingSize = 1;
     BFS.Root->GetTrueFather()->IsCyclic = true;
-    DoLog(1) && (Log() << Verbose(1) << "Found ring contains: ");
+    Log() << Verbose(1) << "Found ring contains: ";
     Walker = BFS.Root;
     while (Walker != BackEdge->rightatom) {
-      DoLog(0) && (Log() << Verbose(0) << Walker->getName() << " <-> ");
+      Log() << Verbose(0) << Walker->Name << " <-> ";
       Walker = BFS.PredecessorList[Walker->nr];
       Walker->GetTrueFather()->IsCyclic = true;
       RingSize++;
     }
-    DoLog(0) && (Log() << Verbose(0) << Walker->getName() << "  with a length of " << RingSize << "." << endl << endl);
+    Log() << Verbose(0) << Walker->Name << "  with a length of " << RingSize << "." << endl << endl;
     // walk through all and set MinimumRingSize
     Walker = BFS.Root;
@@ -787 +782 @@
       MinRingSize = RingSize;
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "No ring containing " << *BFS.Root << " with length equal to or smaller than " << MinimumRingSize[Walker->GetTrueFather()->nr] << " found." << endl);
+    Log() << Verbose(1) << "No ring containing " << *BFS.Root << " with length equal to or smaller than " << MinimumRingSize[Walker->GetTrueFather()->nr] << " found." << endl;
   }
 };
@@ -865 +860 @@
 
       }
-      DoLog(1) && (Log() << Verbose(1) << "Minimum ring size of " << *Root << " is " << MinimumRingSize[Root->GetTrueFather()->nr] << "." << endl);
-    }
-    DoLog(1) && (Log() << Verbose(1) << "Minimum ring size is " << MinRingSize << ", over " << NumCycles << " cycles total." << endl);
+      Log() << Verbose(1) << "Minimum ring size of " << *Root << " is " << MinimumRingSize[Root->GetTrueFather()->nr] << "." << endl;
+    }
+    Log() << Verbose(1) << "Minimum ring size is " << MinRingSize << ", over " << NumCycles << " cycles total." << endl;
   } else
-    DoLog(1) && (Log() << Verbose(1) << "No rings were detected in the molecular structure." << endl);
+    Log() << Verbose(1) << "No rings were detected in the molecular structure." << endl;
 }
 ;
@@ -897 +892 @@
   //BackEdgeStack->Output(out);
 
-  DoLog(1) && (Log() << Verbose(1) << "Analysing cycles ... " << endl);
+  Log() << Verbose(1) << "Analysing cycles ... " << endl;
   NumCycles = 0;
   while (!BackEdgeStack->IsEmpty()) {
@@ -908 +903 @@
     ResetBFSAccounting(Walker, BFS);
 
-    DoLog(1) && (Log() << Verbose(1) << "---------------------------------------------------------------------------------------------------------" << endl);
+    Log() << Verbose(1) << "---------------------------------------------------------------------------------------------------------" << endl;
     OtherAtom = NULL;
     CyclicStructureAnalysis_CyclicBFSFromRootToRoot(BackEdge, BFS);
@@ -937 +932 @@
         break; // breaking here will not cause error!
     }
-    if (i == vertex->ListOfBonds.size()) {
-      DoeLog(0) && (eLog()<< Verbose(0) << "Error: All Component entries are already occupied!" << endl);
-      performCriticalExit();
-    }
-  } else {
-    DoeLog(0) && (eLog()<< Verbose(0) << "Error: Given vertex is NULL!" << endl);
-    performCriticalExit();
-  }
+    if (i == vertex->ListOfBonds.size())
+      eLog() << Verbose(0) << "Error: All Component entries are already occupied!" << endl;
+  } else
+    eLog() << Verbose(0) << "Error: Given vertex is NULL!" << endl;
 }
 ;
@@ -980 +971 @@
 void OutputAlreadyVisited(int *list)
 {
-  DoLog(4) && (Log() << Verbose(4) << "Already Visited Bonds:\t");
+  Log() << Verbose(4) << "Already Visited Bonds:\t";
   for (int i = 1; i <= list[0]; i++)
-    DoLog(0) && (Log() << Verbose(0) << list[i] << "  ");
-  DoLog(0) && (Log() << Verbose(0) << endl);
+    Log() << Verbose(0) << list[i] << "  ";
+  Log() << Verbose(0) << endl;
 }
 ;
@@ -989 +980 @@
 /** Storing the bond structure of a molecule to file.
  * Simply stores Atom::nr and then the Atom::nr of all bond partners per line.
+ * \param *out output stream for debugging
  * \param *path path to file
- * \param *filename name of file
  * \return true - file written successfully, false - writing failed
  */
-bool molecule::StoreAdjacencyToFile(char *path, char *filename)
+bool molecule::StoreAdjacencyToFile(char *path)
 {
   ofstream AdjacencyFile;
@@ -999 +990 @@
   bool status = true;
 
-  if (path != NULL)
-    line << path << "/" << filename;
-  else
-    line << filename;
+  line << path << "/" << FRAGMENTPREFIX << ADJACENCYFILE;
   AdjacencyFile.open(line.str().c_str(), ios::out);
-  DoLog(1) && (Log() << Verbose(1) << "Saving adjacency list ... ");
+  Log() << Verbose(1) << "Saving adjacency list ... ";
   if (AdjacencyFile != NULL) {
-    AdjacencyFile << "m\tn" << endl;
     ActOnAllAtoms(&atom::OutputAdjacency, &AdjacencyFile);
     AdjacencyFile.close();
-    DoLog(1) && (Log() << Verbose(1) << "done." << endl);
+    Log() << Verbose(1) << "done." << endl;
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "failed to open file " << line.str() << "." << endl);
-    status = false;
-  }
-
-  return status;
-}
-;
-
-/** Storing the bond structure of a molecule to file.
- * Simply stores Atom::nr and then the Atom::nr of all bond partners, one per line.
- * \param *path path to file
- * \param *filename name of file
- * \return true - file written successfully, false - writing failed
- */
-bool molecule::StoreBondsToFile(char *path, char *filename)
-{
-  ofstream BondFile;
-  stringstream line;
-  bool status = true;
-
-  if (path != NULL)
-    line << path << "/" << filename;
-  else
-    line << filename;
-  BondFile.open(line.str().c_str(), ios::out);
-  DoLog(1) && (Log() << Verbose(1) << "Saving adjacency list ... ");
-  if (BondFile != NULL) {
-    BondFile << "m\tn" << endl;
-    ActOnAllAtoms(&atom::OutputBonds, &BondFile);
-    BondFile.close();
-    DoLog(1) && (Log() << Verbose(1) << "done." << endl);
-  } else {
-    DoLog(1) && (Log() << Verbose(1) << "failed to open file " << line.str() << "." << endl);
+    Log() << Verbose(1) << "failed to open file " << line.str() << "." << endl;
     status = false;
   }
@@ -1056 +1011 @@
   filename << path << "/" << FRAGMENTPREFIX << ADJACENCYFILE;
   File.open(filename.str().c_str(), ios::out);
-  DoLog(1) && (Log() << Verbose(1) << "Looking at bond structure stored in adjacency file and comparing to present one ... ");
+  Log() << Verbose(1) << "Looking at bond structure stored in adjacency file and comparing to present one ... ";
   if (File == NULL)
     return false;
@@ -1097 +1052 @@
     //Log() << Verbose(0) << endl;
   } else {
-    DoLog(0) && (Log() << Verbose(0) << "Number of bonds for Atom " << *Walker << " does not match, parsed " << CurrentBondsOfAtom << " against " << Walker->ListOfBonds.size() << "." << endl);
+    Log() << Verbose(0) << "Number of bonds for Atom " << *Walker << " does not match, parsed " << CurrentBondsOfAtom << " against " << Walker->ListOfBonds.size() << "." << endl;
     status = false;
   }
@@ -1120 +1075 @@
 
   if (!CheckAdjacencyFileAgainstMolecule_Init(path, File, CurrentBonds)) {
-    DoLog(1) && (Log() << Verbose(1) << "Adjacency file not found." << endl);
+    Log() << Verbose(1) << "Adjacency file not found." << endl;
     return true;
   }
@@ -1146 +1101 @@
 
   if (status) { // if equal we parse the KeySetFile
-    DoLog(1) && (Log() << Verbose(1) << "done: Equal." << endl);
+    Log() << Verbose(1) << "done: Equal." << endl;
   } else
-    DoLog(1) && (Log() << Verbose(1) << "done: Not equal by " << NonMatchNumber << " atoms." << endl);
+    Log() << Verbose(1) << "done: Not equal by " << NonMatchNumber << " atoms." << endl;
   return status;
 }
@@ -1164 +1119 @@
   bool status = true;
   if (ReferenceStack->IsEmpty()) {
-    DoLog(1) && (Log() << Verbose(1) << "ReferenceStack is empty!" << endl);
+    eLog() << Verbose(0) << "ReferenceStack is empty!" << endl;
     return false;
   }
@@ -1179 +1134 @@
         if (OtherAtom == ListOfLocalAtoms[(*Runner)->rightatom->nr]) { // found the bond
           LocalStack->Push((*Runner));
-          DoLog(3) && (Log() << Verbose(3) << "Found local edge " << *(*Runner) << "." << endl);
+          Log() << Verbose(3) << "Found local edge " << *(*Runner) << "." << endl;
           break;
         }
       }
     Binder = ReferenceStack->PopFirst(); // loop the stack for next item
-    DoLog(3) && (Log() << Verbose(3) << "Current candidate edge " << Binder << "." << endl);
+    Log() << Verbose(3) << "Current candidate edge " << Binder << "." << endl;
     ReferenceStack->Push(Binder);
   } while (FirstBond != Binder);
@@ -1233 +1188 @@
   BFS.PredecessorList[OtherAtom->nr] = Walker; // Walker is the predecessor
   BFS.ShortestPathList[OtherAtom->nr] = BFS.ShortestPathList[Walker->nr] + 1;
-  DoLog(2) && (Log() << Verbose(2) << "Coloring OtherAtom " << OtherAtom->getName() << " " << ((BFS.ColorList[OtherAtom->nr] == white) ? "white" : "lightgray") << ", its predecessor is " << Walker->getName() << " and its Shortest Path is " << BFS.ShortestPathList[OtherAtom->nr] << " egde(s) long." << endl);
+  Log() << Verbose(2) << "Coloring OtherAtom " << OtherAtom->Name << " " << ((BFS.ColorList[OtherAtom->nr] == white) ? "white" : "lightgray") << ", its predecessor is " << Walker->Name << " and its Shortest Path is " << BFS.ShortestPathList[OtherAtom->nr] << " egde(s) long." << endl;
   if ((((BFS.ShortestPathList[OtherAtom->nr] < BFS.BondOrder) && (Binder != Bond)))) { // Check for maximum distance
-    DoLog(3) && (Log() << Verbose(3));
+    Log() << Verbose(3);
     if (AddedAtomList[OtherAtom->nr] == NULL) { // add if it's not been so far
       AddedAtomList[OtherAtom->nr] = Mol->AddCopyAtom(OtherAtom);
-      DoLog(0) && (Log() << Verbose(0) << "Added OtherAtom " << OtherAtom->getName());
+      Log() << Verbose(0) << "Added OtherAtom " << OtherAtom->Name;
       AddedBondList[Binder->nr] = Mol->CopyBond(AddedAtomList[Walker->nr], AddedAtomList[OtherAtom->nr], Binder);
-      DoLog(0) && (Log() << Verbose(0) << " and bond " << *(AddedBondList[Binder->nr]) << ", ");
+      Log() << Verbose(0) << " and bond " << *(AddedBondList[Binder->nr]) << ", ";
     } else { // this code should actually never come into play (all white atoms are not yet present in BondMolecule, that's why they are white in the first place)
-      DoLog(0) && (Log() << Verbose(0) << "Not adding OtherAtom " << OtherAtom->getName());
+      Log() << Verbose(0) << "Not adding OtherAtom " << OtherAtom->Name;
       if (AddedBondList[Binder->nr] == NULL) {
         AddedBondList[Binder->nr] = Mol->CopyBond(AddedAtomList[Walker->nr], AddedAtomList[OtherAtom->nr], Binder);
-        DoLog(0) && (Log() << Verbose(0) << ", added Bond " << *(AddedBondList[Binder->nr]));
+        Log() << Verbose(0) << ", added Bond " << *(AddedBondList[Binder->nr]);
       } else
-        DoLog(0) && (Log() << Verbose(0) << ", not added Bond ");
-    }
-    DoLog(0) && (Log() << Verbose(0) << ", putting OtherAtom into queue." << endl);
+        Log() << Verbose(0) << ", not added Bond ";
+    }
+    Log() << Verbose(0) << ", putting OtherAtom into queue." << endl;
     BFS.BFSStack->Push(OtherAtom);
   } else { // out of bond order, then replace
@@ -1255 +1210 @@
       BFS.ColorList[OtherAtom->nr] = white; // unmark if it has not been queued/added, to make it available via its other bonds (cyclic)
     if (Binder == Bond)
-      DoLog(3) && (Log() << Verbose(3) << "Not Queueing, is the Root bond");
+      Log() << Verbose(3) << "Not Queueing, is the Root bond";
     else if (BFS.ShortestPathList[OtherAtom->nr] >= BFS.BondOrder)
-      DoLog(3) && (Log() << Verbose(3) << "Not Queueing, is out of Bond Count of " << BFS.BondOrder);
+      Log() << Verbose(3) << "Not Queueing, is out of Bond Count of " << BFS.BondOrder;
     if (!Binder->Cyclic)
-      DoLog(0) && (Log() << Verbose(0) << ", is not part of a cyclic bond, saturating bond with Hydrogen." << endl);
+      Log() << Verbose(0) << ", is not part of a cyclic bond, saturating bond with Hydrogen." << endl;
     if (AddedBondList[Binder->nr] == NULL) {
       if ((AddedAtomList[OtherAtom->nr] != NULL)) { // .. whether we add or saturate
@@ -1276 +1231 @@
 void BreadthFirstSearchAdd_VisitedNode(molecule *Mol, struct BFSAccounting &BFS, atom *&Walker, atom *&OtherAtom, bond *&Binder, bond *&Bond, atom **&AddedAtomList, bond **&AddedBondList, bool IsAngstroem)
 {
-  DoLog(3) && (Log() << Verbose(3) << "Not Adding, has already been visited." << endl);
+  Log() << Verbose(3) << "Not Adding, has already been visited." << endl;
   // This has to be a cyclic bond, check whether it's present ...
   if (AddedBondList[Binder->nr] == NULL) {
@@ -1322 +1277 @@
     // followed by n+1 till top of stack.
     Walker = BFS.BFSStack->PopFirst(); // pop oldest added
-    DoLog(1) && (Log() << Verbose(1) << "Current Walker is: " << Walker->getName() << ", and has " << Walker->ListOfBonds.size() << " bonds." << endl);
+    Log() << Verbose(1) << "Current Walker is: " << Walker->Name << ", and has " << Walker->ListOfBonds.size() << " bonds." << endl;
     for (BondList::const_iterator Runner = Walker->ListOfBonds.begin(); Runner != Walker->ListOfBonds.end(); (++Runner)) {
       if ((*Runner) != NULL) { // don't look at bond equal NULL
         Binder = (*Runner);
         OtherAtom = (*Runner)->GetOtherAtom(Walker);
-        DoLog(2) && (Log() << Verbose(2) << "Current OtherAtom is: " << OtherAtom->getName() << " for bond " << *(*Runner) << "." << endl);
+        Log() << Verbose(2) << "Current OtherAtom is: " << OtherAtom->Name << " for bond " << *(*Runner) << "." << endl;
         if (BFS.ColorList[OtherAtom->nr] == white) {
           BreadthFirstSearchAdd_UnvisitedNode(Mol, BFS, Walker, OtherAtom, Binder, Bond, AddedAtomList, AddedBondList, IsAngstroem);
@@ -1336 +1291 @@
     }
     BFS.ColorList[Walker->nr] = black;
-    DoLog(1) && (Log() << Verbose(1) << "Coloring Walker " << Walker->getName() << " black." << endl);
+    Log() << Verbose(1) << "Coloring Walker " << Walker->Name << " black." << endl;
   }
   BreadthFirstSearchAdd_Free(BFS);
@@ -1361 +1316 @@
   // reset parent list
   ParentList = Calloc<atom*> (AtomCount, "molecule::BuildInducedSubgraph_Init: **ParentList");
-  DoLog(3) && (Log() << Verbose(3) << "Resetting ParentList." << endl);
+  Log() << Verbose(3) << "Resetting ParentList." << endl;
 }
 ;
@@ -1368 +1323 @@
 {
   // fill parent list with sons
-  DoLog(3) && (Log() << Verbose(3) << "Filling Parent List." << endl);
+  Log() << Verbose(3) << "Filling Parent List." << endl;
   atom *Walker = mol->start;
   while (Walker->next != mol->end) {
@@ -1374 +1329 @@
     ParentList[Walker->father->nr] = Walker;
     // Outputting List for debugging
-    DoLog(4) && (Log() << Verbose(4) << "Son[" << Walker->father->nr << "] of " << Walker->father << " is " << ParentList[Walker->father->nr] << "." << endl);
+    Log() << Verbose(4) << "Son[" << Walker->father->nr << "] of " << Walker->father << " is " << ParentList[Walker->father->nr] << "." << endl;
   }
 
@@ -1392 +1347 @@
   atom *OtherAtom = NULL;
   // check each entry of parent list and if ok (one-to-and-onto matching) create bonds
-  DoLog(3) && (Log() << Verbose(3) << "Creating bonds." << endl);
+  Log() << Verbose(3) << "Creating bonds." << endl;
   Walker = Father->start;
   while (Walker->next != Father->end) {
@@ -1403 +1358 @@
           OtherAtom = (*Runner)->GetOtherAtom(Walker);
           if (ParentList[OtherAtom->nr] != NULL) { // if otheratom is also a father of an atom on this molecule, create the bond
-            DoLog(4) && (Log() << Verbose(4) << "Endpoints of Bond " << (*Runner) << " are both present: " << ParentList[Walker->nr]->getName() << " and " << ParentList[OtherAtom->nr]->getName() << "." << endl);
+            Log() << Verbose(4) << "Endpoints of Bond " << (*Runner) << " are both present: " << ParentList[Walker->nr]->Name << " and " << ParentList[OtherAtom->nr]->Name << "." << endl;
             mol->AddBond(ParentList[Walker->nr], ParentList[OtherAtom->nr], (*Runner)->BondDegree);
           }
@@ -1428 +1383 @@
   atom **ParentList = NULL;
 
-  DoLog(2) && (Log() << Verbose(2) << "Begin of BuildInducedSubgraph." << endl);
+  Log() << Verbose(2) << "Begin of BuildInducedSubgraph." << endl;
   BuildInducedSubgraph_Init(ParentList, Father->AtomCount);
   BuildInducedSubgraph_FillParentList(this, Father, ParentList);
   status = BuildInducedSubgraph_CreateBondsFromParent(this, Father, ParentList);
   BuildInducedSubgraph_Finalize(ParentList);
-  DoLog(2) && (Log() << Verbose(2) << "End of BuildInducedSubgraph." << endl);
+  Log() << Verbose(2) << "End of BuildInducedSubgraph." << endl;
   return status;
 }
@@ -1450 +1405 @@
   int size;
 
-  DoLog(1) && (Log() << Verbose(1) << "Begin of CheckForConnectedSubgraph" << endl);
-  DoLog(2) && (Log() << Verbose(2) << "Disconnected atom: ");
+  Log() << Verbose(1) << "Begin of CheckForConnectedSubgraph" << endl;
+  Log() << Verbose(2) << "Disconnected atom: ";
 
   // count number of atoms in graph
@@ -1473 +1428 @@
       }
       if (!BondStatus) {
-        DoLog(0) && (Log() << Verbose(0) << (*Walker) << endl);
+        Log() << Verbose(0) << (*Walker) << endl;
         return false;
       }
     }
   else {
-    DoLog(0) && (Log() << Verbose(0) << "none." << endl);
+    Log() << Verbose(0) << "none." << endl;
     return true;
   }
-  DoLog(0) && (Log() << Verbose(0) << "none." << endl);
-
-  DoLog(1) && (Log() << Verbose(1) << "End of CheckForConnectedSubgraph" << endl);
+  Log() << Verbose(0) << "none." << endl;
+
+  Log() << Verbose(1) << "End of CheckForConnectedSubgraph" << endl;
 
   return true;