Changeset 765f16 for src/Parser/FormatParserStorage.hpp

Timestamp:

Oct 14, 2011, 3:15:30 PM (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, Candidate_v1.7.0, 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.hpp (modified) (5 diffs)

src/Parser/FormatParserStorage.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
+#include <iosfwd>
+#include <map>
 #include <string>
-#include <map>
 #include <vector>
 
-#include "Parser/ParserTypes.hpp"
-#include "Parser/FormatParser.hpp"
-#include "Parser/MpqcParser.hpp"
-#include "Parser/PcpParser.hpp"
-#include "Parser/PdbParser.hpp"
-#include "Parser/TremoloParser.hpp"
-#include "Parser/XyzParser.hpp"
+#include "CodePatterns/Assert.hpp"
+#include "CodePatterns/Log.hpp"
+#include "FormatParser.hpp"
+#include "ParserTypes.hpp"
 
 class atom;
-
-template <class T> enum ParserTypes getPType();
-template <> enum ParserTypes getPType<MpqcParser>();
-template <> enum ParserTypes getPType<PcpParser>();
-template <> enum ParserTypes getPType<PdbParser>();
-template <> enum ParserTypes getPType<TremoloParser>();
-template <> enum ParserTypes getPType<XyzParser>();
-
+class FormatParserInterface;
 
 class FormatParserStorage : public Singleton<FormatParserStorage> {
@@ -51 +42 @@
   bool saveWorld(std::ostream &output, std::string suffix);
   
-  FormatParser &get(enum ParserTypes _type);
+  FormatParserInterface &get(ParserTypes _type);
 
   ParserTypes getTypeFromName(std::string type);
@@ -65 +56 @@
   
   // list of allocated parsers
-  std::vector<FormatParser *> ParserList;
+  std::vector<FormatParserInterface *> ParserList;
 
   // list of allocated strams
@@ -84 +75 @@
   std::map<std::string, ParserTypes> ParserLookupNames;
 
-
   // prefix of the filenames to use on save
   std::string prefix;
 
 public:
-
-  template<class ParserT> void addParser()
+  template<ParserTypes Ptype> void addParser()
   {
-    enum ParserTypes Ptype = getPType<ParserT>();
     if (!ParserPresent[Ptype]) {
-      ParserList[Ptype] = new ParserT();
+      ParserList[Ptype] = new FormatParser<Ptype>();
       ParserPresent[Ptype] = true;
     } else {
@@ -108 +96 @@
   }
 
-  template<class ParserT> ParserT &getParser() 
+  template<ParserTypes Ptype> FormatParser<Ptype> &getParser() 
   {
-    enum ParserTypes Ptype = getPType<ParserT>();
     if(!ParserPresent[Ptype])
-      addParser<ParserT>();
-    return dynamic_cast<ParserT &>(*ParserList[Ptype]);
+      addParser< Ptype >();
+    return dynamic_cast<FormatParser<Ptype> &>(*ParserList[Ptype]);
   }
-
 };