Changes in src/Parser/MpqcParser_Parameters.cpp [311da7b:963321a]

File:

• src/Parser/MpqcParser_Parameters.cpp (modified) (10 diffs)

src/Parser/MpqcParser_Parameters.cpp

@@ -152 +152 @@
   boost::char_separator<char> semicolonsep(";");
   boost::char_separator<char> equalitysep(" =");
-  boost::char_separator<char> ticksep("\"");
   std::string line;
   std::getline( ist, line );
@@ -158 +157 @@
   tokenizer tokens(line, semicolonsep);
   ASSERT(tokens.begin() != tokens.end(),
-      "operator<< on MpqcParser_Parameters - empty string, need at least ';' in line "+line+"!");
+      "operator<< on MpqcParser_Parameters - empty string, need at least ';'!");
   for (tokenizer::iterator tok_iter = tokens.begin();
         tok_iter != tokens.end(); ++tok_iter) {
@@ -166 +165 @@
       tokenizer::iterator tok_valueiter = tok_paramiter;
       tokenizer::iterator tok_checkiter = ++tok_valueiter;
+      // TODO: throw exception instead of ASSERT
+      ASSERT(tok_valueiter == params.end(),
+          "operator<< on MpqcParser_Parameters - missing value before ';'!");
       ++tok_checkiter;
-      // TODO: throw exception instead of ASSERT
-      ASSERT(tok_paramiter != paramtokens.end(),
-          "operator<< on MpqcParser_Parameters - missing value before ' =' in token "+*tok_iter+"!");
-      ASSERT(tok_valueiter != paramtokens.end(),
-          "operator<< on MpqcParser_Parameters - missing value after ' =' in token "+*tok_iter+"!");
-      ASSERT(tok_checkiter == paramtokens.end(),
-          "operator<< on MpqcParser_Parameters - still more tokens after ' =' in token "+*tok_iter+":"
-          +*tok_checkiter+"!");
-      std::stringstream keystream(*tok_paramiter);
-      std::string key;
-      keystream >> ws >> key;
-      tokenizer ticklesstokens(*tok_valueiter, ticksep);
-      ASSERT(ticklesstokens.begin() != ticklesstokens.end(),
-          "operator<< on MpqcParser_Parameters - no tokens present after removing ticks in token "+*tok_valueiter+"!");
-      std::stringstream valuestream(*(ticklesstokens.begin()));
-      DoLog(2) && (Log() << Verbose(2)
-          << "INFO: Token pair is " << key << "," << valuestream.str() << std::endl);
+      ASSERT(tok_checkiter == params.end(),
+          "operator<< on MpqcParser_Parameters - still tokens before ';'!");
+      DoLog(0) && (Log() << Verbose(0)
+          << "INFO: Token pair is " << *tok_paramiter << "," << *tok_valueiter << std::endl);
+      std::stringstream value(*tok_valueiter);
 
       // TODO: throw exception instead of DoeLog()
-      ASSERT(params.haveParam(key),
-          "operator >> on MpqcParser_Parameters - unknown parameter name '"
-          +key+"' with value "+valuestream.str()+"!");
-      if (params.haveParam(key))
-        params.setter(params.getParam(key), valuestream);
+      if ((params.haveParam(*tok_paramiter))) {
+        params.setter(params.getParam(*tok_paramiter), value);
+      } else {
+        DoeLog(0) && (eLog() << Verbose(0)
+            << *tok_paramiter << " is not a valid parameter name!" << std::endl);
+      }
     } else {
       ist.setstate(std::ios::eofbit);
@@ -256 +247 @@
 {
   // TODO: throw exception instead of eLog()
-//  try {
+  try {
     params[theoryParam] = _theory;
-//  } catch(const boost::bad_any_cast &) {
-//    DoeLog(0) && (eLog() << Verbose(0)
-//        << "MpqcParser_Parameters::setTheory() - could not set boolean!" << std::endl);
-//  }
+  } catch(const boost::bad_any_cast &) {
+    DoeLog(0) && (eLog() << Verbose(0)
+        << "MpqcParser_Parameters::setTheory() - could not set boolean!" << std::endl);
+  }
 }
 
 void MpqcParser_Parameters::setIntegration(enum MpqcParser_Parameters::IntegrationMethod _integration){
   // TODO: throw exception instead of eLog()
-//  try {
+  try {
     params[integrationParam] = _integration;
-//  } catch(const boost::bad_any_cast &) {
-//    DoeLog(0) && (eLog() << Verbose(0)
-//        << "MpqcParser_Parameters::setIntegration() - could not set boolean!" << std::endl);
-//  }
+  } catch(const boost::bad_any_cast &) {
+    DoeLog(0) && (eLog() << Verbose(0)
+        << "MpqcParser_Parameters::setIntegration() - could not set boolean!" << std::endl);
+  }
 }
 
@@ -288 +279 @@
   enum IntegrationMethod value;
   // TODO: throw exception instead of eLog()
-//  try {
+  try {
     value = boost::any_cast<enum IntegrationMethod>(params[integrationParam]);
-//  } catch(const boost::bad_any_cast &) {
-//    DoeLog(0) && (eLog() << Verbose(0)
-//        << "MpqcParser_Parameters::getIntegration() - could not convert "
-//        +ParamNames[integrationParam]+" to enum IntegrationMethod!" << std::endl);
-//  }
+  } catch(const boost::bad_any_cast &) {
+    DoeLog(0) && (eLog() << Verbose(0)
+        << "MpqcParser_Parameters::getIntegration() - could not convert "
+        +ParamNames[integrationParam]+" to enum IntegrationMethod!" << std::endl);
+  }
   return value;
 }
@@ -302 +293 @@
   enum Theory value;
   // TODO: throw exception instead of eLog()
-//  try {
+  try {
     value = boost::any_cast<enum Theory>(params[theoryParam]);
-//  } catch(const boost::bad_any_cast &) {
-//    DoeLog(0) && (eLog() << Verbose(0)
-//        << "MpqcParser_Parameters::getTheory() - could not convert "
-//        +ParamNames[theoryParam]+" to enum Theory!" << std::endl);
-//  }
+  } catch(const boost::bad_any_cast &) {
+    DoeLog(0) && (eLog() << Verbose(0)
+        << "MpqcParser_Parameters::getTheory() - could not convert "
+        +ParamNames[theoryParam]+" to enum Theory!" << std::endl);
+  }
   return value;
 }
@@ -330 +321 @@
     case integrationParam:
       // TODO: throw exception instead of eLog()
-//      try {
+      try {
         Iindex = boost::any_cast<enum IntegrationMethod>(params[_param]);
-//      } catch(const boost::bad_any_cast &) {
-//        DoeLog(0) && (eLog() << Verbose(0)
-//            << "MpqcParser_Parameters::getString() - could not convert "
-//            +ParamNames[_param]+" to string!" << std::endl);
-//      }
+      } catch(const boost::bad_any_cast &) {
+        DoeLog(0) && (eLog() << Verbose(0)
+            << "MpqcParser_Parameters::getString() - could not convert "
+            +ParamNames[_param]+" to string!" << std::endl);
+      }
       value = IntegrationNames[Iindex];
       break;
     case theoryParam:
       // TODO: throw exception instead of eLog()
-//      try {
+      try {
         Tindex = boost::any_cast<enum Theory>(params[_param]);
-//      } catch(const boost::bad_any_cast &) {
-//        DoeLog(0) && (eLog() << Verbose(0)
-//            << "MpqcParser_Parameters::getString() - could not convert "
-//            +ParamNames[_param]+" to string!" << std::endl);
-//      }
+      } catch(const boost::bad_any_cast &) {
+        DoeLog(0) && (eLog() << Verbose(0)
+            << "MpqcParser_Parameters::getString() - could not convert "
+            +ParamNames[_param]+" to string!" << std::endl);
+      }
       value = TheoryNames[(enum Theory)Tindex];
       break;
     default:
       // TODO: throw exception instead of eLog()
-//      try {
+      try {
         value = boost::any_cast<std::string>(params[_param]);
-//      } catch(const boost::bad_any_cast &) {
-//        DoeLog(0) && (eLog() << Verbose(0)
-//            << "MpqcParser_Parameters::getString() - could not convert "
-//            +ParamNames[_param]+" to string!" << std::endl);
-//      }
+      } catch(const boost::bad_any_cast &) {
+        DoeLog(0) && (eLog() << Verbose(0)
+            << "MpqcParser_Parameters::getString() - could not convert "
+            +ParamNames[_param]+" to string!" << std::endl);
+      }
       break;
   }
@@ -371 +362 @@
     default:
       // TODO: throw exception instead of eLog()
-//      try {
+      try {
         value = boost::any_cast<int>(params[_param]);
-//      } catch(const boost::bad_any_cast &) {
-//        DoeLog(0) && (eLog() << Verbose(0)
-//            << "MpqcParser_Parameters::getInt() - could not convert "
-//            +ParamNames[_param]+" to int!" << std::endl);
-//      }
+      } catch(const boost::bad_any_cast &) {
+        DoeLog(0) && (eLog() << Verbose(0)
+            << "MpqcParser_Parameters::getInt() - could not convert "
+            +ParamNames[_param]+" to int!" << std::endl);
+      }
       break;
   }
@@ -387 +378 @@
   double value;
   // TODO: throw exception instead of eLog()
-//  try {
+  try {
     value = boost::any_cast<double>(params[_param]);
-//  } catch(const boost::bad_any_cast &) {
-//    DoeLog(0) && (eLog() << Verbose(0)
-//        << "MpqcParser_Parameters::getDouble() - could not convert "
-//        +ParamNames[_param]+" to double!" << std::endl);
-//  }
+  } catch(const boost::bad_any_cast &) {
+    DoeLog(0) && (eLog() << Verbose(0)
+        << "MpqcParser_Parameters::getDouble() - could not convert "
+        +ParamNames[_param]+" to double!" << std::endl);
+  }
   return value;
 }
@@ -401 +392 @@
   bool value;
   // TODO: throw exception instead of eLog()
-//  try {
+  try {
     value = boost::any_cast<bool>(params[_param]);
-//  } catch(const boost::bad_any_cast &) {
-//    DoeLog(0) && (eLog() << Verbose(0)
-//        << "MpqcParser_Parameters::getBool() - could not convert "
-//        +ParamNames[_param]+" to bool!" << std::endl);
-//  }
+  } catch(const boost::bad_any_cast &) {
+    DoeLog(0) && (eLog() << Verbose(0)
+        << "MpqcParser_Parameters::getBool() - could not convert "
+        +ParamNames[_param]+" to bool!" << std::endl);
+  }
   return value;
 }