Changeset 047cad for src/Parameters/ContinuousValue_impl.hpp

Timestamp:

May 31, 2012, 1:25:03 PM (13 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, 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:

9b5eb0

Parents:

30ebdd

git-author:

Michael Ankele <ankele@…> (04/16/12 12:30:32)

git-committer:

Michael Ankele <ankele@…> (05/31/12 13:25:03)

Message:

added string functions to ValueInterface

• ContinuousParameter and DiscreteParameter deprecated

File:

• src/Parameters/ContinuousValue_impl.hpp (modified) (6 diffs)

src/Parameters/ContinuousValue_impl.hpp

@@ -58 +58 @@
 bool ContinuousValue<T>::isValid(const T & _value) const
 {
-  return isValidValue(_value);
+  bool isBefore = true;
+  bool isBeyond = true;
+  // check left boundary
+  isBefore = !((!ValidRangeSet.first) || (!ValidRange.isBefore(_value)));
+//  if (isBefore)
+//    LOG(0, "INFO: " << _value << " is before " << ValidRange.first << ".");
+  // check right boundary
+  isBeyond = !((!ValidRangeSet.last) || (!ValidRange.isBeyond(_value)) || (_value == ValidRange.last));
+//  if (isBeyond)
+//    LOG(0, "INFO: " << _value << " is beyond " << ValidRange.last << ".");
+  return (!isBefore) && (!isBeyond);
 }
 
@@ -96 +106 @@
 void ContinuousValue<T>::set(const T & _value)
 {
-  setValue(_value);
+  ASSERT(isValid(_value),
+      "ContinuousValue<T>::setValue() - trying to set invalid value "+toString(_value)+".");
+  if (!ValueSet)
+    ValueSet = true;
+  value = _value;
 //  LOG(0, "STATUS: Value is now set to " << value << ".");
 }
@@ -143 +157 @@
  */
 template <class T>
-bool ContinuousValue<T>::isValidValue(const T &_value) const
-{
-  bool isBefore = true;
+bool ContinuousValue<T>::isValidAsString(const std::string _value) const
+{
+  /*bool isBefore = true;
   bool isBeyond = true;
   // check left boundary
@@ -155 +169 @@
 //  if (isBeyond)
 //    LOG(0, "INFO: " << _value << " is beyond " << ValidRange.last << ".");
-  return (!isBefore) && (!isBeyond);
+  return (!isBefore) && (!isBeyond);*/
+  return true;
 }
 
@@ -166 +181 @@
  */
 template <class T>
-void ContinuousValue<T>::setValue(const T &_value)
-{
-  ASSERT(isValidValue(_value),
+void ContinuousValue<T>::setAsString(const std::string _value)
+{
+  /*ASSERT(isValidAsString(_value),
       "ContinuousValue<T>::setValue() - trying to set invalid value "+toString(_value)+".");
   if (!ValueSet)
     ValueSet = true;
-  value = _value;
+  value = _value;*/
 }
 
@@ -182 +197 @@
  */
 template <class T>
-const T &ContinuousValue<T>::getValue() const
+const std::string ContinuousValue<T>::getAsString() const
 {
   ASSERT(ValueSet,
       "ContinuousValue<T>::get() - value has never been set.");
-  return value;
+  return toString(value);
 }