Changeset e45c1d for src/Parameters/Validators

Timestamp:

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

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.

Location:

src/Parameters/Validators

Files:

• DiscreteValidator.hpp (modified) (2 diffs)
• DiscreteValidator_impl.hpp (modified) (2 diffs)
• RangeValidator.hpp (modified) (2 diffs)
• RangeValidator_impl.hpp (modified) (2 diffs)

src/Parameters/Validators/DiscreteValidator.hpp

@@ -20 +20 @@
 
 class DiscreteValueTest;
+class ParameterValidatorException;
 
 /** A validator with a discrete list of valid values.
@@ -40 +41 @@
   bool operator==(const Validator<T> &_instance) const;
 
-  void appendValidValue(const T &_value);
+  void appendValidValue(const T &_value) throw(ParameterValidatorException);
   const std::vector<T> &getValidValues() const;
 

src/Parameters/Validators/DiscreteValidator_impl.hpp

@@ -15 +15 @@
 #endif
 
+#include "Parameters/ParameterExceptions.hpp"
 #include <algorithm>
 
@@ -47 +48 @@
 
 template <class T>
-void DiscreteValidator<T>::appendValidValue(const T &_value)
+void DiscreteValidator<T>::appendValidValue(const T &_value) throw(ParameterValidatorException)
 {
-  ASSERT(!isValid(_value),
-      "DiscreteValidator<>::appendValidValue() - value "+toString(_value)+" is already among the valid");
+  if (isValid(_value))
+    throw ParameterValidatorException();
   ValidValues.push_back(_value);
 }

src/Parameters/Validators/RangeValidator.hpp

@@ -17 +17 @@
 #include "Validator.hpp"
 #include "CodePatterns/Range.hpp"
+
+class ParameterValueException;
 
 /** A validator with an interval of valid values.
@@ -37 +39 @@
 
   // getter/setter for valid ranges
-  void setValidRange(const range<T> &_range);
+  void setValidRange(const range<T> &_range) throw(ParameterValueException);
   const range<T> & getValidRange() const {  return ValidRange;  };
 

src/Parameters/Validators/RangeValidator_impl.hpp

@@ -14 +14 @@
 #include <config.h>
 #endif
+
+#include "Parameters/ParameterExceptions.hpp"
 
 template <class T>
@@ -50 +52 @@
 /** Setter for the valid range.
  *
- * If value is invalid in new range, we throw AssertFailure and set ValueSet to false.
+ * \note Check whether range invalidates values is done in Value<T>.
  *
  * @param _range range (pair of values)
  */
 template <class T>
-void RangeValidator<T>::setValidRange(const range<T> &_range)
+void RangeValidator<T>::setValidRange(const range<T> &_range) throw(ParameterValueException)
 {
   ValidRange = _range;
 }
-
-
-
-
-
 
 // specialization for Vector