Changeset 38032a for src

Timestamp:

Jun 27, 2012, 4:07:21 PM (13 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:

559385

Parents:

41c1b7

git-author:

Frederik Heber <heber@…> (03/01/12 17:55:09)

git-committer:

Frederik Heber <heber@…> (06/27/12 16:07:21)

Message:

Renamed SchedulerStates -> ControllerChoices enum.

• extracted from types.hpp as well.

Location:

src/Fragmentation/Automation

Files:

• Controller/Commands/Operation.cpp (modified) (1 diff)
• Controller/Commands/SendJobToWorkerOperation.cpp (modified) (1 diff)
• Controller/Commands/ShutdownOperation.cpp (modified) (1 diff)
• ControllerChoices.hpp (modified) (3 diffs)
• FragmentScheduler.cpp (modified) (3 diffs)
• FragmentScheduler.hpp (modified) (1 diff)

src/Fragmentation/Automation/Controller/Commands/Operation.cpp

@@ -29 +29 @@
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
-#include "types.hpp"
 
 #include "Controller/Commands/Operation.hpp"

src/Fragmentation/Automation/Controller/Commands/SendJobToWorkerOperation.cpp

@@ -28 +28 @@
 #include "CodePatterns/Info.hpp"
 #include "CodePatterns/Log.hpp"
-#include "types.hpp"
 
 #include "Controller/Commands/SendJobToWorkerOperation.hpp"

src/Fragmentation/Automation/Controller/Commands/ShutdownOperation.cpp

@@ -44 +44 @@
   {
     // Successfully established connection. Give choice.
-    enum ControllerChoices choice = Shutdown;
+    enum ControllerChoices choice = ShutdownControllerSocket;
     connection_.async_write(choice,
       boost::bind(&ShutdownOperation::handle_FinishOperation, this,

src/Fragmentation/Automation/ControllerChoices.hpp

@@ -2 +2 @@
  * ControllerChoices.hpp
  *
- *  Created on: Mar 2, 2012
+ *  Created on: Mar 1, 2012
  *      Author: heber
  */
@@ -9 +9 @@
 #define CONTROLLERCHOICES_HPP_
 
-
 // include config.h
 #ifdef HAVE_CONFIG_H
@@ -15 +14 @@
 #endif
 
-//!> Choices of the FragmentController in communication with FragmentScheduler
+//!> States the FragmentScheduler can be in to communicate with him
 enum ControllerChoices {
-  NoOperation,
+  NoControllerOperation,
   GetNextJobId,
   ReceiveJobs,
   CheckState,
   SendResults,
-  Shutdown
+  ShutdownControllerSocket
 };
 

src/Fragmentation/Automation/FragmentScheduler.cpp

@@ -248 +248 @@
     // switch over the desired choice read previously
     switch(choice) {
-    case NoOperation:
+    case NoControllerOperation:
     {
       ELOG(1, "FragmentScheduler::handle_ReadChoice() - called with NoOperation.");
@@ -294 +294 @@
       break;
     }
-    case Shutdown:
+    case ShutdownControllerSocket:
     {
       LaunchNewAcceptor = false;
@@ -304 +304 @@
       break;
     }
-    // restore NoOperation choice such that choice is not read twice
-    choice = NoOperation;
+    // restore NoControllerOperation choice such that choice is not read twice
+    choice = NoControllerOperation;
 
     if (LaunchNewAcceptor) {

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -107 +107 @@
       JobsQueue(_JobsQueue),
       jobInfo((size_t)2, 0),
-      choice(NoOperation),
+      choice(NoControllerOperation),
       globalId(0),
       initiateWorkerSocket(_initiateWorkerSocket)