Changeset 47d041 for src/Fragmentation/BondsPerShortestPath.cpp

Timestamp:

Nov 3, 2011, 7:44:01 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, Candidate_v1.7.0, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

41a467

Parents:

50e4e5

git-author:

Frederik Heber <heber@…> (10/27/11 11:53:58)

git-committer:

Frederik Heber <heber@…> (11/03/11 19:44:01)

Message:

HUGE: Removed all calls to Log(), eLog(), replaced by LOG() and ELOG().

• Replaced DoLog(.) && (Log() << Verbose(.) << ... << std::endl) by Log(., ...).
• Replaced Log() << Verbose(.) << .. << by Log(., ...)
• on multiline used stringstream to generate and message which was finally used in LOG(., output.str())
• there should be no more occurence of Log(). LOG() and ELOG() must be used instead.
• Eventually, this will allow for storing all errors and re-printing them on program exit which would be very helpful to ascertain error-free runs for the user.

File:

• src/Fragmentation/BondsPerShortestPath.cpp (modified) (8 diffs)

src/Fragmentation/BondsPerShortestPath.cpp

@@ -21 +21 @@
 
 #include "BondsPerShortestPath.hpp"
+
+#include <sstream>
 
 #include "CodePatterns/Log.hpp"
@@ -82 +84 @@
 void BondsPerShortestPath::ResetSPList()
 {
-  DoLog(0) && (Log() << Verbose(0) << "Free'ing all found lists. and resetting index lists" << endl);
+  LOG(0, "Free'ing all found lists. and resetting index lists");
+  std::stringstream output;
   for(int i=Order;i--;) {
-    DoLog(1) && (Log() << Verbose(1) << "Current SP level is " << i << ": ");
+    output << "Current SP level is " << i << ": ";
     // delete added bonds
     for (BondsPerSP::iterator iter = BondsPerSPList[i].begin();
@@ -93 +96 @@
     BondsPerSPList[i].clear();
     // also start and end node
-    DoLog(0) && (Log() << Verbose(0) << "cleaned." << endl);
-  }
+    output << "cleaned.";
+  }
+  LOG(1, output.str());
 };
 
@@ -120 +124 @@
   int SP = -1;
 
-  DoLog(0) && (Log() << Verbose(0) << "Starting BFS analysis ..." << endl);
+  LOG(0, "Starting BFS analysis ...");
   for (SP = 0; SP < (Order-1); SP++) {
-    DoLog(1) && (Log() << Verbose(1) << "New SP level reached: " << SP << ", creating new SP list with " << BondsPerSPCount[SP] << " item(s)");
-    if (SP > 0) {
-      DoLog(0) && (Log() << Verbose(0) << ", old level closed with " << BondsPerSPCount[SP-1] << " item(s)." << endl);
-      BondsPerSPCount[SP] = 0;
-    } else
-      DoLog(0) && (Log() << Verbose(0) << "." << endl);
+    {
+      std::stringstream output;
+      output << "New SP level reached: " << SP << ", creating new SP list with " << BondsPerSPCount[SP] << " item(s)";
+      if (SP > 0) {
+        output << ", old level closed with " << BondsPerSPCount[SP-1] << " item(s).";
+        BondsPerSPCount[SP] = 0;
+      } else
+        output << ".";
+      LOG(1, output.str());
+    }
 
     RemainingWalkers = BondsPerSPCount[SP];
@@ -137 +145 @@
       Predecessor = (*CurrentEdge)->leftatom;    // ... and leftatom is predecessor
       AtomKeyNr = Walker->getNr();
-      DoLog(0) && (Log() << Verbose(0) << "Current Walker is: " << *Walker << " with nr " << Walker->getNr() << " and SP of " << SP << ", with " << RemainingWalkers << " remaining walkers on this level." << endl);
+      LOG(0, "Current Walker is: " << *Walker << " with nr " << Walker->getNr() << " and SP of " << SP << ", with " << RemainingWalkers << " remaining walkers on this level.");
       // check for new sp level
       // go through all its bonds
-      DoLog(1) && (Log() << Verbose(1) << "Going through all bonds of Walker." << endl);
+      LOG(1, "Going through all bonds of Walker.");
       const BondList& ListOfBonds = Walker->getListOfBonds();
       for (BondList::const_iterator Runner = ListOfBonds.begin();
@@ -149 +157 @@
             // skip hydrogens if desired and restrict to fragment
             && ((saturation == DontSaturate) || (OtherWalker->getType()->getAtomicNumber() != 1))) {
-          DoLog(2) && (Log() << Verbose(2) << "Current partner is " << *OtherWalker << " with nr " << OtherWalker->getNr() << " in bond " << *(*Runner) << "." << endl);
+          LOG(2, "Current partner is " << *OtherWalker << " with nr " << OtherWalker->getNr() << " in bond " << *(*Runner) << ".");
           // set the label if not set (and push on root stack as well)
           if ((OtherWalker != Predecessor) && (OtherWalker->GetTrueFather()->getNr() > RootKeyNr)) { // only pass through those with label bigger than Root's
@@ -156 +164 @@
             BondsPerSPList[SP+1].push_back(Binder);
             BondsPerSPCount[SP+1]++;
-            DoLog(3) && (Log() << Verbose(3) << "Added its bond to SP list, having now " << BondsPerSPCount[SP+1] << " item(s)." << endl);
+            LOG(3, "Added its bond to SP list, having now " << BondsPerSPCount[SP+1] << " item(s).");
           } else {
             if (OtherWalker != Predecessor)
-              DoLog(3) && (Log() << Verbose(3) << "Not passing on, as index of " << *OtherWalker << " " << OtherWalker->GetTrueFather()->getNr() << " is smaller than that of Root " << RootKeyNr << "." << endl);
+              LOG(3, "Not passing on, as index of " << *OtherWalker << " " << OtherWalker->GetTrueFather()->getNr() << " is smaller than that of Root " << RootKeyNr << ".");
             else
-              DoLog(3) && (Log() << Verbose(3) << "This is my predecessor " << *Predecessor << "." << endl);
+              LOG(3, "This is my predecessor " << *Predecessor << ".");
           }
-        } else Log() << Verbose(2) << "Is not in the restricted keyset or skipping hydrogen " << *OtherWalker << "." << endl;
+        } else LOG(2, "Is not in the restricted keyset or skipping hydrogen " << *OtherWalker << ".");
       }
     }
@@ -173 +181 @@
 void BondsPerShortestPath::OutputSPList()
 {
-  DoLog(0) && (Log() << Verbose(0) << "Printing all found lists." << endl);
+  LOG(0, "Printing all found lists.");
   for(int i=1;i<Order;i++) {    // skip the root edge in the printing
-    DoLog(1) && (Log() << Verbose(1) << "Current SP level is " << i << "." << endl);
+    LOG(1, "Current SP level is " << i << ".");
     for (BondsPerShortestPath::BondsPerSP::const_iterator Binder = BondsPerSPList[i].begin();
         Binder != BondsPerSPList[i].end();
         ++Binder) {
-      DoLog(2) && (Log() << Verbose(2) << *Binder << endl);
+      LOG(2, *Binder);
     }
   }