Changeset 47d041 for src/Actions/CommandAction

Timestamp:

Nov 3, 2011, 7:44:01 PM (13 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, 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.

Location:

src/Actions/CommandAction

Files:

• BondLengthTableAction.cpp (modified) (3 diffs)
• ElementDbAction.cpp (modified) (2 diffs)
• FastParsingAction.cpp (modified) (3 diffs)
• VerboseAction.cpp (modified) (3 diffs)

src/Actions/CommandAction/BondLengthTableAction.cpp

@@ -47 +47 @@
   getParametersfromValueStorage();
 
-  DoLog(0) && (Log() << Verbose(0) << "Using " << params.BondGraphFileName << " as bond length table." << endl);
+  LOG(0, "Using " << params.BondGraphFileName << " as bond length table.");
   BondGraph *&BG = World::getInstance().getBondGraph();
 
@@ -65 +65 @@
     std::ifstream input(params.BondGraphFileName.string().c_str());
     if ((input.good()) && (BG->LoadBondLengthTable(input))) {
-      DoLog(0) && (Log() << Verbose(0) << "Bond length table parsed successfully." << endl);
+      LOG(0, "Bond length table parsed successfully.");
       input.close();
       return Action::state_ptr(UndoState);
     } else {
-      DoeLog(1) && (eLog()<< Verbose(1) << "Bond length table parsing failed." << endl);
+      ELOG(1, "Bond length table parsing failed.");
       input.close();
     }
   } else {
-    DoeLog(1) && (eLog()<< Verbose(1) << "Bond length table loading failed." << endl);
+    ELOG(1, "Bond length table loading failed.");
   }
   // recover bond graph
@@ -102 +102 @@
   std::ifstream input(state->params.BondGraphFileName.string().c_str());
   if ((input.good()) && (BG->LoadBondLengthTable(input))) {
-    DoLog(0) && (Log() << Verbose(0) << "Bond length table parsed successfully." << endl);
+    LOG(0, "Bond length table parsed successfully.");
     input.close();
   }

src/Actions/CommandAction/ElementDbAction.cpp

@@ -67 +67 @@
   periode->CleanupPeriodtable();
   if (periode->LoadPeriodentafel(configuration->databasepath)) {
-    DoLog(0) && (Log() << Verbose(0) << "Element list loaded successfully." << endl);
+    LOG(0, "Element list loaded successfully.");
     //periode->Output();
     return Action::state_ptr(UndoState);
   } else {
-    DoLog(0) && (Log() << Verbose(0) << "Element list loading failed." << endl);
+    LOG(0, "Element list loading failed.");
     delete UndoState;
     return Action::failure;
@@ -104 +104 @@
   periode->CleanupPeriodtable();
   if (periode->LoadPeriodentafel(configuration->databasepath)) {
-    DoLog(0) && (Log() << Verbose(0) << "Element list loaded successfully." << endl);
+    LOG(0, "Element list loaded successfully.");
     //periode->Output();
     return Action::state_ptr(_state);
   } else {
-    DoLog(0) && (Log() << Verbose(0) << "Element list loading failed." << endl);
+    LOG(0, "Element list loading failed.");
     return Action::failure;
   }

src/Actions/CommandAction/FastParsingAction.cpp

@@ -45 +45 @@
   configuration->FastParsing = params.fastparsing;
   if (configuration->FastParsing)
-    DoLog(0) && (Log() << Verbose(0) << "I won't parse trajectories." << endl);
+    LOG(0, "I won't parse trajectories.");
   else
-    DoLog(0) && (Log() << Verbose(0) << "I will parse trajectories." << endl);
+    LOG(0, "I will parse trajectories.");
   return Action::state_ptr(new CommandFastParsingState(oldvalue, params));
 }
@@ -57 +57 @@
   configuration->FastParsing = state->oldvalue;
   if (configuration->FastParsing)
-    DoLog(0) && (Log() << Verbose(0) << "I won't parse trajectories." << endl);
+    LOG(0, "I won't parse trajectories.");
   else
-    DoLog(0) && (Log() << Verbose(0) << "I will parse trajectories." << endl);
+    LOG(0, "I will parse trajectories.");
 
   return Action::state_ptr(_state);
@@ -70 +70 @@
   configuration->FastParsing = state->params.fastparsing;
   if (configuration->FastParsing)
-    DoLog(0) && (Log() << Verbose(0) << "I won't parse trajectories." << endl);
+    LOG(0, "I won't parse trajectories.");
   else
-    DoLog(0) && (Log() << Verbose(0) << "I will parse trajectories." << endl);
+    LOG(0, "I will parse trajectories.");
 
   return Action::state_ptr(_state);

src/Actions/CommandAction/VerboseAction.cpp

@@ -46 +46 @@
     // set new verbosity
     setVerbosity(params.verbosity);
-    DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << oldverbosity << " to " << params.verbosity << "." << endl);
+    LOG(0, "Setting verbosity from " << oldverbosity << " to " << params.verbosity << ".");
     return Action::state_ptr(UndoState);
   } else {
-    DoLog(0) && (Log() << Verbose(0) << "Verbosity remains unchanged at " << oldverbosity << "." << endl);
+    LOG(0, "Verbosity remains unchanged at " << oldverbosity << ".");
     return Action::success;
   }
@@ -57 +57 @@
   CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
 
-  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << state->params.verbosity << " to " << state->oldverbosity << "." << endl);
+  LOG(0, "Setting verbosity from " << state->params.verbosity << " to " << state->oldverbosity << ".");
   setVerbosity(state->oldverbosity);
 
@@ -66 +66 @@
   CommandVerboseState *state = assert_cast<CommandVerboseState*>(_state.get());
 
-  DoLog(0) && (Log() << Verbose(0) << "Setting verbosity from " << state->oldverbosity << " to " << state->params.verbosity << "." << endl);
+  LOG(0, "Setting verbosity from " << state->oldverbosity << " to " << state->params.verbosity << ".");
   setVerbosity(state->params.verbosity);