Changeset c4afd1

Timestamp:

Oct 17, 2011, 4:52:20 PM (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:

39fa96

Parents:

498ddd

git-author:

Frederik Heber <heber@…> (09/30/11 12:29:13)

git-committer:

Frederik Heber <heber@…> (10/17/11 16:52:20)

Message:

Added Continuous- and DiscreteParameter classes.

• new interface class Parameter which is a clonable ValueInterface.
• Continuous- and DiscreteParameter implement the clone() function for Continuous- and DiscreteValue respectively.
• also added unit tests on each clone function.

Location:

src/Parser/Parameters

Files:

• ContinuousParameter.hpp (added)
• ContinuousParameter_impl.hpp (added)
• DiscreteParameter.hpp (added)
• DiscreteParameter_impl.hpp (added)
• Parameter.hpp (added)
• unittests/ContinuousParameterUnitTest.cpp (added)
• unittests/ContinuousParameterUnitTest.hpp (added)
• unittests/DiscreteParameterUnitTest.cpp (added)
• unittests/DiscreteParameterUnitTest.hpp (added)
• unittests/Makefile.am (modified) (3 diffs)

src/Parser/Parameters/unittests/Makefile.am

@@ -5 +5 @@
 PARSERPARAMETERSTESTSSOURCES = \
         ../Parser/Parameters/unittests/ContinuousValueUnitTest.cpp \
-        ../Parser/Parameters/unittests/DiscreteValueUnitTest.cpp
+        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.cpp \
+        ../Parser/Parameters/unittests/DiscreteValueUnitTest.cpp \
+        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.cpp
 
 PARSERPARAMETERSTESTSHEADERS = \
         ../Parser/Parameters/unittests/ContinuousValueUnitTest.hpp \
-        ../Parser/Parameters/unittests/DiscreteValueUnitTest.hpp
+        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.hpp \
+        ../Parser/Parameters/unittests/DiscreteValueUnitTest.hpp \
+        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.hpp
 
 PARSERPARAMETERSTESTS = \
         ContinuousValueUnitTest \
-        DiscreteValueUnitTest
+        ContinuousParameterUnitTest \
+        DiscreteValueUnitTest \
+        DiscreteParameterUnitTest
 
 TESTS += $(PARSERPARAMETERSTESTS)
@@ -26 +32 @@
         ../Parser/Parameters/unittests/ContinuousValueUnitTest.hpp \
         ../Parser/Parameters/ContinuousValue.hpp \
-        ../Parser/Parameters/ContinuousValue_impl.hpp
+        ../Parser/Parameters/ContinuousValue_impl.hpp \
+        ../Parser/Parameters/ValueInterface.hpp
 ContinuousValueUnitTest_LDADD = \
+        $(PARSERPARAMETERSLIBS)
+ 
+ContinuousParameterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.cpp \
+        ../Parser/Parameters/unittests/ContinuousParameterUnitTest.hpp \
+        ../Parser/Parameters/ContinuousValue.hpp \
+        ../Parser/Parameters/ContinuousValue_impl.hpp \
+        ../Parser/Parameters/ContinuousParameter.hpp \
+        ../Parser/Parameters/ContinuousParameter_impl.hpp \
+        ../Parser/Parameters/Parameter.hpp \
+        ../Parser/Parameters/ValueInterface.hpp
+ContinuousParameterUnitTest_LDADD = \
         $(PARSERPARAMETERSLIBS)
  
@@ -34 +53 @@
         ../Parser/Parameters/unittests/DiscreteValueUnitTest.hpp \
         ../Parser/Parameters/DiscreteValue.hpp \
-        ../Parser/Parameters/DiscreteValue_impl.hpp
+        ../Parser/Parameters/DiscreteValue_impl.hpp \
+        ../Parser/Parameters/ValueInterface.hpp
 DiscreteValueUnitTest_LDADD = \
+        $(PARSERPARAMETERSLIBS)
+
+DiscreteParameterUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.cpp \
+        ../Parser/Parameters/unittests/DiscreteParameterUnitTest.hpp \
+        ../Parser/Parameters/DiscreteValue.hpp \
+        ../Parser/Parameters/DiscreteValue_impl.hpp \
+        ../Parser/Parameters/DiscreteParameter.hpp \
+        ../Parser/Parameters/DiscreteParameter_impl.hpp \
+        ../Parser/Parameters/Parameter.hpp \
+        ../Parser/Parameters/ValueInterface.hpp
+DiscreteParameterUnitTest_LDADD = \
         $(PARSERPARAMETERSLIBS)