Changeset 7ca772 for src/Fragmentation/Automation/Makefile.am

Timestamp:

Jun 22, 2012, 8:19:29 AM (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:

246d97

Parents:

50f418

git-author:

Frederik Heber <heber@…> (12/12/11 08:32:27)

git-committer:

Frederik Heber <heber@…> (06/22/12 08:19:29)

Message:

Operations are now contained in CommandRegistry in FragmentController.

• this is a tiny bit less nice due to required static_cast<>, however in the end we hopefully win due to possible placement inside a Queue.
• FragmentController:getExitflag() can now just browse through all present Operations and return the first fail.
• TESTFIX: changed regression tests Fragmentation/Automation a bit due to:
  • server-worker,addingjobs: addjobs now always adds two jobs.
  • JobAdder, ResultChecker, ResultGetter, and Shutdowner have been removed in favor of Controller and a specific command token.

File:

• src/Fragmentation/Automation/Makefile.am (modified) (5 diffs)

src/Fragmentation/Automation/Makefile.am

@@ -31 +31 @@
 FRAGMENTATIONAUTOMATIONSOURCE = \
   atexit.cpp \
+  Controller/CommandRegistry.cpp \
   Controller/FragmentController.cpp \
   Controller/Commands/CheckResultsOperation.cpp \
@@ -42 +43 @@
   Connection.hpp \
   ControllerChoices.hpp \
+  Controller/CommandRegistry.hpp \
   Controller/FragmentController.hpp \
   Controller/Commands/CheckResultsOperation.hpp \
@@ -59 +61 @@
 AM_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 
-bin_PROGRAMS += JobAdder ResultChecker ResultGetter Server Shutdowner Worker
+bin_PROGRAMS += Controller Server Worker
 
 CONTROLLERSOURCE =
@@ -82 +84 @@
   FragmentWorker.hpp
 
-JobAdder_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) Controller/JobAdder.cpp
-JobAdder_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
-JobAdder_CXXFLAGS = $(AM_CPPFLAGS)
-JobAdder_LDADD = \
-  libMolecuilderFragmentationAutomation.la \
-  libMolecuilderFragmentJobs.la \
-  $(BOOST_ASIO_LIBS) \
-  $(BOOST_SERIALIZATION_LIBS) \
-  $(BOOST_THREAD_LIBS) \
-  $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
-
-ResultChecker_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) Controller/ResultChecker.cpp
-ResultChecker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
-ResultChecker_CXXFLAGS = $(AM_CPPFLAGS)
-ResultChecker_LDADD = \
-  libMolecuilderFragmentationAutomation.la \
-  libMolecuilderFragmentJobs.la \
-  $(BOOST_ASIO_LIBS) \
-  $(BOOST_SERIALIZATION_LIBS) \
-  $(BOOST_THREAD_LIBS) \
-  $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
-
-ResultGetter_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) Controller/ResultGetter.cpp
-ResultGetter_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
-ResultGetter_CXXFLAGS = $(AM_CPPFLAGS)
-ResultGetter_LDADD = \
+Controller_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) controller.cpp
+Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
+Controller_CXXFLAGS = $(AM_CPPFLAGS)
+Controller_LDADD = \
   libMolecuilderFragmentationAutomation.la \
   libMolecuilderFragmentJobs.la \
@@ -130 +108 @@
   ${CodePatterns_LIBS}
 
-Shutdowner_SOURCES = $(CONTROLLERSOURCE) $(CONTROLLERHEADER) Controller/Shutdowner.cpp
-Shutdowner_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
-Shutdowner_CXXFLAGS = $(AM_CPPFLAGS)
-Shutdowner_LDADD = \
-  libMolecuilderFragmentationAutomation.la \
-  libMolecuilderFragmentJobs.la \
-  $(BOOST_ASIO_LIBS) \
-  $(BOOST_SERIALIZATION_LIBS) \
-  $(BOOST_THREAD_LIBS) \
-  $(BOOST_SYSTEM_LIBS) \
-  ${CodePatterns_LIBS}
-
 Worker_SOURCES = $(WORKERSOURCE) $(WORKERHEADER)
 Worker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_ASIO_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)