Changeset 047cad for src/Parameters/unittests/DiscreteValueTest.cpp

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/unittests/DiscreteValueTest.cpp (modified) (10 diffs)

src/Parameters/unittests/DiscreteValueTest.cpp

@@ -76 +76 @@
  *
  */
-void DiscreteValueTest::isValidValueTest()
+void DiscreteValueTest::isValidAsStringTest()
 {
   // create instance
@@ -82 +82 @@
 
   // checking valid values
-  for (int i=1; i<=3;++i)
-    CPPUNIT_ASSERT_EQUAL(true, test.isValidValue(i));
-
-  // checking invalid values
-  for (int i=-10; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
+  /*for (int i=1; i<=3;++i)
+    CPPUNIT_ASSERT_EQUAL(true, test.isValidAsString(toString(i)));
+
+  // checking invalid values
+  for (int i=-10; i<=0;++i)
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));
   for (int i=4; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
+    CPPUNIT_ASSERT_EQUAL(false, test.isValidAsString(toString(i)));*/
 }
 
@@ -121 +121 @@
   // adding values 4,5,6
   for (int i=4; i<=6;++i) {
-    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
+    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
     test.appendValidValue(i);
-    CPPUNIT_ASSERT_EQUAL(true, test.isValidValue(i));
+    CPPUNIT_ASSERT_EQUAL(true, test.isValid(i));
   }
 
@@ -137 +137 @@
   // checking valid values
   for (int i=1; i<=6;++i)
-    CPPUNIT_ASSERT_EQUAL(true, test.isValidValue(i));
-
-  // checking invalid values
-  for (int i=-10; i<=0;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
+    CPPUNIT_ASSERT_EQUAL(true, test.isValid(i));
+
+  // checking invalid values
+  for (int i=-10; i<=0;++i)
+    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
 
   // checking invalid values
   for (int i=7; i<=10;++i)
-    CPPUNIT_ASSERT_EQUAL(false, test.isValidValue(i));
+    CPPUNIT_ASSERT_EQUAL(false, test.isValid(i));
 }
 
@@ -183 +183 @@
  *
  */
-void DiscreteValueTest::settergetterValueTest()
+void DiscreteValueTest::settergetterAsStringTest()
 {
   // create instance
@@ -191 +191 @@
 #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.getValue(), Assert::AssertionFailure);
+  CPPUNIT_ASSERT_THROW(test.getAsString(), Assert::AssertionFailure);
 #endif
 
   // setting invalid, throws
-#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.setValue(4), Assert::AssertionFailure);
-#endif
-#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.setValue(0), Assert::AssertionFailure);
+/*#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);
+#endif
+#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(0)), Assert::AssertionFailure);
 #endif
 
   // checking all valid ones
   for (int i=1; i<=3;++i) {
-    test.setValue(i);
-    CPPUNIT_ASSERT_EQUAL(i, test.getValue());
-  }
+    test.setAsString(toString(i));
+    CPPUNIT_ASSERT_EQUAL(toString(i), test.getAsString());
+  }*/
 }
 
@@ -220 +220 @@
     DiscreteValue<int> test(ValidValues);
     DiscreteValue<int> instance(ValidValues);
-    test.setValue(1);
-    instance.setValue(1);
+    test.set(1);
+    instance.set(1);
 
     // same value, same range
@@ -230 +230 @@
     // different value, same range
     {
-      const int oldvalue = instance.getValue();
-      instance.setValue(2);
+      const int oldvalue = instance.get();
+      instance.set(2);
       CPPUNIT_ASSERT(test != instance);
-      instance.setValue(oldvalue);
+      instance.set(oldvalue);
     }
   }
@@ -241 +241 @@
     instance.appendValidValue(4);
 
-    test.setValue(1);
-    instance.setValue(1);
+    test.set(1);
+    instance.set(1);
 
     // same value, same range
@@ -251 +251 @@
     // different value, same range
     {
-      const int oldvalue = instance.getValue();
-      instance.setValue(2);
+      const int oldvalue = instance.get();
+      instance.set(2);
       CPPUNIT_ASSERT(test != instance);
-      instance.setValue(oldvalue);
-    }
-  }
-}
+      instance.set(oldvalue);
+    }
+  }
+}