Changeset 7670865 for src/Fragmentation

Timestamp:

Jun 26, 2012, 8:49:41 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:

d920b9

Parents:

35f587

git-author:

Frederik Heber <heber@…> (02/06/12 09:43:38)

git-committer:

Frederik Heber <heber@…> (06/26/12 08:49:41)

Message:

Moved FragmentResult to subfolder Results.

• changed includes and Makefile.am's.

Location:

src/Fragmentation/Automation

Files:

• Controller/Commands/SendResultsOperation.cpp (modified) (1 diff)
• Controller/Commands/SendResultsOperation.hpp (modified) (1 diff)
• Controller/FragmentController.hpp (modified) (1 diff)
• FragmentQueue.hpp (modified) (1 diff)
• FragmentScheduler.hpp (modified) (1 diff)
• FragmentWorker.cpp (modified) (1 diff)
• Jobs/FragmentJob.cpp (modified) (1 diff)
• Jobs/FragmentJob.hpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Results/FragmentResult.cpp (moved) (moved from src/Fragmentation/Automation/FragmentResult.cpp )
• Results/FragmentResult.hpp (moved) (moved from src/Fragmentation/Automation/FragmentResult.hpp )
• controller.cpp (modified) (1 diff)
• unittests/FragmentJobUnitTest.cpp (modified) (1 diff)
• unittests/FragmentResultUnitTest.cpp (modified) (1 diff)
• unittests/Makefile.am (modified) (1 diff)
• unittests/stubs/FragmentResultStub.cpp (modified) (1 diff)

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

@@ -31 +31 @@
 #include "CodePatterns/Log.hpp"
 #include "ControllerChoices.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 
 #include "Controller/Commands/SendResultsOperation.hpp"

src/Fragmentation/Automation/Controller/Commands/SendResultsOperation.hpp

@@ -19 +19 @@
 
 #include "Connection.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 
 #include "Controller/Commands/Operation.hpp"

src/Fragmentation/Automation/Controller/FragmentController.hpp

@@ -20 +20 @@
 #include "Connection.hpp"
 #include "Jobs/FragmentJob.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 
 #include "Controller/CommandRegistry.hpp"

src/Fragmentation/Automation/FragmentQueue.hpp

@@ -20 +20 @@
 #include "types.hpp"
 #include "Jobs/FragmentJob.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 
 class FragmentQueueTest;

src/Fragmentation/Automation/FragmentScheduler.hpp

@@ -18 +18 @@
 
 #include "Connection.hpp"
+#include "ControllerChoices.hpp"
+#include "ControllerChoices.hpp"
+#include "FragmentQueue.hpp"
 #include "Jobs/FragmentJob.hpp"
-#include "FragmentQueue.hpp"
-#include "FragmentResult.hpp"
-#include "ControllerChoices.hpp"
+#include "Results/FragmentResult.hpp"
 #include "types.hpp"
 

src/Fragmentation/Automation/FragmentWorker.cpp

@@ -34 +34 @@
 #include "CodePatterns/Log.hpp"
 #include "Jobs/FragmentJob.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 #include "FragmentWorker.hpp"
 

src/Fragmentation/Automation/Jobs/FragmentJob.cpp

@@ -28 +28 @@
 #include "CodePatterns/toString.hpp"
 #include "FragmentJob.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 
 /** Constructor for class FragmentJob.

src/Fragmentation/Automation/Jobs/FragmentJob.hpp

@@ -20 +20 @@
 #include "boost/serialization/shared_ptr.hpp"
 
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 #include "JobId.hpp"
 #include "types.hpp"

src/Fragmentation/Automation/Makefile.am

@@ -14 +14 @@
 FRAGMENTJOBSSOURCE = \
   FragmentQueue.cpp \
-  FragmentResult.cpp \
   JobId.cpp \
-  Jobs/FragmentJob.cpp
+  Jobs/FragmentJob.cpp \
+  Results/FragmentResult.cpp
           
 FRAGMENTJOBSHEADER = \
   FragmentQueue.hpp \
-  FragmentResult.hpp \
   JobId.hpp \
-  Jobs/FragmentJob.hpp
+  Jobs/FragmentJob.hpp \
+  Results/FragmentResult.hpp
 
 noinst_LTLIBRARIES += libMolecuilderFragmentJobs.la

src/Fragmentation/Automation/controller.cpp

@@ -40 +40 @@
 #include "Controller/Commands/ShutdownOperation.hpp"
 #include "Jobs/FragmentJob.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 
 enum CommandIndices {

src/Fragmentation/Automation/unittests/FragmentJobUnitTest.cpp

@@ -29 +29 @@
 
 #include "Jobs/FragmentJob.hpp"
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 #include "JobId.hpp"
 

src/Fragmentation/Automation/unittests/FragmentResultUnitTest.cpp

@@ -29 +29 @@
 #include "FragmentResultUnitTest.hpp"
 
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 #include "JobId.hpp"
 

src/Fragmentation/Automation/unittests/Makefile.am

@@ -35 +35 @@
   unittests/FragmentJobUnitTest.hpp \
   unittests/stubs/FragmentResultStub.cpp \
-  FragmentResult.hpp \
   JobId.cpp \
   JobId.hpp \
   Jobs/FragmentJob.cpp \
-  Jobs/FragmentJob.hpp
+  Jobs/FragmentJob.hpp \
+  Results/FragmentResult.hpp
 FragmentJobUnitTest_LDADD = \
   $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \

src/Fragmentation/Automation/unittests/stubs/FragmentResultStub.cpp

@@ -20 +20 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "FragmentResult.hpp"
+#include "Results/FragmentResult.hpp"
 
 FragmentResult::FragmentResult(const JobId_t _id) :