Changeset 765f16 for src/Parser/FormatParserStorage.cpp

Timestamp:

Oct 14, 2011, 3:15:30 PM (13 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:

d3d6c6

Parents:

9a6b76e

git-author:

Frederik Heber <heber@…> (09/27/11 19:04:36)

git-committer:

Frederik Heber <heber@…> (10/14/11 15:15:30)

Message:

Huge Refactoring of FormatParserStorage and all FormatParser's.

FormatParser:

• FormatParser is now a template, specialized by enum ParserTypes.
• new struct FormatParserTrait is as well a template of same type, containing parser-specific information in static entities.
• all FormatParsers are now specializations of this FormatParser.
• all Parsers can be accessed in a unified manner, given in the new class FormatParserInterface.
• common functions are placed in FormatParser_common.hpp as one cannot partially specialize a function class.
• some boost preprocessor magic is used in ParserTypes and FormatParserTraits to define the template specialization or to create the ParserTypes enumeration.

FormatParserStorage:

• We construct all lookup tables and alikes via boost preprocessor magic from a list of all available parser (enums).
• we use the templated getParser() and addParser() functions to serve parsers to the outside. Instances are as usual created only once.

Tests:

• tests only had to be changed because of the "renaming" of the Parsers.

File:

• src/Parser/FormatParserStorage.cpp (modified) (5 diffs)

src/Parser/FormatParserStorage.cpp

@@ -23 +23 @@
 #include <fstream>
 
-#include "Parser/FormatParserStorage.hpp"
-
+#include <boost/preprocessor/iteration/local.hpp>
+
+#include "CodePatterns/Assert.hpp"
 #include "CodePatterns/Log.hpp"
-#include "CodePatterns/Verbose.hpp"
-
-#include "CodePatterns/Assert.hpp"
 
 #include "molecule.hpp"
+#include "FormatParserStorage.hpp"
+#include "ParserTypes.hpp"
+
+#include "MpqcParser.hpp"
+#include "PcpParser.hpp"
+#include "PdbParser.hpp"
+#include "TremoloParser.hpp"
+#include "XyzParser.hpp"
 
 #include "CodePatterns/Singleton_impl.hpp"
 
-template <> enum ParserTypes getPType<MpqcParser>() { return (enum ParserTypes)mpqc;  }
-template <> enum ParserTypes getPType<PcpParser>() { return (enum ParserTypes)pcp;  }
-template <> enum ParserTypes getPType<PdbParser>() { return (enum ParserTypes)pdb;  }
-template <> enum ParserTypes getPType<TremoloParser>() { return (enum ParserTypes)tremolo;  }
-template <> enum ParserTypes getPType<XyzParser>() { return (enum ParserTypes)xyz;  }
-
-/** Increment operator for the enumeration ParserTypes to allow loops.
- * \param &type value
- * \return value incremented by one
- */
-ParserTypes &operator++(ParserTypes &type)
-{
-  return type = ParserTypes(type+1);
-}
 
 /** Constructor of class FormatParserStorage.
@@ -57 +49 @@
   ParserPresent.resize(ParserTypes_end, false);
 
-  ParserNames[mpqc] = "mpqc";
-  ParserNames[pcp] = "pcp";
-  ParserNames[pdb] = "pdb";
-  ParserNames[tremolo] = "tremolo";
-  ParserNames[xyz] = "xyz";
+#include "ParserTypes.def"
+
+#define insert_print(z,n,seq,map, before, after) \
+   map .insert( std::make_pair(  \
+     BOOST_PP_SEQ_ELEM(n, seq) \
+     , before < \
+       BOOST_PP_SEQ_ELEM(n, seq) \
+       > after \
+     ) );
   
-  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) );
-
-  ParserSuffixes[mpqc] = "in";
-  ParserSuffixes[pcp] = "conf";
-  ParserSuffixes[pdb] = "pdb";
-  ParserSuffixes[tremolo] = "data";
-  ParserSuffixes[xyz] = "xyz";
-
-  for (std::map<ParserTypes, std::string>::const_iterator it = ParserSuffixes.begin(); it != ParserSuffixes.end(); ++it)
-    ParserLookupSuffixes.insert(pair<std::string, ParserTypes>(it->second,it->first) );
-
-  ParserAddFunction[mpqc] = &FormatParserStorage::addParser<MpqcParser>;
-  ParserAddFunction[pcp] = &FormatParserStorage::addParser<PcpParser>;
-  ParserAddFunction[pdb] = &FormatParserStorage::addParser<PdbParser>;
-  ParserAddFunction[tremolo] = &FormatParserStorage::addParser<TremoloParser>;
-  ParserAddFunction[xyz] = &FormatParserStorage::addParser<XyzParser>;
+#define insert_invert_print(z,n,seq,map, before, after) \
+   map .insert( std::make_pair( before < \
+   BOOST_PP_SEQ_ELEM(n, seq) \
+   > after, \
+   BOOST_PP_SEQ_ELEM(n, seq) \
+  ) );
+
+  // fill ParserNames
+#if defined ParserTypes_END // do we have parameters at all?
+#define BOOST_PP_LOCAL_MACRO(n) insert_print(~, n, PARSERSEQUENCE, ParserNames, FormatParserTrait, ::name)
+#define BOOST_PP_LOCAL_LIMITS  (0, ParserTypes_END-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+
+  // fill ParserLookupNames
+#if defined ParserTypes_END // do we have parameters at all?
+#define BOOST_PP_LOCAL_MACRO(n) insert_invert_print(~, n, PARSERSEQUENCE, ParserLookupNames, FormatParserTrait, ::name)
+#define BOOST_PP_LOCAL_LIMITS  (0, ParserTypes_END-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+
+  // fill ParserSuffixes
+#if defined ParserTypes_END // do we have parameters at all?
+#define BOOST_PP_LOCAL_MACRO(n) insert_print(~, n, PARSERSEQUENCE, ParserSuffixes, FormatParserTrait, ::suffix)
+#define BOOST_PP_LOCAL_LIMITS  (0, ParserTypes_END-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+
+  // fill ParserLookupSuffixes
+#if defined ParserTypes_END // do we have parameters at all?
+#define BOOST_PP_LOCAL_MACRO(n) insert_invert_print(~, n, PARSERSEQUENCE, ParserLookupSuffixes, FormatParserTrait, ::suffix)
+#define BOOST_PP_LOCAL_LIMITS  (0, ParserTypes_END-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+
+  // fill ParserAddFunction
+#if defined ParserTypes_END // do we have parameters at all?
+#define BOOST_PP_LOCAL_MACRO(n) insert_print(~, n, PARSERSEQUENCE, ParserAddFunction, &FormatParserStorage::addParser, )
+#define BOOST_PP_LOCAL_LIMITS  (0, ParserTypes_END-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#endif
+
+#undef insert_print
+#undef insert_invert_print
+#include "ParserTypes.undef"
+
+  //std::cout << "ParserNames:" << std::endl << ParserNames << std::endl;
+  //std::cout << "ParserSuffixes:" << std::endl << ParserSuffixes << std::endl;
+  //std::cout << "ParserLookupNames:" << std::endl << ParserLookupNames << std::endl;
+  //std::cout << "ParserLookupSuffixes:" << std::endl << ParserLookupSuffixes << std::endl;
+  //std::cout << "ParserAddFunction:" << std::endl << ParserAddFunction << std::endl;
+
 }
 
@@ -142 +173 @@
   if (ptype != ParserTypes_end) {
     if (ParserAddFunction.find(ptype) != ParserAddFunction.end()) {
-      DoLog(0) && (Log() << Verbose(0) << "Adding " << ParserNames[ptype] << " type to output." << endl);
+      LOG(0, "STATUS: Adding " << ParserNames[ptype] << " type to output.");
       (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);
+      ELOG(1, "No parser to add for this known type " << ParserNames[ptype] << ", not implemented?");
       return false;
     }
@@ -156 +187 @@
 bool FormatParserStorage::add(std::string type)
 {
-  return add(getTypeFromName(type));
+  enum ParserTypes Ptype = getTypeFromName(type);
+  return add(Ptype);
 }
 
@@ -246 +278 @@
  * \return reference to the output FormatParser with desired type
  */
-FormatParser &FormatParserStorage::get(ParserTypes _type)
+FormatParserInterface &FormatParserStorage::get(ParserTypes _type)
 {
   if (!ParserPresent[_type]) {