Changeset 4892c3 for src/Parameters/Value_impl.hpp

Timestamp:

May 22, 2012, 12:09:04 PM (14 years ago)

Author:

Michael Ankele <ankele@…>

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, Candidate_v1.7.0, 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:

8f130c

Parents:

a9a8f9

git-author:

Michael Ankele <ankele@…> (04/13/12 14:56:32)

git-committer:

Michael Ankele <ankele@…> (05/22/12 12:09:04)

Message:

added ValueTest (unit test)

• fixed many minor problems in Value<T> and Validator<T>...

File:

• src/Parameters/Value_impl.hpp (modified) (3 diffs)

src/Parameters/Value_impl.hpp

@@ -22 +22 @@
 #include "CodePatterns/Log.hpp"
 
+#include "Validators/DiscreteValidator.hpp"
+#include "Validators/RangeValidator.hpp"
+
 /** Constructor of class Value.
  */
@@ -32 +35 @@
 /** Constructor of class Value with a validator.
  *
- * @param _ValidValues vector with all valid values
+ * @param _validator general validator to use
  */
 template <class T>
 Value<T>::Value(const Validator<T> &_validator) :
   ValueSet(false),
-  validator(_validator.clone()) // TODO...
+  validator(_validator.clone())
 {}
+
+/** Constructor of class Value with a discrete validator.
+ *
+ * @param _ValidValues vector with all valid values
+ */
+template <class T>
+Value<T>::Value(const std::vector<T> &_ValidValues) :
+  ValueSet(false),
+  validator(NULL)
+{
+  validator = new DiscreteValidator<T>(_ValidValues);
+}
+
+/** Constructor of class Value with a range validator.
+ *
+ * @param _ValidRange range of valid values
+ */
+template <class T>
+Value<T>::Value(const range<T> &_ValidRange) :
+  ValueSet(false),
+  validator(NULL)
+{
+  validator = new RangeValidator<T>(_ValidRange);
+}
 
 /** Destructor of class Value.
@@ -70 +97 @@
 {
   bool status = true;
-  status = status && (ValidValues == _instance.ValidValues);
+  //status = status && (ValidValues == _instance.ValidValues); // TODO
   status = status && (ValueSet == _instance.ValueSet);
   if (ValueSet && _instance.ValueSet)