Changeset 7da5cd for src

Timestamp:

Jul 6, 2012, 10:18:47 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:

c8446c

Parents:

a10cc0

git-author:

Frederik Heber <heber@…> (06/04/12 09:19:42)

git-committer:

Frederik Heber <heber@…> (07/06/12 10:18:47)

Message:

Moved all Controller.., ..Options, and .._main() files over to JobMarket.

Location:

src

Files:

• ControllerOptions_MPQCCommandJob.hpp (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• controller.cpp (modified) (1 diff)
• controller_MPQCCommandJob.cpp (modified) (2 diffs)
• controller_MPQCCommandJob.hpp (modified) (1 diff)

src/ControllerOptions_MPQCCommandJob.hpp

@@ -18 +18 @@
 #include <string>
 
-#include "ControllerOptions.hpp"
+#include "JobMarket/Controller/ControllerOptions.hpp"
 
 struct ControllerOptions_MPQCCommandJob : public ControllerOptions

src/Makefile.am

@@ -258 +258 @@
 libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER} 
 noinst_LIBRARIES = libmenu.a
-bin_PROGRAMS += molecuilder joiner analyzer Controller PoolWorker Server 
+bin_PROGRAMS += molecuilder joiner analyzer PoolWorker Server 
 EXTRA_PROGRAMS = unity
 
@@ -361 +361 @@
 CONTROLLERSOURCE = \
         controller_MPQCCommandJob.cpp \
-        ControllerCommandRegistry.cpp \
-        ControllerOptions.cpp \
-        ControllerOptions_MPQCCommandJob.cpp \
-        DefaultOptions.cpp
+        ControllerOptions_MPQCCommandJob.cpp
 
 CONTROLLERHEADER = \
-        controller_AddOn.hpp \
         controller_MPQCCommandJob.hpp \
-        ControllerCommand.hpp \
-        ControllerCommandRegistry.hpp \
-        ControllerOptions.hpp \
-        ControllerOptions_MPQCCommandJob.hpp \
-        DefaultOptions.hpp
-
-EXTRA_DIST += \
-        controller_AddOn_SystemCommandJob.cpp \
-        controller_SystemCommandJob.cpp \
-        controller_SystemCommandJob.hpp \
-        ControllerOptions_SystemCommandJob.cpp \
-        ControllerOptions_SystemCommandJob.hpp
-        
+        ControllerOptions_MPQCCommandJob.hpp
+
 
 noinst_LTLIBRARIES += libFragmentationAutomationController.la
@@ -390 +375 @@
         $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
 
-POOLWORKERSOURCE = \
-        DefaultOptions.cpp \
-        SignalHandler.cpp \
-        SignalOptions.cpp \
-        WorkerOptions.cpp
-
-POOLWORKERHEADER = \
-        DefaultOptions.hpp \
-        SignalHandler.hpp \
-        SignalOptions.hpp \
-        WorkerOptions.hpp
-
-lib_LTLIBRARIES += libFragmentationAutomationPoolWorker.la
-libFragmentationAutomationPoolWorker_la_includedir = $(includedir)/MoleCuilder/JobMarket
-nobase_libFragmentationAutomationPoolWorker_la_include_HEADERS = $(POOLWORKERHEADER)
-libFragmentationAutomationPoolWorker_la_SOURCES = $(POOLWORKERSOURCE)
-libFragmentationAutomationPoolWorker_la_LIBADD = \
-        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
-
-SERVERSOURCE = \
-        DefaultOptions.cpp \
-        ServerOptions.cpp \
-        SignalHandler.cpp \
-        SignalOptions.cpp
-
-SERVERHEADER = \
-        DefaultOptions.hpp \
-        ServerOptions.hpp \
-        SignalHandler.hpp \
-        SignalOptions.hpp
-
-noinst_LTLIBRARIES += libFragmentationAutomationServer.la
-libFragmentationAutomationServer_la_includedir = $(includedir)/MoleCuilder/JobMarket
-nobase_libFragmentationAutomationServer_la_include_HEADERS = $(SERVERHEADER)
-libFragmentationAutomationServer_la_SOURCES = $(SERVERSOURCE)
-libFragmentationAutomationServer_la_LIBADD = \
-        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
-
 bin_PROGRAMS += Controller PoolWorker Server
 
-Controller_SOURCES = controller.cpp controller_main.cpp controller_main.hpp controller_AddOn_MPQCCommandJob.cpp
-Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+Controller_SOURCES = controller.cpp controller_AddOn_MPQCCommandJob.cpp
+Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) ${CodePatterns_LDFLAGS}
 Controller_CXXFLAGS = $(AM_CPPFLAGS)
 Controller_LDADD = \
+        libFragmentationAutomationController.la \
         libMolecuilderJobs.la \
-        libFragmentationAutomationController.la \
         libMolecuilderFragmentation.la \
         libMolecuilderHelpers.la \
+        $(top_builddir)/JobMarket/src/JobMarket/libJobMarketController.la \
         $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_PROGRAM_OPTIONS_LIBS)
-
-PoolWorker_SOURCES = poolworker.cpp poolworker_main.cpp poolworker_main.hpp
-PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+        $(BOOST_PROGRAM_OPTIONS_LIBS) \
+        ${CodePatterns_LIBS}
+
+PoolWorker_SOURCES = poolworker.cpp 
+PoolWorker_LDFLAGS = $(AM_LDFLAGS) ${CodePatterns_LDFLAGS}
 PoolWorker_CXXFLAGS = $(AM_CPPFLAGS)
 PoolWorker_LDADD = \
         libMolecuilderJobs.la \
-        libFragmentationAutomationPoolWorker.la \
+        $(top_builddir)/JobMarket/src/JobMarket/libJobMarketPoolWorker.la \
         $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_PROGRAM_OPTIONS_LIBS)
-
-Server_SOURCES = Server.cpp server_main.cpp server_main.hpp
-Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+        ${CodePatterns_LIBS}
+
+Server_SOURCES = Server.cpp 
+Server_LDFLAGS = $(AM_LDFLAGS) ${CodePatterns_LDFLAGS}
 Server_CXXFLAGS = $(AM_CPPFLAGS)
 Server_LDADD = \
         libMolecuilderJobs.la \
-        libFragmentationAutomationServer.la \
+        $(top_builddir)/JobMarket/src/JobMarket/libJobMarketServer.la \
         $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
         $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
-        ${CodePatterns_LIBS} \
-        $(BOOST_PROGRAM_OPTIONS_LIBS)
+        ${CodePatterns_LIBS}
 
 

src/controller.cpp

@@ -21 +21 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "controller_main.hpp"
+#include "JobMarket/Controller/controller_main.hpp"
 
 int main(int argc, char* argv[])

src/controller_MPQCCommandJob.cpp

@@ -29 +29 @@
 #include <fstream>
 
-#include "FragmentController.hpp"
-#include "Jobs/MPQCCommandJob.hpp"
-#include "Results/FragmentResult.hpp"
-
-#include "ControllerCommand.hpp"
-#include "ControllerCommandRegistry.hpp"
-#include "ControllerOptions_MPQCCommandJob.hpp"
+#include "CodePatterns/Info.hpp"
+#include "CodePatterns/Log.hpp"
+
+#include "JobMarket/Controller/ControllerCommand.hpp"
+#include "JobMarket/Controller/ControllerCommandRegistry.hpp"
+#include "JobMarket/Controller/FragmentController.hpp"
+#include "JobMarket/Jobs/FragmentJob.hpp"
+#include "JobMarket/Results/FragmentResult.hpp"
 
 #include "Fragmentation/EnergyMatrix.hpp"
@@ -47 +48 @@
 #include "Jobs/MPQCCommandJob_MPQCData.hpp"
 
+#include "ControllerOptions_MPQCCommandJob.hpp"
 
 /** Creates a MPQCCommandJob with argument \a filename.

src/controller_MPQCCommandJob.hpp

@@ -17 +17 @@
 #include <boost/program_options.hpp>
 
-#include "controller_AddOn.hpp"
+#include "JobMarket/Controller/controller_AddOn.hpp"
 
 class ControllerCommand;