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

File:

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

src/Parser/Psi3Parser_Parameters.cpp

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