Changeset 5c6946

Timestamp:

Aug 28, 2010, 12:57:56 AM (14 years ago)

Author:

Frederik Heber <heber@…>

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:

bb6193

Parents:

3ae731

git-author:

Frederik Heber <heber@…> (08/27/10 10:25:55)

git-committer:

Frederik Heber <heber@…> (08/28/10 00:57:56)

Message:

FormatParserStorage extended a bit.

• new functions add(type) that accept either parser name or ParserTypes and adds the respective class.
• new function getType(type) that accepts a parser name and returns the type.

Location:

src

Files:

• Actions/WorldAction/SetOutputFormatsAction.cpp (modified) (1 diff)
• Parser/FormatParserStorage.cpp (modified) (4 diffs)
• Parser/FormatParserStorage.hpp (modified) (4 diffs)

src/Actions/WorldAction/SetOutputFormatsAction.cpp

@@ -42 +42 @@
 
   for (vector<std::string>::iterator iter = params.FormatList.begin(); iter != params.FormatList.end(); ++iter) {
-    if (*iter == "mpqc") {
-      FormatParserStorage::getInstance().addMpqc();
-      DoLog(0) && (Log() << Verbose(0) << "Adding mpqc type to output." << endl);
-    } else if (*iter == "pcp") {
-      FormatParserStorage::getInstance().addPcp();
-      DoLog(0) && (Log() << Verbose(0) << "Adding pcp type to output." << endl);
-    } else if (*iter == "tremolo") {
-      FormatParserStorage::getInstance().addTremolo();
-      DoLog(0) && (Log() << Verbose(0) << "Adding tremolo type to output." << endl);
-    } else if (*iter == "xyz") {
-      FormatParserStorage::getInstance().addXyz();
-      DoLog(0) && (Log() << Verbose(0) << "Adding xyz type to output." << endl);
-    } else {
-      DoeLog(1) && (eLog() << Verbose(1) << "Unknown format:" << *iter << endl);
+    if (!FormatParserStorage::getInstance().add(*iter)) {
+      DoeLog(1) && (eLog() << Verbose(1) << "Unknown parser format in WorldSetOutputFormatsAction:" << *iter << endl);
     }
   }

src/Parser/FormatParserStorage.cpp

@@ -56 +56 @@
   ParserSuffix.resize(ParserTypes_end, "");
 
+  ParserNames[mpqc] = "mpqc";
+  ParserNames[pcp] = "pcp";
+  ParserNames[tremolo] = "tremolo";
+  ParserNames[xyz] = "xyz";
+
+  for (std::map<ParserTypes, std::string>::const_iterator it = ParserNames.begin(); it != ParserNames.end(); ++it)
+    ParserLookupNames.insert(pair<std::string, ParserTypes>(it->second,it->first) );
+
   ParserSuffix[mpqc] = "in";
   ParserSuffix[pcp] = "conf";
   ParserSuffix[tremolo] = "data";
   ParserSuffix[xyz] = "xyz";
+
+  ParserAddFunction[mpqc] = &FormatParserStorage::addMpqc;
+  ParserAddFunction[pcp] = &FormatParserStorage::addPcp;
+  ParserAddFunction[tremolo] = &FormatParserStorage::addTremolo;
+  ParserAddFunction[xyz] = &FormatParserStorage::addXyz;
 }
 
@@ -112 +125 @@
 }
 
+
 /** Adds an PcpParser to the storage.
  */
@@ -146 +160 @@
     DoeLog(1) && (eLog() << Verbose(1) << "Parser xyz is already present." << endl);
 }
+
+ParserTypes FormatParserStorage::getType(std::string type)
+{
+  if (ParserLookupNames.find(type) == ParserLookupNames.end()) {
+    DoeLog(1) && (eLog() << Verbose(1) << "Unknown type " << type << "." << endl);
+    return ParserTypes_end;
+  } else
+    return ParserLookupNames[type];
+}
+
+bool FormatParserStorage::add(ParserTypes ptype)
+{
+  if (ptype != ParserTypes_end) {
+    if (ParserAddFunction.find(ptype) != ParserAddFunction.end()) {
+      DoLog(0) && (Log() << Verbose(0) << "Adding " << ParserNames[ptype] << " type to output." << endl);
+      (getInstance().*(ParserAddFunction[ptype]))(); // we still need an object to work on ...
+      return true;
+    } else {
+      DoeLog(1) && (eLog() << Verbose(1) << "No parser to add for this known type " << ParserNames[ptype] << ", not implemented?" << endl);
+      return false;
+    }
+  } else {
+    return false;
+  }
+}
+
+bool FormatParserStorage::add(std::string type)
+{
+  return add(getType(type));
+}
+
 
 /** Parses an istream depending on its suffix
@@ -163 +208 @@
     getXyz().load(&input);
   } else {
-    DoeLog(1) && (eLog() << Verbose(1) << "Unknown suffix to for FormatParserStorage::get()." << endl);
+    DoeLog(1) && (eLog() << Verbose(1) << "Unknown suffix " << suffix << " to for FormatParserStorage::get()." << endl);
     return false;
   }

src/Parser/FormatParserStorage.hpp

@@ -17 +17 @@
 
 #include <string>
+#include <map>
 #include <vector>
 
@@ -35 +36 @@
 public:
 
-
   void addMpqc();
   void addPcp();
   void addTremolo();
   void addXyz();
+  bool add(std::string type);
+  bool add(ParserTypes type);
 
   bool get(std::istream &input, std::string suffix);
@@ -46 +48 @@
   TremoloParser &getTremolo();
   XyzParser &getXyz();
+
+  ParserTypes getType(std::string type);
 
   void SetOutputPrefixForAll(std::string &_prefix);
@@ -67 +71 @@
   std::vector<std::string> ParserSuffix;
 
+  // function pointers to each add...()
+  std::map< ParserTypes, void (FormatParserStorage::*)() > ParserAddFunction;
+
+  // type name of each parser type and reverse lookup
+  std::map<ParserTypes, std::string> ParserNames;
+  std::map<std::string, ParserTypes> ParserLookupNames;
+
+
   // prefix of the filenames to use on save
   std::string prefix;