Changeset 47d041 for src/Actions/WorldAction

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/WorldAction

Files:

• InputAction.cpp (modified) (4 diffs)
• OutputAction.cpp (modified) (3 diffs)
• RepeatBoxAction.cpp (modified) (1 diff)
• SetDefaultNameAction.cpp (modified) (3 diffs)
• SetWorldTimeAction.cpp (modified) (3 diffs)

src/Actions/WorldAction/InputAction.cpp

@@ -49 +49 @@
   getParametersfromValueStorage();
 
-  DoLog(0) && (Log() << Verbose(0) << "Config file given " << params.filename << "." << endl);
+  LOG(0, "Config file given " << params.filename << ".");
   // using the filename as prefix for all parsers
   std::string FilenameSuffix;
@@ -62 +62 @@
     FilenamePrefix = params.filename.stem();
 #endif
-    DoLog(1) && (Log() << Verbose(1) << "Setting config file name prefix to " << FilenamePrefix << "." << endl);
+    LOG(1, "Setting config file name prefix to " << FilenamePrefix << ".");
     parsers.SetOutputPrefixForAll(FilenamePrefix);
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "Input file does not have a suffix, cannot recognize format." << endl);
+    ELOG(1, "Input file does not have a suffix, cannot recognize format.");
     return Action::failure;
   }
@@ -71 +71 @@
   // parsing file if present
   if (!boost::filesystem::exists(params.filename)) {
-    DoLog(1) && (Log() << Verbose(1) << "Specified config file " << params.filename << " not found." << endl);
+    LOG(1, "Specified config file " << params.filename << " not found.");
     // DONT FAIL: it's just empty and we use the name. // return Action::failure;
     // nonetheless, add to output formats
     parsers.setOutputFormat( parsers.getTypeFromSuffix(FilenameSuffix) );
   } else {
-    DoLog(1) && (Log() << Verbose(1) << "Specified config file found, parsing ... ");
+    LOG(1, "Specified config file found, parsing ... ");
 
     // parse the file
@@ -88 +88 @@
     iter--;
     (*iter)->SetNameFromFilename(FilenamePrefix.c_str());
-    DoLog(0) && (Log() << Verbose(0) << "Chemical formula is " << (*iter)->getFormula() << std::endl);
+    LOG(0, "Chemical formula is " << (*iter)->getFormula());
   }
   return Action::success;

src/Actions/WorldAction/OutputAction.cpp

@@ -42 +42 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Storing world to file " << params.filename << "." << endl);
+  LOG(1, "Storing world to file " << params.filename << ".");
 
   // extract suffix
@@ -57 +57 @@
 #endif
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "Output file does not have a suffix, cannot recognize format." << endl);
+    ELOG(1, "Output file does not have a suffix, cannot recognize format.");
     return Action::failure;
   }
@@ -68 +68 @@
     FormatParserStorage::getInstance().saveWorld(output, FilenameSuffix);
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "Could not open file " << params.filename << "." << endl);
+    ELOG(1, "Could not open file " << params.filename << ".");
   }
   output.close();

src/Actions/WorldAction/RepeatBoxAction.cpp

@@ -129 +129 @@
   std::vector<molecule *> AllMolecules;
   if (mol != NULL) {
-    DoLog(0) && (Log() << Verbose(0) << "Using molecule " << mol->name << "." << endl);
+    LOG(0, "Using molecule " << mol->name << ".");
     AllMolecules = World::getInstance().getAllMolecules(MoleculeByPtr(mol));
   } else {
-    DoLog(0) && (Log() << Verbose(0) << "Using all molecules." << endl);
+    LOG(0, "Using all molecules.");
     AllMolecules = World::getInstance().getAllMolecules();
   }

src/Actions/WorldAction/SetDefaultNameAction.cpp

@@ -44 +44 @@
 
   World::getInstance().setDefaultName(params.newname);
-  DoLog(0) && (Log() << Verbose(0) << "Default name of new molecules set to " << World::getInstance().getDefaultName() << "." << endl);
+  LOG(0, "Default name of new molecules set to " << World::getInstance().getDefaultName() << ".");
   return Action::state_ptr(UndoState);
 }
@@ -52 +52 @@
 
   World::getInstance().setDefaultName(state->lastname);
-  DoLog(0) && (Log() << Verbose(0) << "Default name of new molecules set to " << World::getInstance().getDefaultName() << "." << endl);
+  LOG(0, "Default name of new molecules set to " << World::getInstance().getDefaultName() << ".");
 
   return Action::state_ptr(_state);
@@ -61 +61 @@
 
   World::getInstance().setDefaultName(state->params.newname);
-  DoLog(0) && (Log() << Verbose(0) << "Default name of new molecules set to " << World::getInstance().getDefaultName() << "." << endl);
+  LOG(0, "Default name of new molecules set to " << World::getInstance().getDefaultName() << ".");
 
   return Action::state_ptr(_state);

src/Actions/WorldAction/SetWorldTimeAction.cpp

@@ -45 +45 @@
 
   WorldTime::setTime(params.newtime);
-  DoLog(0) && (Log() << Verbose(0) << "Current time step is now: " << WorldTime::getTime() << "." << endl);
+  LOG(0, "Current time step is now: " << WorldTime::getTime() << ".");
   return Action::state_ptr(UndoState);
 }
@@ -53 +53 @@
 
   WorldTime::setTime(state->oldtime);
-  DoLog(0) && (Log() << Verbose(0) << "Current time step is now again: " << WorldTime::getTime() << "." << endl);
+  LOG(0, "Current time step is now again: " << WorldTime::getTime() << ".");
 
   return Action::state_ptr(_state);
@@ -62 +62 @@
 
   WorldTime::setTime(state->params.newtime);
-  DoLog(0) && (Log() << Verbose(0) << "Current time step is now: " << WorldTime::getTime() << "." << endl);
+  LOG(0, "Current time step is now: " << WorldTime::getTime() << ".");
 
   return Action::state_ptr(_state);