Changeset 931077 for src/Potentials/PotentialFactory.cpp

Timestamp:

May 3, 2013, 9:46:45 AM (12 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:

24ac59

Parents:

a86666

git-author:

Frederik Heber <heber@…> (04/09/13 07:46:49)

git-committer:

Frederik Heber <heber@…> (05/03/13 09:46:45)

Message:

Using PotentialTypes in PotentialFactory.

• used for creating the type to enum maps and inverse automatically.

File:

• src/Potentials/PotentialFactory.cpp (modified) (2 diffs)

src/Potentials/PotentialFactory.cpp

@@ -40 +40 @@
 #include <boost/assign/list_of.hpp>
 #include <boost/lambda/lambda.hpp>
+#include <boost/preprocessor/seq/elem.hpp>
+#include <boost/preprocessor/seq/seq.hpp>
+#include <boost/preprocessor/seq/size.hpp>
+#include <boost/preprocessor/stringize.hpp>
+#include <boost/preprocessor/iteration/local.hpp>
 
 #include "CodePatterns/Singleton_impl.hpp"
@@ -48 +53 @@
 #include "Potentials/Specifics/PairPotential_Harmonic.hpp"
 #include "Potentials/Specifics/PairPotential_Morse.hpp"
+#include "Potentials/Specifics/PotentialTypes.hpp"
 #include "Potentials/Specifics/SaturationPotential.hpp"
+
+#include "Potentials/Specifics/PotentialTypes.def"
+
+//!> function to print each member of the sequence in the enumeration
+#define sequence_print(z,n,seq) \
+  ( \
+  BOOST_PP_STRINGIZE( BOOST_PP_SEQ_ELEM(n, seq) ), \
+  BOOST_PP_SEQ_ELEM(n, seq) \
+  )
+
+//!> function to print each member of the sequence in the enumeration
+#define reverse_sequence_print(z,n,seq) \
+    ( \
+    BOOST_PP_SEQ_ELEM(n, seq), \
+    BOOST_PP_STRINGIZE( BOOST_PP_SEQ_ELEM(n, seq) ) \
+    )
 
 // static defines
 PotentialFactory::NameToType_t PotentialFactory::NameToType =
     boost::assign::map_list_of
-    ("tersoff", tersoff)
-    ("morse", morse)
-    ("harmonic", harmonic)
-    ("harmonic_angle", harmonic_angle)
-    ("saturation", saturation)
+#if defined PotentialTypes_END // do we have parameters at all?
+#define BOOST_PP_LOCAL_MACRO(n) sequence_print(~, n, POTENTIALSEQUENCE)
+#define BOOST_PP_LOCAL_LIMITS  (0, PotentialTypes_END-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#undef BOOST_PP_LOCAL_MACRO
+#undef BOOST_PP_LOCAL_LIMITS
+#endif
   ;
 PotentialFactory::TypeToName_t PotentialFactory::TypeToName =
     boost::assign::map_list_of
-    (tersoff, "tersoff")
-    (morse, "morse")
-    (harmonic, "harmonic")
-    (harmonic_angle, "harmonic_angle")
-    (saturation, "saturation")
+#if defined PotentialTypes_END // do we have parameters at all?
+#define BOOST_PP_LOCAL_MACRO(n) reverse_sequence_print(~, n, POTENTIALSEQUENCE)
+#define BOOST_PP_LOCAL_LIMITS  (0, PotentialTypes_END-1)
+#include BOOST_PP_LOCAL_ITERATE()
+#undef BOOST_PP_LOCAL_MACRO
+#undef BOOST_PP_LOCAL_LIMITS
+#endif
   ;
 
+#undef sequence_print
+#undef reverse_sequence_print
+
+#include "Potentials/Specifics/PotentialTypes.undef"
 
 FunctionModel *PotentialFactory::createInstance(