Changeset 1ee3b8d

Timestamp:

Feb 3, 2011, 9:59:28 AM (14 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:

0275ad

Parents:

6ff0c8

git-author:

Frederik Heber <heber@…> (01/06/11 12:30:08)

git-committer:

Frederik Heber <heber@…> (02/03/11 09:59:28)

Message:

Made RandomNumbers sources into its own library libMolecuilderRandomNumbers.

• this makes the unit test stuff fast, they use the new lib and not recompiled modules.
• lib is included in Actions, Descriptors, Parser and general unittests, also as a dependency for LinearAlgebra lib.

Files:

• configure.ac (modified) (1 diff)
• src/Actions/unittests/Makefile.am (modified) (1 diff)
• src/Descriptors/unittests/Makefile.am (modified) (1 diff)
• src/LinearAlgebra/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (7 diffs)
• src/Parser/unittests/Makefile.am (modified) (1 diff)
• src/RandomNumbers/Makefile.am (added)
• src/RandomNumbers/unittests/Makefile.am (modified) (1 diff)
• src/unittests/Makefile.am (modified) (1 diff)

configure.ac

@@ -220 +220 @@
         src/LinearAlgebra/Makefile
         src/Parser/Makefile
+  src/RandomNumbers/Makefile
   src/Shapes/Makefile
         src/UIElements/Makefile

src/Actions/unittests/Makefile.am

@@ -21 +21 @@
         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ../../Exceptions/libMolecuilderExceptions.la \
+        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)

src/Descriptors/unittests/Makefile.am

@@ -19 +19 @@
         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ../../Exceptions/libMolecuilderExceptions.la \
+        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)

src/LinearAlgebra/Makefile.am

@@ -54 +54 @@
 libMolecuilderLinearAlgebra_la_LIBADD = \
         ../Exceptions/libMolecuilderExceptions.la \
+        ../RandomNumbers/libMolecuilderRandomNumbers.la \
         $(GSL_LIBS)
 nobase_libMolecuilderLinearAlgebra_la_include_HEADERS = ${LINALGHEADER}

src/Makefile.am

@@ -4 +4 @@
 SUBDIRS = \
         Exceptions \
+        RandomNumbers \
         Parser \
         LinearAlgebra \
@@ -122 +123 @@
   Descriptors/MoleculeSelectionDescriptor_impl.hpp
 
-RANDOMSOURCE = \
-        RandomNumbers/RandomNumberDistribution_Encapsulation.cpp \
-        RandomNumbers/RandomNumberDistributionFactory.cpp \
-        RandomNumbers/RandomNumberEngine_Encapsulation.cpp \
-        RandomNumbers/RandomNumberEngineFactory.cpp \
-        RandomNumbers/RandomNumberGenerator.cpp \
-        RandomNumbers/RandomNumberGeneratorFactory.cpp
-
-RANDOMHEADER = \
-        RandomNumbers/RandomNumberDistribution.hpp \
-        RandomNumbers/RandomNumberDistribution_Encapsulation.hpp \
-        RandomNumbers/RandomNumberDistributionFactory.hpp \
-        RandomNumbers/RandomNumberEngine.hpp \
-        RandomNumbers/RandomNumberEngine_Encapsulation.hpp \
-        RandomNumbers/RandomNumberEngineFactory.hpp \
-        RandomNumbers/RandomNumberGenerator.hpp \
-        RandomNumbers/RandomNumberGenerator_Encapsulation.hpp \
-        RandomNumbers/RandomNumberGeneratorFactory.hpp \
-        RandomNumbers/TemplatePowerSetGenerator.hpp \
-        RandomNumbers/EmptyPrototypeTable.hpp
-  
 THERMOSTATSOURCE = \
   Thermostats/Berendsen.cpp \
@@ -332 +312 @@
         LinearAlgebra/libMolecuilderLinearAlgebra.la \
         Exceptions/libMolecuilderExceptions.la \
+        RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
@@ -352 +333 @@
         LinearAlgebra/libMolecuilderLinearAlgebra.la \
         Exceptions/libMolecuilderExceptions.la \
+        RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB) \
@@ -365 +347 @@
         LinearAlgebra/libMolecuilderLinearAlgebra.la \
         Exceptions/libMolecuilderExceptions.la \
+        RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
@@ -377 +360 @@
         LinearAlgebra/libMolecuilderLinearAlgebra.la \
         Exceptions/libMolecuilderExceptions.la \
+        RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
@@ -412 +396 @@
         echo "#include \"$(srcdir)/version.c\"" >> unity.cpp;
 
-MOSTLYCLEANFILES = unity.cpp 
-        
+MOSTLYCLEANFILES = unity.cpp
+

src/Parser/unittests/Makefile.am

@@ -20 +20 @@
         ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ../../Exceptions/libMolecuilderExceptions.la \
+        ../../RandomNumbers/libMolecuilderRandomNumbers.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)

src/RandomNumbers/unittests/Makefile.am

@@ -19 +19 @@
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
 GSLLIBS = \
-        ../../Shapes/libMolecuilderShapes.la \
-        ../../LinearAlgebra/libMolecuilderLinearAlgebra.la \
-        ../../Exceptions/libMolecuilderExceptions.la \
         ${CodePatterns_LIBS} \
         $(BOOST_LIB)
 
-ALLLIBS = \
-        ../../UIElements/libMolecuilderUI.la \
-        ../../Actions/libMolecuilderActions.la \
-        ${PARSERLIBS} \
-        ../../libMolecuilder.la \
-        ${GSLLIBS}
-
-PARSERLIBS = ../../Parser/libMolecuilderParser.la
-
 RandomNumberDistributionFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         RandomNumberDistributionFactoryUnitTest.cpp \
-        RandomNumberDistributionFactoryUnitTest.hpp \
-        $(srcdir)/../RandomNumberDistribution_Encapsulation.cpp \
-        $(srcdir)/../RandomNumberDistribution_Encapsulation.hpp \
-        $(srcdir)/../RandomNumberDistributionFactory.cpp \
-        $(srcdir)/../RandomNumberDistributionFactory.hpp
-RandomNumberDistributionFactoryUnitTest_LDADD = ${GSLLIBS}
+        RandomNumberDistributionFactoryUnitTest.hpp
+RandomNumberDistributionFactoryUnitTest_LDADD = ${GSLLIBS} \
+        ../../RandomNumbers/libMolecuilderRandomNumbers.la
 
 RandomNumberEngineFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         RandomNumberEngineFactoryUnitTest.cpp \
-        RandomNumberEngineFactoryUnitTest.hpp \
-        $(srcdir)/../RandomNumberEngine_Encapsulation.cpp \
-        $(srcdir)/../RandomNumberEngine_Encapsulation.hpp \
-        $(srcdir)/../RandomNumberEngineFactory.cpp \
-        $(srcdir)/../RandomNumberEngineFactory.hpp
-RandomNumberEngineFactoryUnitTest_LDADD = ${GSLLIBS}
+        RandomNumberEngineFactoryUnitTest.hpp
+RandomNumberEngineFactoryUnitTest_LDADD = ${GSLLIBS} \
+        ../../RandomNumbers/libMolecuilderRandomNumbers.la
 
 RandomNumberGeneratorFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         RandomNumberGeneratorFactoryUnitTest.cpp \
-        RandomNumberGeneratorFactoryUnitTest.hpp \
-        $(srcdir)/../RandomNumberDistribution_Encapsulation.cpp \
-        $(srcdir)/../RandomNumberDistribution_Encapsulation.hpp \
-        $(srcdir)/../RandomNumberDistributionFactory.cpp \
-        $(srcdir)/../RandomNumberDistributionFactory.hpp \
-        $(srcdir)/../RandomNumberEngine_Encapsulation.cpp \
-        $(srcdir)/../RandomNumberEngine_Encapsulation.hpp \
-        $(srcdir)/../RandomNumberEngineFactory.cpp \
-        $(srcdir)/../RandomNumberEngineFactory.hpp \
-        $(srcdir)/../RandomNumberGenerator.cpp \
-        $(srcdir)/../RandomNumberGeneratorFactory.cpp \
-        $(srcdir)/../RandomNumberGeneratorFactory.hpp
-RandomNumberGeneratorFactoryUnitTest_LDADD = ${GSLLIBS}
+        RandomNumberGeneratorFactoryUnitTest.hpp
+RandomNumberGeneratorFactoryUnitTest_LDADD = ${GSLLIBS} \
+        ../../RandomNumbers/libMolecuilderRandomNumbers.la
 
 RandomNumberGeneratorUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
         RandomNumberGeneratorUnitTest.cpp \
-        RandomNumberGeneratorUnitTest.hpp \
-        $(srcdir)/../RandomNumberDistribution_Encapsulation.cpp \
-        $(srcdir)/../RandomNumberDistribution_Encapsulation.hpp \
-        $(srcdir)/../RandomNumberDistributionFactory.cpp \
-        $(srcdir)/../RandomNumberDistributionFactory.hpp \
-        $(srcdir)/../RandomNumberEngine_Encapsulation.cpp \
-        $(srcdir)/../RandomNumberEngine_Encapsulation.hpp \
-        $(srcdir)/../RandomNumberEngineFactory.cpp \
-        $(srcdir)/../RandomNumberEngineFactory.hpp \
-        $(srcdir)/../RandomNumberGenerator.cpp \
-        $(srcdir)/../RandomNumberGeneratorFactory.cpp \
-        $(srcdir)/../RandomNumberGeneratorFactory.hpp
-RandomNumberGeneratorUnitTest_LDADD = ${GSLLIBS}
+        RandomNumberGeneratorUnitTest.hpp
+RandomNumberGeneratorUnitTest_LDADD = ${GSLLIBS} \
+        ../../RandomNumbers/libMolecuilderRandomNumbers.la
 
 

src/unittests/Makefile.am

@@ -42 +42 @@
         ../LinearAlgebra/libMolecuilderLinearAlgebra.la \
         ../Exceptions/libMolecuilderExceptions.la \
+        ../RandomNumbers/libMolecuilderRandomNumbers.la \
         $(BOOST_LIB)
 ALLLIBS = \