Changeset 90f680

Timestamp:

Apr 21, 2010, 11:42:54 AM (15 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:

bc84ffc

Parents:

711ac2

Message:

FIX: errorLogger now has absolute verbosity (i.e. CRITIAL is whatever level of recursion printed to screen)

• new function Verbose::DoErrorOutput() which does check only against given verbosityLevel, not plus Info:verbosity ad DoOutput()
• operator<< of errorLogger
  • uses this function DoErrorOutput()
  • everything above or at verbositylevel of 2 two is prefixed with WARNING:
• setVerbosity() does not set verbosity of errorLogger, is set to 2 in the code and is fixed
• DoLog() and DoeLog() have their return value in parenthesis (no change, just safer)

Location:

src

Files:

• errorlogger.cpp (modified) (3 diffs)
• log.cpp (modified) (3 diffs)
• verbose.cpp (modified) (2 diffs)
• verbose.hpp (modified) (1 diff)

src/errorlogger.cpp

@@ -81 +81 @@
   int verbosityLevel = l.verbosity;
   l.nix->clear();
-  if (v.DoOutput(verbosityLevel)) {
+  if (v.DoErrorOutput(verbosityLevel)) {
     switch(v.Verbosity) {
       case 0:
@@ -104 +104 @@
   int verbosityLevel = l->verbosity;
   l->nix->clear();
-  if (v.DoOutput(verbosityLevel)) {
+  if (v.DoErrorOutput(verbosityLevel)) {
     switch(v.Verbosity) {
       case 0:
@@ -113 +113 @@
         break;
       case 2:
+      default:
         cerr << "WARNING: ";
-        break;
-      default:
         break;
     }

src/log.cpp

@@ -16 +16 @@
 void setVerbosity(int verbosityLevel) {
   logger::getInstance()->setVerbosity(verbosityLevel);
-  errorLogger::getInstance()->setVerbosity(verbosityLevel);
 }
 
@@ -36 +35 @@
  */
 bool DoLog(int verbose) {
-  return verbose <= logger::getInstance()->verbosity;
+  return (verbose <= logger::getInstance()->verbosity);
 }
 
@@ -47 +46 @@
  */
 bool DoeLog(int verbose) {
-  return verbose <= errorLogger::getInstance()->verbosity;
+  return (verbose <= errorLogger::getInstance()->verbosity);
 }
 

src/verbose.cpp

@@ -17 +17 @@
 
 /** States whether current output message should be print or not.
- * Compares Verbose::Verbosity against \a verbosityLevel.
+ * Compares Verbose::Verbosity plus Info::verbosity against \a verbosityLevel.
  * \param verbosityLevel given global level of verbosity
  * \return true - do output, false - don't
@@ -26 +26 @@
 };
 
+/** States whether current error output message should be print or not.
+ * Compares Verbose::Verbosity against \a verbosityLevel.
+ * \param verbosityLevel given global level of verbosity
+ * \return true - do output, false - don't
+ */
+bool Verbose::DoErrorOutput(int verbosityLevel) const
+{
+  return (verbosityLevel >= Verbosity);
+};
 
 /** Operator for the Verbose(arg) call.

src/verbose.hpp

@@ -37 +37 @@
     ostream& print (ostream &ost) const;
     bool DoOutput(int verbosityLevel) const;
+    bool DoErrorOutput(int verbosityLevel) const;
   private:
     int Verbosity;