Changeset db67ea for src/Parser/FormatParserStorage.hpp

Timestamp:

Oct 14, 2011, 2:10:54 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:

e114e3

Parents:

ce7fdc

git-author:

Frederik Heber <heber@…> (09/27/11 08:32:36)

git-committer:

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

Message:

Added template getParser/setParser to FormatParserStorage.

• specialized templated getParser/setParser in FormatParserStorage will soon replace all the add..() and get...() functions.

File:

• src/Parser/FormatParserStorage.hpp (modified) (2 diffs)

src/Parser/FormatParserStorage.hpp

@@ -34 +34 @@
 
 ParserTypes &operator++(ParserTypes &type);
+
+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 FormatParserStorage : public Singleton<FormatParserStorage> {
@@ -93 +101 @@
   // prefix of the filenames to use on save
   std::string prefix;
+
+public:
+
+  template<class ParserT> void addParser()
+  {
+    enum ParserTypes Ptype = getPType<ParserT>();
+    if (!ParserPresent[Ptype]) {
+      ParserList[Ptype] = new ParserT();
+      ParserPresent[Ptype] = true;
+    } else {
+      ASSERT(ParserNames.find(Ptype) != ParserNames.end(),
+          "FormatParserStorage::addParser() - ParserNames unknown for type"+toString((size_t)Ptype)+".");
+      ASSERT(ParserSuffixes.find(Ptype) != ParserSuffixes.end(),
+          "FormatParserStorage::addParser() - ParserSuffixes unknown for type"+toString((size_t)Ptype)+".");
+      LOG(2, "INFO: Parser " << ParserNames[Ptype] << " is already present." << std::endl
+          << "Note that you don't need to add '-o " 
+          << ParserSuffixes[Ptype] << "' if the input file is non-empty and of type " 
+          << ParserSuffixes[Ptype] << "." << std::endl);
+    }
+  }
+
+  template<class ParserT> ParserT &getParser() 
+  {
+    enum ParserTypes Ptype = getPType<ParserT>();
+    if(!ParserPresent[Ptype])
+      addParser<ParserT>();
+    return dynamic_cast<ParserT &>(*ParserList[Ptype]);
+  }
+
 };