Changeset a61dbb for src/Actions

Timestamp:

Jul 14, 2014, 11:15:18 AM (10 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:

d8821e

Parents:

abfc95

git-author:

Frederik Heber <heber@…> (07/13/14 13:03:31)

git-committer:

Frederik Heber <heber@…> (07/14/14 11:15:18)

Message:

In CommandLineUI actions are skipped after failing action.

• ActionQueue has queryable flag lastActionOk.
• CommandLineWindow uses flag to check whether to queue further actions.
• added regression test in the context of fragmentation-automation.

Location:

src/Actions

Files:

• ActionQueue.cpp (modified) (3 diffs)
• ActionQueue.hpp (modified) (2 diffs)
• FragmentationAction/FragmentationAutomationAction.cpp (modified) (1 diff)

src/Actions/ActionQueue.cpp

@@ -58 +58 @@
     AR(new ActionRegistry()),
     history(new ActionHistory),
+    CurrentAction(0),
 #ifndef HAVE_ACTION_THREAD
-    CurrentAction(0)
+    lastActionOk(true)
 #else
-    CurrentAction(0),
+    lastActionOk(true),
     run_thread(boost::bind(&ActionQueue::run, this)),
     run_thread_isIdle(true)
@@ -99 +100 @@
   try {
     newaction->call();
+    lastActionOk = true;
   } catch(ActionFailureException &e) {
     std::cerr << "Action " << *boost::get_error_info<ActionNameString>(e) << " has failed." << std::endl;
     World::getInstance().setExitFlag(5);
+    actionqueue.clear();
+    tempqueue.clear();
+    lastActionOk = false;
+    std::cerr << "ActionQueue cleared." << std::endl;
   }
 #else
@@ -156 +162 @@
       try {
         actionqueue[CurrentAction]->call();
+        lastActionOk = true;
       } catch(ActionFailureException &e) {
         std::cerr << "Action " << *boost::get_error_info<ActionNameString>(e) << " has failed." << std::endl;
         World::getInstance().setExitFlag(5);
+        actionqueue.clear();
+        tempqueue.clear();
+        lastActionOk = false;
+        std::cerr << "ActionQueue cleared." << std::endl;
+        CurrentAction = (size_t)-1;
       }
       // access actionqueue, hence using mutex

src/Actions/ActionQueue.hpp

@@ -122 +122 @@
   void redoLast();
 
+  /** Return status of last executed action.
+   *
+   * \return true - action executed correctly, false - else
+   */
+  bool getLastActionOk() const
+  {  return lastActionOk; }
+
 #ifdef HAVE_ACTION_THREAD
   boost::thread &getRunThread()
@@ -205 +212 @@
   ActionQueue_t tempqueue;
 
+  //!> indicates that the last action has failed
+  bool lastActionOk;
+
 #ifdef HAVE_ACTION_THREAD
   //!> internal thread to call Actions

src/Actions/FragmentationAction/FragmentationAutomationAction.cpp

@@ -138 +138 @@
 
     // Phase Two: add MPQCJobs and send
-    const size_t NoJobs = mpqccontroller.addJobsFromQueue(
+    const bool AddJobsStatus = mpqccontroller.addJobsFromQueue(
         params.DoLongrange.get() ? MPQCData::DoSampleDensity : MPQCData::DontSampleDensity,
         params.DoValenceOnly.get() ? MPQCData::DoSampleValenceOnly : MPQCData::DontSampleValenceOnly
         );
-    LOG(1, "INFO: Added " << NoJobs << " from FragmentJobsQueue.");
+    if (AddJobsStatus)
+      LOG(1, "INFO: Added jobs from FragmentJobsQueue.");
+    else {
+      ELOG(1, "Adding jobs failed.");
+      return Action::failure;
+    }
     mpqccontroller.run();