Changeset 7da5cd


Ignore:
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.

Files:
3 added
8 edited
29 moved

Legend:

Unmodified
Added
Removed

  • JobMarket/configure.ac

    ra10cc0 r7da5cd  
    9898BOOST_FILESYSTEM
    9999BOOST_IOSTREAMS
     100BOOST_PROGRAM_OPTIONS
    100101BOOST_SERIALIZATION
    101102

  • JobMarket/src/JobMarket/Controller/ControllerCommandRegistry.hpp

    ra10cc0 r7da5cd  
    1818#include "CodePatterns/Registry.hpp"
    1919
    20 #include "ControllerCommand.hpp"
     20#include "Controller/ControllerCommand.hpp"
    2121
    2222struct ControllerCommandRegistry : public Registry<ControllerCommand>

  • JobMarket/src/JobMarket/Controller/controller_SystemCommandJob.cpp

    ra10cc0 r7da5cd  
    1818#endif
    1919
     20// boost asio needs specific operator new
     21#include <boost/asio.hpp>
     22
    2023#include "CodePatterns/MemDebug.hpp"
    2124
    … …  
    2427#include <boost/assign.hpp>
    2528#include <boost/bind.hpp>
     29#include "CodePatterns/Log.hpp"
    2630
    27 #include "FragmentController.hpp"
     31#include "Controller/ControllerCommand.hpp"
     32#include "Controller/ControllerCommandRegistry.hpp"
     33#include "Controller/ControllerOptions_SystemCommandJob.hpp"
     34#include "Controller/FragmentController.hpp"
    2835#include "Jobs/SystemCommandJob.hpp"
    2936#include "Results/FragmentResult.hpp"
    3037
    31 #include "ControllerCommand.hpp"
    32 #include "ControllerCommandRegistry.hpp"
    33 #include "ControllerOptions_SystemCommandJob.hpp"
    3438
    3539/** Print received results.
    … …  
    101105}
    102106
    103 void controller_SystemCommandJob::addSpecificOption(
     107void controller_SystemCommandJob::addSpecificOptions(
    104108    boost::program_options::options_description_easy_init option)
    105109{

  • JobMarket/src/JobMarket/Controller/controller_main.cpp

    ra10cc0 r7da5cd  
    88/*
    99 * \file controller_main.cpp
    10  *
    11  * This file strongly follows the Serialization example from the boost::asio
    12  * library (see client.cpp)
    1310 *
    1411 *  Created on: Nov 27, 2011
    … …  
    4037#include "CodePatterns/Info.hpp"
    4138#include "CodePatterns/Log.hpp"
     39
    4240#include "atexit.hpp"
    43 #include "FragmentController.hpp"
     41#include "Controller/controller_AddOn.hpp"
     42#include "Controller/ControllerCommandRegistry.hpp"
     43#include "Controller/ControllerOptions.hpp"
     44#include "Controller/FragmentController.hpp"
    4445
    45 #include "ControllerOptions_SystemCommandJob.hpp"
    46 #include "ControllerCommandRegistry.hpp"
    47 
    48 #include "controller_AddOn.hpp"
    4946
    5047/** Print the status of scheduled and done jobs.

  • JobMarket/src/JobMarket/Controller/controller_main.hpp

    ra10cc0 r7da5cd  
    1414#endif
    1515
    16 int controller_main(int argc, char **argv);
     16int controller_main(int argc, char *argv[]);
    1717
    1818#endif /* CONTROLLER_MAIN_HPP_ */

  • JobMarket/src/JobMarket/Makefile.am

    ra10cc0 r7da5cd  
    99
    1010noinst_LTLIBRARIES =
     11lib_LTLIBRARIES =
     12bin_PROGRAMS =
    1113
    1214JOBSSOURCE = \
    … …  
    3335        Operations/AsyncOperation.cpp \
    3436        Operations/OperationQueue.cpp \
     37        Operations/OperationRegistry.cpp \
    3538        Operations/SyncOperation.cpp \
    3639        Operations/Controllers/CheckResultsOperation.cpp \
    … …  
    5255        Operations/Operation.hpp \
    5356        Operations/OperationQueue.hpp \
     57        Operations/OperationRegistry.hpp \
    5458        Operations/SyncOperation.hpp \
    5559        Operations/Controllers/CheckResultsOperation.hpp \
    … …  
    7276libJobMarketOperations_la_SOURCES = $(OPERATIONSSOURCE)
    7377
     78POOLSOURCE = \
     79        Pool/WorkerPool.cpp
     80
     81POOLHEADER = \
     82        Pool/WorkerPool.hpp
     83
     84noinst_LTLIBRARIES += libJobMarketPool.la
     85libJobMarketPool_la_includedir = $(includedir)/MoleCuilder/JobMarket
     86nobase_libJobMarketPool_la_include_HEADERS = $(POOLHEADER)
     87libJobMarketPool_la_SOURCES = $(POOLSOURCE)
     88
    7489HELPERSOURCE = \
    7590        atexit.cpp \
     91        DefaultOptions.cpp \
    7692        GlobalJobId.cpp \
    7793        Listener.cpp \
     94        SignalHandler.cpp \
     95        SignalOptions.cpp \
    7896        WorkerAddress.cpp
    7997
    8098HELPERHEADER = \
    8199        atexit.hpp \
     100        Connection.hpp \
     101        DefaultOptions.hpp \
    82102        ExitflagContainer.hpp \
    83103        GlobalJobId.hpp \
    84104        Listener.hpp \
     105        SignalHandler.hpp \
     106        SignalOptions.hpp \
    85107        WorkerAddress.hpp
    86108
    … …  
    90112libJobMarketHelper_la_SOURCES = $(HELPERSOURCE)
    91113
    92 CONTROLLERSOURCE = \
    93         FragmentController.cpp \
    94         Operations/OperationRegistry.cpp
    95 
    96 CONTROLLERHEADER = \
    97         Connection.hpp \
    98         FragmentController.hpp \
    99         Operations/OperationRegistry.hpp
    100 
    101 POOLWORKERSOURCE = \
    102         Pool/PoolWorker.cpp
    103 
    104 POOLWORKERHEADER = \
    105         Connection.hpp \
    106         Pool/PoolWorker.hpp
    107 
    108 SERVERSOURCE = \
    109         FragmentScheduler.cpp \
    110         Pool/WorkerPool.cpp
    111 
    112 SERVERHEADER = \
    113         Connection.hpp \
    114         ControllerChoices.hpp \
    115         FragmentScheduler.hpp \
    116         Pool/WorkerPool.hpp
    117 
    118 lib_LTLIBRARIES = libJobMarket.la
     114lib_LTLIBRARIES += libJobMarket.la
    119115# make libtool link with C++ linker
    120116nodist_EXTRA_libJobMarket_la_SOURCES = dummy.cpp
    … …  
    122118libJobMarket_la_LDFLAGS = $(AM_LDFLAGS) \
    123119        $(BOOST_ASIO_LDFLAGS) \
     120        $(BOOST_PROGRAM_OPTIONS_LDFLAGS)  \
    124121        $(BOOST_SERIALIZATION_LDFLAGS) \
    125122        $(BOOST_THREAD_LDFLAGS) \
    … …  
    129126        ${CodePatterns_LDFLAGS}
    130127libJobMarket_la_LIBADD = \
     128        libJobMarketPool.la \
    131129        libJobMarketOperations.la \
    132130        libJobMarketJobs.la \
    133131        libJobMarketHelper.la \
    134132        $(BOOST_ASIO_LIBS) \
     133        $(BOOST_PROGRAM_OPTIONS_LIBS) \
    135134        $(BOOST_SERIALIZATION_LIBS) \
    136135        $(BOOST_THREAD_LIBS) \
    … …  
    156155## from each source file.  Note that it is not necessary to list header files
    157156## which are already listed elsewhere in a _HEADERS variable assignment.
    158 libJobMarket_la_SOURCES = $(CONTROLLERSOURCE) $(POOLWORKERSOURCE) $(SERVERSOURCE) $(WORKERSOURCE)
     157libJobMarket_la_SOURCES = $(POOLWORKERSOURCE) $(SERVERSOURCE)
    159158
    160159## Instruct libtool to include ABI version information in the generated shared
    … …  
    191190pkgconfigdir = $(libdir)/pkgconfig
    192191pkgconfig_DATA = $(top_builddir)/JobMarket.pc $(top_builddir)/JobMarket-debug.pc
     192
     193
     194CONTROLLERSOURCE = \
     195        Controller/controller_main.cpp \
     196        Controller/controller_SystemCommandJob.cpp \
     197        Controller/ControllerCommandRegistry.cpp \
     198        Controller/ControllerOptions.cpp \
     199        Controller/ControllerOptions_SystemCommandJob.cpp \
     200        Controller/FragmentController.cpp
     201
     202CONTROLLERHEADER = \
     203        Controller/controller_AddOn.hpp \
     204        Controller/controller_main.hpp \
     205        Controller/controller_SystemCommandJob.hpp \
     206        Controller/ControllerCommand.hpp \
     207        Controller/ControllerCommandRegistry.hpp \
     208        Controller/ControllerOptions.hpp \
     209        Controller/ControllerOptions_SystemCommandJob.hpp \
     210        Controller/FragmentController.hpp
     211
     212lib_LTLIBRARIES += libJobMarketController.la
     213libJobMarketController_la_includedir = $(includedir)/MoleCuilder/JobMarket
     214nobase_libJobMarketController_la_include_HEADERS = $(CONTROLLERHEADER)
     215libJobMarketController_la_SOURCES = $(CONTROLLERSOURCE)
     216libJobMarketController_la_LDFLAGS = \
     217        ${CodePatterns_LDFLAGS}
     218libJobMarketController_la_LIBADD = \
     219        libJobMarket.la \
     220        ${CodePatterns_LIBS}
     221
     222POOLWORKERSOURCE = \
     223        Pool/PoolWorker.cpp \
     224        poolworker_main.cpp \
     225        WorkerOptions.cpp
     226
     227POOLWORKERHEADER = \
     228        Pool/PoolWorker.hpp \
     229        poolworker_main.hpp \
     230        WorkerOptions.hpp
     231
     232lib_LTLIBRARIES += libJobMarketPoolWorker.la
     233libJobMarketPoolWorker_la_includedir = $(includedir)/MoleCuilder/JobMarket
     234nobase_libJobMarketPoolWorker_la_include_HEADERS = $(POOLWORKERHEADER)
     235libJobMarketPoolWorker_la_SOURCES = $(POOLWORKERSOURCE)
     236libJobMarketPoolWorker_la_LDFLAGS = \
     237        ${CodePatterns_LDFLAGS}
     238libJobMarketPoolWorker_la_LIBADD = \
     239        libJobMarket.la \
     240        ${CodePatterns_LIBS}
     241
     242SERVERSOURCE = \
     243        FragmentScheduler.cpp \
     244        server_main.cpp \
     245        ServerOptions.cpp
     246
     247SERVERHEADER = \
     248        FragmentScheduler.hpp \
     249        server_main.hpp \
     250        ServerOptions.hpp
     251
     252lib_LTLIBRARIES += libJobMarketServer.la
     253libJobMarketServer_la_includedir = $(includedir)/MoleCuilder/JobMarket
     254nobase_libJobMarketServer_la_include_HEADERS = $(SERVERHEADER)
     255libJobMarketServer_la_SOURCES = $(SERVERSOURCE)
     256libJobMarketServer_la_LDFLAGS = \
     257        ${CodePatterns_LDFLAGS}
     258libJobMarketServer_la_LIBADD = \
     259        libJobMarket.la \
     260        ${CodePatterns_LIBS}
     261
     262
     263bin_PROGRAMS += Controller PoolWorker Server
     264
     265Controller_SOURCES = Controller/controller.cpp Controller/controller_main.hpp Controller/controller_AddOn_SystemCommandJob.cpp
     266Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SERIALIZATION_LDFLAGS)
     267Controller_CXXFLAGS = $(AM_CPPFLAGS)
     268Controller_LDADD = \
     269        libJobMarketController.la \
     270        libJobMarket.la \
     271        $(top_builddir)/../LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     272        ${CodePatterns_LIBS}
     273
     274PoolWorker_SOURCES = poolworker.cpp
     275PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
     276PoolWorker_CXXFLAGS = $(AM_CPPFLAGS)
     277PoolWorker_LDADD = \
     278        libJobMarketPoolWorker.la \
     279        libJobMarket.la \
     280        $(top_builddir)/../LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     281        ${CodePatterns_LIBS}
     282
     283Server_SOURCES = server.cpp
     284Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
     285Server_CXXFLAGS = $(AM_CPPFLAGS)
     286Server_LDADD = \
     287        libJobMarketServer.la \
     288        libJobMarket.la \
     289        $(top_builddir)/../LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
     290        ${CodePatterns_LIBS}
     291

  • JobMarket/src/unittests/Makefile.am

    ra10cc0 r7da5cd  
    101101  stubs/AsyncOperationStub.hpp
    102102OperationQueueUnitTest_LDADD = \
    103         ../JobMarket/libJobMarket.la \
     103        ../JobMarket/libJobMarketOperations.la \
     104        ../JobMarket/libJobMarketJobs.la \
     105        ../JobMarket/libJobMarketHelper.la \
    104106  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \
    105107  ${CodePatterns_LIBS}
    … …  
    137139  stubs/ObserverStub.hpp
    138140WorkerPoolUnitTest_LDADD = \
    139         ../JobMarket/libJobMarket.la \
     141        ../JobMarket/libJobMarketPool.la \
     142        ../JobMarket/libJobMarketHelper.la \
    140143  $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
    141144  $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS) \

  • src/ControllerOptions_MPQCCommandJob.hpp

    ra10cc0 r7da5cd  
    1818#include <string>
    1919
    20 #include "ControllerOptions.hpp"
     20#include "JobMarket/Controller/ControllerOptions.hpp"
    2121
    2222struct ControllerOptions_MPQCCommandJob : public ControllerOptions

  • src/Makefile.am

    ra10cc0 r7da5cd  
    258258libmenu_a_SOURCES = ${UISOURCE} ${UIHEADER}
    259259noinst_LIBRARIES = libmenu.a
    260 bin_PROGRAMS += molecuilder joiner analyzer Controller PoolWorker Server
     260bin_PROGRAMS += molecuilder joiner analyzer PoolWorker Server
    261261EXTRA_PROGRAMS = unity
    262262
    … …  
    361361CONTROLLERSOURCE = \
    362362        controller_MPQCCommandJob.cpp \
    363         ControllerCommandRegistry.cpp \
    364         ControllerOptions.cpp \
    365         ControllerOptions_MPQCCommandJob.cpp \
    366         DefaultOptions.cpp
     363        ControllerOptions_MPQCCommandJob.cpp
    367364
    368365CONTROLLERHEADER = \
    369         controller_AddOn.hpp \
    370366        controller_MPQCCommandJob.hpp \
    371         ControllerCommand.hpp \
    372         ControllerCommandRegistry.hpp \
    373         ControllerOptions.hpp \
    374         ControllerOptions_MPQCCommandJob.hpp \
    375         DefaultOptions.hpp
    376 
    377 EXTRA_DIST += \
    378         controller_AddOn_SystemCommandJob.cpp \
    379         controller_SystemCommandJob.cpp \
    380         controller_SystemCommandJob.hpp \
    381         ControllerOptions_SystemCommandJob.cpp \
    382         ControllerOptions_SystemCommandJob.hpp
    383        
     367        ControllerOptions_MPQCCommandJob.hpp
     368
    384369
    385370noinst_LTLIBRARIES += libFragmentationAutomationController.la
    … …  
    390375        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
    391376
    392 POOLWORKERSOURCE = \
    393         DefaultOptions.cpp \
    394         SignalHandler.cpp \
    395         SignalOptions.cpp \
    396         WorkerOptions.cpp
    397 
    398 POOLWORKERHEADER = \
    399         DefaultOptions.hpp \
    400         SignalHandler.hpp \
    401         SignalOptions.hpp \
    402         WorkerOptions.hpp
    403 
    404 lib_LTLIBRARIES += libFragmentationAutomationPoolWorker.la
    405 libFragmentationAutomationPoolWorker_la_includedir = $(includedir)/MoleCuilder/JobMarket
    406 nobase_libFragmentationAutomationPoolWorker_la_include_HEADERS = $(POOLWORKERHEADER)
    407 libFragmentationAutomationPoolWorker_la_SOURCES = $(POOLWORKERSOURCE)
    408 libFragmentationAutomationPoolWorker_la_LIBADD = \
    409         $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
    410 
    411 SERVERSOURCE = \
    412         DefaultOptions.cpp \
    413         ServerOptions.cpp \
    414         SignalHandler.cpp \
    415         SignalOptions.cpp
    416 
    417 SERVERHEADER = \
    418         DefaultOptions.hpp \
    419         ServerOptions.hpp \
    420         SignalHandler.hpp \
    421         SignalOptions.hpp
    422 
    423 noinst_LTLIBRARIES += libFragmentationAutomationServer.la
    424 libFragmentationAutomationServer_la_includedir = $(includedir)/MoleCuilder/JobMarket
    425 nobase_libFragmentationAutomationServer_la_include_HEADERS = $(SERVERHEADER)
    426 libFragmentationAutomationServer_la_SOURCES = $(SERVERSOURCE)
    427 libFragmentationAutomationServer_la_LIBADD = \
    428         $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la
    429 
    430377bin_PROGRAMS += Controller PoolWorker Server
    431378
    432 Controller_SOURCES = controller.cpp controller_main.cpp controller_main.hpp controller_AddOn_MPQCCommandJob.cpp
    433 Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     379Controller_SOURCES = controller.cpp controller_AddOn_MPQCCommandJob.cpp
     380Controller_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) ${CodePatterns_LDFLAGS}
    434381Controller_CXXFLAGS = $(AM_CPPFLAGS)
    435382Controller_LDADD = \
     383        libFragmentationAutomationController.la \
    436384        libMolecuilderJobs.la \
    437         libFragmentationAutomationController.la \
    438385        libMolecuilderFragmentation.la \
    439386        libMolecuilderHelpers.la \
     387        $(top_builddir)/JobMarket/src/JobMarket/libJobMarketController.la \
    440388        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    441389        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    442         ${CodePatterns_LIBS} \
    443         $(BOOST_PROGRAM_OPTIONS_LIBS)
    444 
    445 PoolWorker_SOURCES = poolworker.cpp poolworker_main.cpp poolworker_main.hpp
    446 PoolWorker_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     390        $(BOOST_PROGRAM_OPTIONS_LIBS) \
     391        ${CodePatterns_LIBS}
     392
     393PoolWorker_SOURCES = poolworker.cpp
     394PoolWorker_LDFLAGS = $(AM_LDFLAGS) ${CodePatterns_LDFLAGS}
    447395PoolWorker_CXXFLAGS = $(AM_CPPFLAGS)
    448396PoolWorker_LDADD = \
    449397        libMolecuilderJobs.la \
    450         libFragmentationAutomationPoolWorker.la \
     398        $(top_builddir)/JobMarket/src/JobMarket/libJobMarketPoolWorker.la \
    451399        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    452400        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    453         ${CodePatterns_LIBS} \
    454         $(BOOST_PROGRAM_OPTIONS_LIBS)
    455 
    456 Server_SOURCES = Server.cpp server_main.cpp server_main.hpp
    457 Server_LDFLAGS = $(AM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
     401        ${CodePatterns_LIBS}
     402
     403Server_SOURCES = Server.cpp
     404Server_LDFLAGS = $(AM_LDFLAGS) ${CodePatterns_LDFLAGS}
    458405Server_CXXFLAGS = $(AM_CPPFLAGS)
    459406Server_LDADD = \
    460407        libMolecuilderJobs.la \
    461         libFragmentationAutomationServer.la \
     408        $(top_builddir)/JobMarket/src/JobMarket/libJobMarketServer.la \
    462409        $(top_builddir)/JobMarket/src/JobMarket/libJobMarket.la \
    463410        $(top_builddir)/LinearAlgebra/src/LinearAlgebra/libLinearAlgebra.la \
    464         ${CodePatterns_LIBS} \
    465         $(BOOST_PROGRAM_OPTIONS_LIBS)
     411        ${CodePatterns_LIBS}
    466412
    467413

  • src/controller.cpp

    ra10cc0 r7da5cd  
    2121#include "CodePatterns/MemDebug.hpp"
    2222
    23 #include "controller_main.hpp"
     23#include "JobMarket/Controller/controller_main.hpp"
    2424
    2525int main(int argc, char* argv[])

  • src/controller_MPQCCommandJob.cpp

    ra10cc0 r7da5cd  
    2929#include <fstream>
    3030
    31 #include "FragmentController.hpp"
    32 #include "Jobs/MPQCCommandJob.hpp"
    33 #include "Results/FragmentResult.hpp"
    34 
    35 #include "ControllerCommand.hpp"
    36 #include "ControllerCommandRegistry.hpp"
    37 #include "ControllerOptions_MPQCCommandJob.hpp"
     31#include "CodePatterns/Info.hpp"
     32#include "CodePatterns/Log.hpp"
     33
     34#include "JobMarket/Controller/ControllerCommand.hpp"
     35#include "JobMarket/Controller/ControllerCommandRegistry.hpp"
     36#include "JobMarket/Controller/FragmentController.hpp"
     37#include "JobMarket/Jobs/FragmentJob.hpp"
     38#include "JobMarket/Results/FragmentResult.hpp"
    3839
    3940#include "Fragmentation/EnergyMatrix.hpp"
    … …  
    4748#include "Jobs/MPQCCommandJob_MPQCData.hpp"
    4849
     50#include "ControllerOptions_MPQCCommandJob.hpp"
    4951
    5052/** Creates a MPQCCommandJob with argument \a filename.

  • src/controller_MPQCCommandJob.hpp

    ra10cc0 r7da5cd  
    1717#include <boost/program_options.hpp>
    1818
    19 #include "controller_AddOn.hpp"
     19#include "JobMarket/Controller/controller_AddOn.hpp"
    2020
    2121class ControllerCommand;
Note: See TracChangeset for help on using the changeset viewer.