Changes in src/Parser/Psi3Parser_Parameters.cpp [0aa122:e45c1d]

File:

• src/Parser/Psi3Parser_Parameters.cpp (modified) (12 diffs)

src/Parser/Psi3Parser_Parameters.cpp

@@ -29 +29 @@
 #include "Psi3Parser_Parameters.hpp"
 
-#include "Parser/Parameters/ContinuousParameter.hpp"
-#include "Parser/Parameters/DiscreteParameter.hpp"
-#include "Parser/Parameters/StringParameter.hpp"
-
-// TODO: ContinuousValue<bool>::get() must be defined inline otherwise we get multiple definition of virtual thunk compilation errors
+#include "Parameters/Parameter.hpp"
+
+// TODO: Value<bool>::getAsString() must be defined inline otherwise we get multiple definition of virtual thunk compilation errors
 template <>
-inline const std::string ContinuousValue<bool>::get() const
-{
-  ASSERT(ValueSet,
-      "ContinuousValue<bool>::get() - requesting unset value.");
+inline const std::string Value<bool>::getAsString() const throw(ParameterValueException)
+{
+  if(!ValueSet)
+    throw ParameterValueException();
   if (value)
     return std::string("yes");
@@ -45 +43 @@
 }
 
-// TODO: ContinuousValue<bool>::set must be defined inline otherwise we get multiple definition of virtual thunk compilation errors
+// TODO: Value<bool>::setAsString must be defined inline otherwise we get multiple definition of virtual thunk compilation errors
 template <>
-inline void ContinuousValue<bool>::set(const std::string _value)
+inline void Value<bool>::setAsString(const std::string _value) throw(ParameterException)
 {
   if (_value == std::string("yes")) {
-    setValue(true);
+    set(true);
   } else if (_value == std::string("no")) {
-    setValue(false);
+    set(false);
   } else {
-    ASSERT(0,
-        "void ContinuousValue<bool>::set() - value "+_value+" is neither yes or no.");
+    throw ParameterValueException();
   }
 }
@@ -103 +100 @@
     ValidFreezeCore[LARGE]="large";
     appendParameter(
-        new DiscreteParameter<std::string>(
+        new Parameter<std::string>(
             ParamNames[freeze_coreParam],
             ValidFreezeCore,
@@ -116 +113 @@
     ValidUnits[bohr]="bohr";
     appendParameter(
-        new DiscreteParameter<std::string>(
+        new Parameter<std::string>(
             ParamNames[unitsParam],
             ValidUnits,
@@ -128 +125 @@
     ValidDerivativeType[NONE]="none";
     appendParameter(
-        new DiscreteParameter<std::string>(
+        new Parameter<std::string>(
             ParamNames[dertypeParam],
             ValidDerivativeType,
@@ -142 +139 @@
     ValidUniqueAxis[Z]="z";
     appendParameter(
-        new DiscreteParameter<std::string>(
+        new Parameter<std::string>(
             ParamNames[unique_axisParam],
             ValidUniqueAxis,
@@ -160 +157 @@
     ValidJobtypes[RESPONSE]="response";
     appendParameter(
-        new DiscreteParameter<std::string>(
+        new Parameter<std::string>(
             ParamNames[jobtypeParam],
             ValidJobtypes,
@@ -184 +181 @@
     ValidWavefunction[ZAPTN]="zaptn";
     appendParameter(
-        new DiscreteParameter<std::string>(
+        new Parameter<std::string>(
             ParamNames[wavefunctionParam],
             ValidWavefunction,
@@ -199 +196 @@
     ValidReference[TWOCON]="twocon";
     appendParameter(
-        new DiscreteParameter<std::string>(
+        new Parameter<std::string>(
             ParamNames[referenceParam],
             ValidReference,
@@ -207 +204 @@
   // add all continuous parameters
   {
-    appendParameter(new StringParameter(ParamNames[labelParam], std::string("unknown job")));
-    appendParameter(new ContinuousParameter<int>(ParamNames[maxiterParam], 80));
-    appendParameter(new StringParameter(ParamNames[basisParam], std::string("cc-pVTZ")));
-    appendParameter(new StringParameter(ParamNames[originParam], std::string("(0.0\t0.0\t0.0)"))); // TODO: this should be a vector
-    appendParameter(new ContinuousParameter<int>(ParamNames[multiplicityParam], 1));
-    appendParameter(new ContinuousParameter<int>(ParamNames[chargeParam], 0));
-    appendParameter(new StringParameter(ParamNames[soccParam], std::string("()")));
-    appendParameter(new StringParameter(ParamNames[doccParam], std::string("()")));
-    appendParameter(new StringParameter(ParamNames[subgroupParam], std::string("")));
+    appendParameter(new Parameter<string>(ParamNames[labelParam], std::string("unknown job")));
+    appendParameter(new Parameter<int>(ParamNames[maxiterParam], 80));
+    appendParameter(new Parameter<string>(ParamNames[basisParam], std::string("cc-pVTZ")));
+    appendParameter(new Parameter<string>(ParamNames[originParam], std::string("(0.0\t0.0\t0.0)"))); // TODO: this should be a vector
+    appendParameter(new Parameter<int>(ParamNames[multiplicityParam], 1));
+    appendParameter(new Parameter<int>(ParamNames[chargeParam], 0));
+    appendParameter(new Parameter<string>(ParamNames[soccParam], std::string("()")));
+    appendParameter(new Parameter<string>(ParamNames[doccParam], std::string("()")));
+    appendParameter(new Parameter<string>(ParamNames[subgroupParam], std::string("")));
  }
 }
@@ -229 +226 @@
 const std::string Psi3Parser_Parameters::getParameter(const enum Parameters param) const
 {
-  return FormatParser_Parameters::getParameter(ParamNames[param])->get();
+  return FormatParser_Parameters::getParameter(ParamNames[param])->getAsString();
 }
 
@@ -240 +237 @@
 {
   const std::string &name = getParameterName(param);
-  FormatParser_Parameters::getParameter(name)->set(_value);
+  FormatParser_Parameters::getParameter(name)->setAsString(_value);
 }