Changeset c0da07

Timestamp:

Oct 17, 2011, 4:52:28 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:

89a67f

Parents:

ec0acc

git-author:

Frederik Heber <heber@…> (09/30/11 16:02:47)

git-committer:

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

Message:

Added constructor that set value to ContinuousParameter and DiscreteParameter.

Location:

src/Parser/Parameters

Files:

• ContinuousParameter.hpp (modified) (1 diff)
• ContinuousParameter_impl.hpp (modified) (3 diffs)
• DiscreteParameter.hpp (modified) (1 diff)
• DiscreteParameter_impl.hpp (modified) (1 diff)

src/Parser/Parameters/ContinuousParameter.hpp

@@ -27 +27 @@
 public:
   ContinuousParameter(const std::string &_name);
+  ContinuousParameter(const std::string &_name, const T &_value);
   ContinuousParameter(const std::string &_name, const range<T> &_ValidRange);
+  ContinuousParameter(const std::string &_name, const range<T> &_ValidRange, const T &_value);
   virtual ~ContinuousParameter();
 

src/Parser/Parameters/ContinuousParameter_impl.hpp

@@ -14 +14 @@
 #endif
 
+#include <limits>
+
 #include "ContinuousParameter.hpp"
 
@@ -21 +23 @@
 template<typename T>
 ContinuousParameter<T>::ContinuousParameter(const std::string &_name) :
-  Parameter(_name)
+  Parameter(_name),
+  ContinuousValue<T>(range<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max()))
 {};
+
+/** Constructor for class ContinuousParameter.
+ *
+ * @param _name name of this parameter
+ * @param _value initial value to set
+ */
+template<typename T>
+ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const T &_value) :
+  Parameter(_name),
+  ContinuousValue<T>(range<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max()))
+{
+  setValue(_value);
+};
 
 /** Constructor for class ContinuousParameter.
@@ -34 +50 @@
   ContinuousValue<T>(_ValidRange)
 {};
+
+/** Constructor for class ContinuousParameter.
+ *
+ * @param _name name of this parameter
+ * @param _ValidRange valid range for this ContinuousValue
+ * @param _value initial value to set
+ */
+template<typename T>
+ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const range<T> &_ValidRange, const T &_value) :
+  Parameter(_name),
+  ContinuousValue<T>(_ValidRange)
+{
+  setValue(_value);
+};
 
 /** Destructor for class ContinuousParameter.

src/Parser/Parameters/DiscreteParameter.hpp

@@ -30 +30 @@
   DiscreteParameter(const std::string &_name);
   DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues);
+  DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues, const T &_value);
   virtual ~DiscreteParameter();
 

src/Parser/Parameters/DiscreteParameter_impl.hpp

@@ -37 +37 @@
 {};
 
+/** Constructor for class DiscreteParameter.
+ *
+ * @param _name name of this parameter
+ * @param _ValidValues valid values for this DiscreteValue
+ * @param _value initial value to set
+ */
+template<typename T>
+DiscreteParameter<T>::DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues, const T &_value) :
+  Parameter(_name),
+  DiscreteValue<T>(_ValidValues)
+{
+  setValue(_value);
+};
+
 /** Destructor for class DiscreteParameter.
  *