Changeset 47d041 for src/Actions/AtomAction

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.

Location:

src/Actions/AtomAction

Files:

• AddAction.cpp (modified) (3 diffs)
• ChangeElementAction.cpp (modified) (1 diff)
• RemoveAction.cpp (modified) (3 diffs)
• RotateAroundOriginByAngleAction.cpp (modified) (1 diff)
• SaveSelectedAtomsAction.cpp (modified) (3 diffs)

src/Actions/AtomAction/AddAction.cpp

@@ -48 +48 @@
   first->setType(params.elemental);
   first->setPosition(params.position);
-  DoLog(1) && (Log() << Verbose(1) << "Adding new atom with element " << first->getType()->getName() << " at " << (first->getPosition()) << "." << endl);
+  LOG(1, "Adding new atom with element " << first->getType()->getName() << " at " << (first->getPosition()) << ".");
   // TODO: remove when all of World's atoms are stored.
   std::vector<molecule *> molecules = World::getInstance().getAllMolecules();
@@ -61 +61 @@
   AtomAddState *state = assert_cast<AtomAddState*>(_state.get());
 
-  DoLog(1) && (Log() << Verbose(1) << "Removing atom with id " << state->id << "." << endl);
+  LOG(1, "Removing atom with id " << state->id << ".");
   World::getInstance().destroyAtom(state->id);
 
@@ -73 +73 @@
   first->setType(state->params.elemental);
   first->setPosition(state->params.position);
-  DoLog(1) && (Log() << Verbose(1) << "Re-adding new atom with element " << state->params.elemental->getName() << " at " << state->params.position << "." << endl);
+  LOG(1, "Re-adding new atom with element " << state->params.elemental->getName() << " at " << state->params.position << ".");
   // TODO: remove when all of World's atoms are stored.
   std::vector<molecule *> molecules = World::getInstance().getAllMolecules();

src/Actions/AtomAction/ChangeElementAction.cpp

@@ -57 +57 @@
   for (World::AtomSelectionIterator iter = World::getInstance().beginAtomSelection(); iter != World::getInstance().endAtomSelection(); ++iter) {
     first = iter->second;
-    DoLog(1) && (Log() << Verbose(1) << "Changing atom " << *first << " to element " << *params.elemental << "." << endl);
+    LOG(1, "Changing atom " << *first << " to element " << *params.elemental << ".");
     mol = first->getMolecule();
     first->removeFromMolecule(); // remove atom

src/Actions/AtomAction/RemoveAction.cpp

@@ -53 +53 @@
       iter != World::getInstance().endAtomSelection();
       iter = World::getInstance().beginAtomSelection()) {
-    DoLog(1) && (Log() << Verbose(1) << "Removing atom " << (iter->second)->getId() << "." << endl);
+    LOG(1, "Removing atom " << (iter->second)->getId() << ".");
     World::getInstance().destroyAtom((iter->second));
   }
@@ -65 +65 @@
   for (; i<state->Walkers.size(); ++i) {
     // re-create the atom
-    DoLog(1) && (Log() << Verbose(1) << "Re-adding atom " << state->Walkers[i].getId() << "." << endl);
+    LOG(1, "Re-adding atom " << state->Walkers[i].getId() << ".");
     atom *Walker = World::getInstance().createAtom();
     if (!state->Walkers[i].setAtom(*Walker)) {
-      DoeLog(1) && (eLog() << Verbose(1) << "Failed to set id." << endl);
+      ELOG(1, "Failed to set id.");
       World::getInstance().destroyAtom(Walker);
       break;
@@ -88 +88 @@
   // simple remove again all previously added atoms
   for (size_t i=0; i<state->Walkers.size(); ++i) {
-    DoLog(1) && (Log() << Verbose(1) << "Re-removing atom " << state->Walkers[i].getId() << "." << endl);
+    LOG(1, "Re-removing atom " << state->Walkers[i].getId() << ".");
     World::getInstance().destroyAtom(state->Walkers[i].getId());
   }

src/Actions/AtomAction/RotateAroundOriginByAngleAction.cpp

@@ -56 +56 @@
   Line RotationAxis(Vector(0.,0.,0.), params.Axis);
 
-  DoLog(0) && (Log() << Verbose(0) << "Rotate around origin by " << params.angle << " radian, axis from origin to " << params.Axis << "." << endl);
+  LOG(0, "Rotate around origin by " << params.angle << " radian, axis from origin to " << params.Axis << ".");
   // TODO: use AtomSet::rotate?
   for (std::vector<atom *>::iterator iter = selectedAtoms.begin(); iter != selectedAtoms.end(); ++iter) {
     (*iter)->setPosition(RotationAxis.rotateVector((*iter)->getPosition(), params.angle));
   }
-  DoLog(0) && (Log() << Verbose(0) << "done." << endl);
+  LOG(0, "done.");
   return Action::state_ptr(new AtomRotateAroundOriginByAngleState(World::getInstance().getSelectedAtoms(), params));
 }

src/Actions/AtomAction/SaveSelectedAtomsAction.cpp

@@ -41 +41 @@
   getParametersfromValueStorage();
 
-  DoLog(1) && (Log() << Verbose(1) << "Storing selected atoms to file " << params.filename << "." << endl);
+  LOG(1, "Storing selected atoms to file " << params.filename << ".");
 
   // extract suffix
@@ -56 +56 @@
 #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;
   }
@@ -67 +67 @@
     FormatParserStorage::getInstance().saveSelectedAtoms(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();