Changeset 6c05d8 for src

Timestamp:

Jun 1, 2012, 3:31:25 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:

118f1e

Parents:

7dc60a

git-author:

Michael Ankele <ankele@…> (04/18/12 14:02:14)

git-committer:

Michael Ankele <ankele@…> (06/01/12 15:31:25)

Message:

FIX: Value<string>, empty validators

• conversion string -> string only returned the part up to the first blank
• replaced NULL validators with DummyValidator
• unit tests corrected (because Parameter.clone() now works with unset values)

Location:

src/Parameters

Files:

• Parameter_impl.hpp (modified) (1 diff)
• Value.hpp (modified) (2 diffs)
• Value_impl.hpp (modified) (9 diffs)
• unittests/ContinuousParameterTest.cpp (modified) (1 diff)
• unittests/ContinuousValueTest.cpp (modified) (4 diffs)
• unittests/DiscreteParameterTest.cpp (modified) (1 diff)
• unittests/DiscreteValueTest.cpp (modified) (4 diffs)

src/Parameters/Parameter_impl.hpp

@@ -143 +143 @@
 {
   Parameter<T> *instance = new Parameter<T>(ParameterInterface<T>::getName(), Value<T>::getValidator());
-  instance->set(Value<T>::get());
+  if (Value<T>::ValueSet)
+    instance->set(Value<T>::get());
   return instance;
 }

src/Parameters/Value.hpp

@@ -27 +27 @@
 
 class ValueTest;
+template <class T>
+class Parameter;
 
 /** This class represents a general value.
@@ -37 +39 @@
   friend class ValueTest;
   friend class ContinuousValueTest;
+  friend class Parameter<T>;
 public:
   Value();

src/Parameters/Value_impl.hpp

@@ -22 +22 @@
 #include "CodePatterns/Log.hpp"
 
+#include "Validators/DummyValidator.hpp"
 #include "Validators/DiscreteValidator.hpp"
 #include "Validators/RangeValidator.hpp"
@@ -33 +34 @@
 Value<T>::Value() :
   ValueSet(false),
-  validator(NULL)
+  validator(new DummyValidator<T>)
 {}
 
@@ -75 +76 @@
 Value<T>::~Value()
 {
-  if (validator)
-    delete(validator);
+  ASSERT(validator,
+      "Value<T>::~Value() - validator missing.");
+  delete(validator);
 }
 
@@ -86 +88 @@
 bool Value<T>::isValid(const T & _value) const
 {
-  if (validator)
-    return (*validator)(_value);
-  return true;
+  ASSERT(validator,
+      "Value<T>::isValid() - validator missing.");
+  return (*validator)(_value);
 }
 
@@ -99 +101 @@
 bool Value<T>::operator==(const Value<T> &_instance) const
 {
+  ASSERT(validator,
+      "Value<T>::operator==() - validator missing.");
+  ASSERT(_instance.validator,
+      "Value<T>::operator==() - instance.validator missing.");
   bool status = true;
   status = status && (*validator == *_instance.validator);
@@ -148 +154 @@
 }
 
+template <>
+inline bool Value<std::string>::isValidAsString(const std::string _value) const
+{
+  return isValid(_value);
+}
+
 /** Getter of value, returning string.
  *
@@ -173 +185 @@
 }
 
+template <>
+inline void Value<std::string>::setAsString(const std::string _value)
+{
+  set(_value);
+//  LOG(0, "STATUS: Value is now set to " << value << ".");
+}
+
 /** Returns the validator as a const reference.
  *
@@ -180 +199 @@
 const Validator<T> &Value<T>::getValidator() const
 {
+  ASSERT(validator,
+      "Value<T>::getValidator() const - validator missing.");
   return *validator;
 }
@@ -190 +211 @@
 Validator<T> &Value<T>::getValidator()
 {
+  ASSERT(validator,
+      "Value<T>::getValidator() - validator missing.");
   return *validator;
 }

src/Parameters/unittests/ContinuousParameterTest.cpp

@@ -84 +84 @@
   Parameter<int> test("intParam", *ValidIntRange);
 
-  // check that we throw because of unset parameter
-#ifndef NDEBUG
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.clone(), Assert::AssertionFailure);
-#endif
-
   // set parameter
   test.set(2);

src/Parameters/unittests/ContinuousValueTest.cpp

@@ -60 +60 @@
 
   // checking valid values
-  /*for (int i=1; i<=4;++i)
+  for (int i=1; i<=4;++i)
     CPPUNIT_ASSERT_EQUAL(true, test.isValidAsString(toString(i)));
 
@@ -67 +67 @@
     CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));
   for (int i=5; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));*/
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));
 }
 
@@ -144 +144 @@
 
   // setting invalid, throws
-/*#ifndef NDEBUG
+#ifndef NDEBUG
   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
   CPPUNIT_ASSERT_THROW(test.setAsString(toString(5)), Assert::AssertionFailure);
@@ -159 +159 @@
     CPPUNIT_ASSERT_EQUAL(true, test.ValueSet);
     CPPUNIT_ASSERT_EQUAL(toString(i), test.getAsString());
-  }*/
+  }
 }
 

src/Parameters/unittests/DiscreteParameterTest.cpp

@@ -84 +84 @@
   Parameter<int> test("intParam", ValidValues);
 
-  // check that we throw because of unset parameter
-#ifndef NDEBUG
-  std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
-  CPPUNIT_ASSERT_THROW(test.clone(), Assert::AssertionFailure);
-#endif
-
   // set parameter
   test.set(2);

src/Parameters/unittests/DiscreteValueTest.cpp

@@ -82 +82 @@
 
   // checking valid values
-  /*for (int i=1; i<=3;++i)
+  for (int i=1; i<=3;++i)
     CPPUNIT_ASSERT_EQUAL(true, test.isValidAsString(toString(i)));
 
@@ -89 +89 @@
     CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));
   for (int i=4; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));*/
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));
 }
 
@@ -195 +195 @@
 
   // setting invalid, throws
-/*#ifndef NDEBUG
+#ifndef NDEBUG
   std::cout << "The following Assert failures are intended and do not indicate a failure of the test." << std::endl;
   CPPUNIT_ASSERT_THROW(test.setAsString(toString(4)), Assert::AssertionFailure);
@@ -208 +208 @@
     test.setAsString(toString(i));
     CPPUNIT_ASSERT_EQUAL(toString(i), test.getAsString());
-  }*/
+  }
 }