Changeset e45c1d for src/Parameters/ContinuousValue_impl.hpp

Timestamp:

Jun 13, 2012, 5:39:01 PM (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, 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:

7951b9

Parents:

e5d7970

git-author:

Frederik Heber <heber@…> (05/09/12 18:40:56)

git-committer:

Frederik Heber <heber@…> (06/13/12 17:39:01)

Message:

Added ParameterExceptions, is caught by Dialog::checkAll() for the moment.

• AssertExceptions are useless eventually when invalid value is set. now, we throw ParameterException's: ParameterValueException and ParameterValidatorException.
• ContinuousValue, though unused, now inherits from Value, and just implements necessary functions.
• Parameter catches Value<T>'s set, get, setAsString, getAsString functions and adds the parameter name as additional information.
• Validators may throw ParameterValidatorException, too.
• changed some of the test functions in ContinuousValueTest and DiscreteValueTest such that they always expect Parameter...Exception.
• changed MpqcParser_Parameters and Psi3_Parameters as they implement specific getAsString for bool type.

File:

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

src/Parameters/ContinuousValue_impl.hpp

@@ -23 +23 @@
 
 #include "ContinuousValue.hpp"
+
+#include "ParameterExceptions.hpp"
 
 /** Constructor of class DiscreteValue.
@@ -56 +58 @@
  */
 template <class T>
-bool ContinuousValue<T>::isValid(const T & _value) const
+bool ContinuousValue<T>::isValid(const T & _value) const throw(ParameterValidatorException)
 {
   bool isBefore = true;
   bool isBeyond = true;
   // check left boundary
-  isBefore = !((!ValidRangeSet.first) || (!ValidRange.isBefore(_value)));
+  if ((!ValidRangeSet.first) || (!ValidRangeSet.last))
+    throw ParameterValidatorException();
+  isBefore = !((!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));
+  isBeyond = !((!ValidRange.isBeyond(_value)) || (_value == ValidRange.last));
 //  if (isBeyond)
 //    LOG(0, "INFO: " << _value << " is beyond " << ValidRange.last << ".");
@@ -77 +81 @@
  */
 template <class T>
-bool ContinuousValue<T>::operator==(const ContinuousValue<T> &_instance) const
+bool ContinuousValue<T>::operator==(const ContinuousValue<T> &_instance) const const throw(ParameterException)
 {
   bool status = true;
+  if ((!ValueSet) || (!_instance.ValueSet))
+    throw ParameterValueException();
+  if ((!ValidRangeSet.first) || ((!ValidRangeSet.first))
+      || (!_instance.ValidRangeSet.first) || ((!_instance.ValidRangeSet.first)))
+    throw ParameterValidatorException();
   status = status && (ValidRange == _instance.ValidRange);
   status = status && (ValueSet == _instance.ValueSet);
-  if (ValueSet && _instance.ValueSet)
-    status = status && (value == _instance.value);
+  status = status && (value == _instance.value);
   return status;
-}
-
-/** Getter of value, returning string.
- *
- * @return string value
- */
-template <class T>
-const T & ContinuousValue<T>::get() const
-{
-  ASSERT(ValueSet,
-      "ContinuousValue<T>::get() - requesting unset value.");
-  return value;
-}
-
-/** Setter of value for string
- *
- * @param _value string containing new value
- */
-template <class T>
-void ContinuousValue<T>::set(const T & _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 << ".");
 }
 
@@ -121 +102 @@
  */
 template <class T>
-void ContinuousValue<T>::setValidRange(const range<T> &_range)
+void ContinuousValue<T>::setValidRange(const range<T> &_range) throw(ParameterValueException)
 {
-
   ValidRangeSet = range<bool>(true, true);
   ValidRange = _range;
@@ -132 +112 @@
       ValueSet = false;
       // have full check again in assert such that it appears in output, too
-      ASSERT(ValidRange.isInRange(value) || (value == ValidRange.last),
-          "ContinuousValue<T>::setValidRange() - new range "
-          +toString(_range)+" invalidates current value "+toString(value)+".");
+      if (!ValidRange.isInRange(value) && (value != ValidRange.last))
+        throw ParameterValueException() << ParameterValidValues(toString(_range));
     }
   }
@@ -145 +124 @@
  */
 template <class T>
-const range<T> & ContinuousValue<T>::getValidRange() const
+const range<T> & ContinuousValue<T>::getValidRange() const throw(ParameterValidatorException)
 {
-  ASSERT(ValidRangeSet.first && ValidRangeSet.last,
-      "ContinuousValue<T>::getValidRange() called though no valid range set so far.");
+  if (!ValidRangeSet.first || !ValidRangeSet.last)
+    throw ParameterValidatorException();
   return ValidRange;
 }
 
-/** Checks whether \a _value is a valid value.
- * \param _value value to check for validity.
- * \return true - \a _value is valid, false - is not
- */
-template <class T>
-bool ContinuousValue<T>::isValidAsString(const std::string _value) const
-{
-  /*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);*/
-  return true;
-}
-
-
-/** Sets the value.
- *
- * We check for its validity, otherwise we throw an Assert::AssertionFailure.
- *
- * @param _value const reference of value to set
- */
-template <class T>
-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;*/
-}
-
-/** Getter for the set value.
- *
- * We check whether it has been set, otherwise we throw an Assert::AssertionFailure.
- *
- * @return set value
- */
-template <class T>
-const std::string ContinuousValue<T>::getAsString() const
-{
-  ASSERT(ValueSet,
-      "ContinuousValue<T>::get() - value has never been set.");
-  return toString(value);
-}
-
 #endif /* CONTINUOUSVALUE_IMPL_HPP_ */