Changeset 26b4d62 for src/Actions/CommandAction

Timestamp:

Jun 27, 2014, 9:32:03 PM (11 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:

c73e35

Parents:

0b6b77

git-author:

Frederik Heber <heber@…> (06/19/14 13:56:27)

git-committer:

Frederik Heber <heber@…> (06/27/14 21:32:03)

Message:

All Actions now give correct failure status via STATUS() macro.

Location:

src/Actions/CommandAction

Files:

• BondLengthTableAction.cpp (modified) (1 diff)
• ElementDbAction.cpp (modified) (2 diffs)
• HelpAction.cpp (modified) (1 diff)
• LoadSessionAction.cpp (modified) (1 diff)
• VersionAction.cpp (modified) (1 diff)

src/Actions/CommandAction/BondLengthTableAction.cpp

@@ -76 +76 @@
     std::ifstream input(params.BondGraphFileName.get().string().c_str());
     if ((input.good()) && (BG->LoadBondLengthTable(input))) {
-      LOG(0, "Bond length table parsed successfully.");
+      LOG(1, "Bond length table parsed successfully.");
       input.close();
       return ActionState::ptr(UndoState);
     } else {
-      ELOG(1, "Bond length table parsing failed.");
+      STATUS("Bond length table "+params.BondGraphFileName.get().string()
+          +" parsing failed.");
       input.close();
     }
   } else {
-    ELOG(1, "Bond length table loading failed.");
+    STATUS("Bond length table "+params.BondGraphFileName.get().string()
+        +" loading failed.");
   }
   // recover bond graph

src/Actions/CommandAction/ElementDbAction.cpp

@@ -80 +80 @@
   periode->CleanupPeriodtable();
   if (periode->LoadPeriodentafel(configuration->databasepath)) {
-    LOG(0, "Element list loaded successfully.");
+    STATUS("Element list loaded successfully.");
     //periode->Output();
     return ActionState::ptr(UndoState);
   } else {
-    LOG(0, "Element list loading failed.");
+    STATUS("Element list loading failed.");
     delete UndoState;
     return Action::failure;
@@ -117 +117 @@
   periode->CleanupPeriodtable();
   if (periode->LoadPeriodentafel(configuration->databasepath)) {
-    LOG(0, "Element list loaded successfully.");
+    STATUS("Redoing Element list loaded successfully.");
     //periode->Output();
     return ActionState::ptr(_state);
   } else {
-    LOG(0, "Element list loading failed.");
+    STATUS("Redoing Element list loading failed.");
     return Action::failure;
   }

src/Actions/CommandAction/HelpAction.cpp

@@ -98 +98 @@
       std::cout << std::endl;
     } else {
-      ELOG(1, "No action is known by the name " << params.actionname.get() << ".");
+      STATUS("No action is known by the name "+params.actionname.get()+".");
       return Action::failure;
     }

src/Actions/CommandAction/LoadSessionAction.cpp

@@ -60 +60 @@
   if (executePythonScript(params.filename.get().string()))
     return Action::success;
-  else
+  else {
+    STATUS("Failed executing python script.");
     return Action::failure;
+  }
 #else
-  ELOG(1, "Python capabilities have not been compiled in.");
+  STATUS("Python capabilities have not been compiled in.");
   return Action::failure;
 #endif

src/Actions/CommandAction/VersionAction.cpp

@@ -49 +49 @@
 /** =========== define the function ====================== */
 ActionState::ptr CommandVersionAction::performCall() {
-  LOG(1, "STATUS: Version of the program is " << MOLECUILDERVERSION << ".");
+  STATUS("Version of the program is "+toString(MOLECUILDERVERSION)+".");
   return Action::success;
 }