Changeset 7b0494 for src/Fragmentation/SetValues/unittests/Makefile.am

Timestamp:

Apr 15, 2013, 6:13:22 PM (12 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:

410405

Parents:

0cd8cf

git-author:

Frederik Heber <heber@…> (04/10/13 12:56:31)

git-committer:

Frederik Heber <heber@…> (04/15/13 18:13:22)

Message:

Moved SamplingGrid... over to Fragmentation/SetValues.

• adapted all includes accordingly.
• libMolecuilderSetvalues is now shared.
• the dependency was wrong so far. Jobs are intimately attached to the JobMarket (as are Fragmentation/Automation's controllers) but the grid stuff is just another setvalue that stands on its own. Hence, stuff in Jobs may depend on modules in Fragmentation.

File:

• src/Fragmentation/SetValues/unittests/Makefile.am (modified) (3 diffs)

src/Fragmentation/SetValues/unittests/Makefile.am

@@ -5 +5 @@
         ../Fragmentation/SetValues/unittests/FragmentUnitTest.cpp \
         ../Fragmentation/SetValues/unittests/HistogramUnitTest.cpp \
-        ../Fragmentation/SetValues/unittests/IndexedVectorsUnitTest.cpp
+        ../Fragmentation/SetValues/unittests/IndexedVectorsUnitTest.cpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridUnitTest.cpp
 
 FRAGMENTATIONSETVALUESTESTSHEADERS = \
         ../Fragmentation/SetValues/unittests/FragmentUnitTest.hpp \
         ../Fragmentation/SetValues/unittests/HistogramUnitTest.hpp \
-        ../Fragmentation/SetValues/unittests/IndexedVectorsUnitTest.hpp
+        ../Fragmentation/SetValues/unittests/IndexedVectorsUnitTest.hpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridPropertiesUnitTest.hpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridUnitTest.hpp
 
 FRAGMENTATIONSETVALUESTESTS = \
         FragmentUnitTest \
-  HistogramUnitTest \
-  IndexedVectorsUnitTest
+        HistogramUnitTest \
+        IndexedVectorsUnitTest \
+        SamplingGridPropertiesUnitTest \
+        SamplingGridUnitTest
 
 TESTS += $(FRAGMENTATIONSETVALUESTESTS)
@@ -32 +38 @@
         ${FRAGMENTATIONSETVALUESLIBS} \
         $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
-        
 
 HistogramUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
@@ -44 +49 @@
 IndexedVectorsUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
 
+SamplingGridPropertiesUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridPropertiesUnitTest.cpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridPropertiesUnitTest.hpp
+SamplingGridPropertiesUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
+
+SamplingGridUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridUnitTest.cpp \
+        ../Fragmentation/SetValues/unittests/SamplingGridUnitTest.hpp
+SamplingGridUnitTest_LDADD = ${FRAGMENTATIONSETVALUESLIBS}
+
 #AUTOMAKE_OPTIONS = parallel-tests