Changeset 47d041 for src/UIElements/CommandLineUI/Query

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/UIElements/CommandLineUI/Query

Files:

• AtomCommandLineQuery.cpp (modified) (1 diff)
• AtomsCommandLineQuery.cpp (modified) (1 diff)
• BooleanCommandLineQuery.cpp (modified) (1 diff)
• BoxCommandLineQuery.cpp (modified) (1 diff)
• DoubleCommandLineQuery.cpp (modified) (1 diff)
• DoublesCommandLineQuery.cpp (modified) (1 diff)
• ElementCommandLineQuery.cpp (modified) (1 diff)
• ElementsCommandLineQuery.cpp (modified) (1 diff)
• FileCommandLineQuery.cpp (modified) (1 diff)
• IntCommandLineQuery.cpp (modified) (1 diff)
• IntsCommandLineQuery.cpp (modified) (1 diff)
• MoleculeCommandLineQuery.cpp (modified) (1 diff)
• MoleculesCommandLineQuery.cpp (modified) (1 diff)
• RandomNumberDistribution_ParametersCommandLineQuery.cpp (modified) (1 diff)
• StringCommandLineQuery.cpp (modified) (1 diff)
• StringsCommandLineQuery.cpp (modified) (1 diff)
• UnsignedIntCommandLineQuery.cpp (modified) (1 diff)
• UnsignedIntsCommandLineQuery.cpp (modified) (1 diff)
• VectorCommandLineQuery.cpp (modified) (1 diff)
• VectorsCommandLineQuery.cpp (modified) (1 diff)

src/UIElements/CommandLineUI/Query/AtomCommandLineQuery.cpp

@@ -46 +46 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing atom for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing atom for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/AtomsCommandLineQuery.cpp

@@ -45 +45 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing atoms for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing atoms for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/BooleanCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing boolean for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing boolean for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/BoxCommandLineQuery.cpp

@@ -41 +41 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing symmetric box matrix for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing symmetric box matrix for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/DoubleCommandLineQuery.cpp

@@ -37 +37 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing double for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing double for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/DoublesCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing doubles for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing doubles for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/ElementCommandLineQuery.cpp

@@ -44 +44 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing element for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing element for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/ElementsCommandLineQuery.cpp

@@ -47 +47 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing elements for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing elements for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/FileCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing string for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing string for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/IntCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing integer for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing integer for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/IntsCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing integers for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing integers for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/MoleculeCommandLineQuery.cpp

@@ -41 +41 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing molecule for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing molecule for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/MoleculesCommandLineQuery.cpp

@@ -46 +46 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing molecules for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing molecules for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/RandomNumberDistribution_ParametersCommandLineQuery.cpp

@@ -41 +41 @@
     std::string stringtext = CommandLineParser::getInstance().vm[getTitle()].as<std::string>();
     std::stringstream text(stringtext);
-//    DoLog(1) && (Log() << Verbose(1) << "Parameter set from CommandLine is '"
-//        << text.str() << "'" << std::endl);
+//    LOG(1, "INFO: Parameter set from CommandLine is '" << text.str() << "'");
     text >> tmp;
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing RandomNumberDistribution_Parameters for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing RandomNumberDistribution_Parameters for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/StringCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing string for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing string for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/StringsCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing strings for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing strings for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/UnsignedIntCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing integer for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing integer for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/UnsignedIntsCommandLineQuery.cpp

@@ -36 +36 @@
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing integers for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing integers for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/VectorCommandLineQuery.cpp

@@ -42 +42 @@
     tmp = temp.toVector();
     if ((check) && (!World::getInstance().getDomain().isInside(tmp))) {
-      DoeLog(1) && (eLog() << Verbose(1) << "Vector " << tmp << " would be outside of box domain." << endl);
+      ELOG(1, "Vector " << tmp << " would be outside of box domain.");
       return false;
     }
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing vector for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing vector for " << getTitle() << ".");
     return false;
   }

src/UIElements/CommandLineUI/Query/VectorsCommandLineQuery.cpp

@@ -45 +45 @@
         tmp.push_back(temp);
       else
-        DoeLog(1) && (eLog() << Verbose(1) << "Vector " << temp << " would be outside of box domain." << endl);
+        ELOG(1, "Vector " << temp << " would be outside of box domain.");
     }
     return true;
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "CommandLineUI parsing error: Missing vectors for " << getTitle() << "." << endl);
+    ELOG(1, "CommandLineUI parsing error: Missing vectors for " << getTitle() << ".");
     return false;
   }