Changeset ab9a27 for src/Actions/MapOfActions.hpp

Timestamp:

Jul 22, 2010, 5:53:44 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, 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:

0c9cc3

Parents:

ba7418

Message:

MapOfActions::TypeMap now contains type_info.

We are going to use the information contained in MapOfActions to split Dialog (information gathering) from the performCall (execution) of the Action.
Therefore, Dialogs will store information as string in MapOfActions' maps and the Actions will retrieve the needed information therefrom.

• TypeMap now contains pointers to type_info
• new TypeEnumMap mapping *type_info to enum Options
• renamed map DefaultValue -> CurrentValue
• new functions MapOfActions::getCurrentValue(), ...::setCurrentValue() as getter and setter of current value
• new exception IllegalTypeException derived from CustomException, thrown when getCurrentValue is asked for value from an action/option-name with different type than stored in TypeMap.

File:

• src/Actions/MapOfActions.hpp (modified) (4 diffs)

src/Actions/MapOfActions.hpp

@@ -14 +14 @@
 #include <map>
 #include <set>
+#include <typeinfo>
 
 class MapOfActionsTest;
 
+#include "Exceptions/IllegalTypeException.hpp"
 #include "Patterns/Singleton.hpp"
 
 namespace po = boost::program_options;
+
+using boost::lexical_cast;
 
 /** Central class for adding functionality to the code.
@@ -136 +140 @@
   bool hasValue(std::string actionname);
   bool isShortFormPresent(std::string shortform);
-  enum OptionTypes getValueType(std::string actionname);
+  std::string  getValueType(std::string actionname);
 
   std::set<std::string> generic;
@@ -150 +154 @@
   void populateActions();
 
+  template<typename T> void queryCurrentValue(const char * name, T &_T)
+  {
+    if (typeid( T ) == *TypeMap[name])  // constructor of type_info is private, hence can only store by ref or ptr
+      _T = lexical_cast<T>(CurrentValue[name].c_str());
+    else
+      throw IllegalTypeException(__FILE__,__LINE__);
+  }
+
+  template<class T> void setCurrentValue(const char * name, T &_T)
+  {
+    if (typeid( T ) == *TypeMap[name])  // constructor of type_info is private, hence can only store by ref or ptr
+      CurrentValue[name] = std::string(_T);
+    else
+      throw IllegalTypeException(__FILE__,__LINE__);
+  }
+
+
 private:
   // private constructor and destructor
@@ -159 +180 @@
 
   // map of the action names and their description
-  std::map<std::string, std::string> DefaultValue;
+  std::map<std::string, std::string> CurrentValue;
   std::map<std::string, std::string> DescriptionMap;
   std::map<std::string, std::string> ShortFormMap;
-  std::map<std::string, enum OptionTypes > TypeMap;
+  std::map<std::string, const std::type_info * > TypeMap;
+  std::map<const std::type_info *, enum OptionTypes > TypeEnumMap;
 };