Changeset 4885f85 for src/Actions

Timestamp:

Oct 30, 2010, 6:44:29 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:

bc2990

Parents:

a8188d

git-author:

Frederik Heber <heber@…> (10/26/10 09:27:08)

git-committer:

Frederik Heber <heber@…> (10/30/10 18:44:29)

Message:

Introduced new getters to MapOfActions and ValueStorage.

• new functions are getCurrentValue (string not as type!), getDescription, getShortForm, getType
• these are need to short-wire Traits through MapOfActions.

Location:

src/Actions

Files:

• MapOfActions.cpp (modified) (4 diffs)
• MapOfActions.hpp (modified) (2 diffs)
• ValueStorage.cpp (modified) (1 diff)
• ValueStorage.hpp (modified) (1 diff)

src/Actions/MapOfActions.cpp

@@ -1225 +1225 @@
  * \return Description of the action
  */
-std::string MapOfActions::getDescription(string actionname)
+const std::string MapOfActions::getDescription(string actionname)
 {
   ASSERT(DescriptionMap.find(actionname) != DescriptionMap.end(), "Unknown action name passed to MapOfActions::getDescription");
@@ -1239 +1239 @@
  * \return actionname,ShortForm or Description of the action
  */
-std::string MapOfActions::getKeyAndShortForm(string actionname)
+const std::string MapOfActions::getKeyAndShortForm(string actionname)
 {
   stringstream output;
@@ -1254 +1254 @@
  * \return ShortForm of the action
  */
-std::string MapOfActions::getShortForm(string actionname)
-{
-  ASSERT(ShortFormMap.find(actionname) != ShortFormMap.end(), "Unknown action name passed to MapOfActions::getShortForm");
-  return ShortFormMap[actionname];
+const std::string MapOfActions::getShortForm(string actionname)
+{
+  if (ShortFormMap.find(actionname) != ShortFormMap.end())
+    return ShortFormMap[actionname];
+  else
+    return std::string();
+}
+
+/** Getter for MapOfActions:CurrentValueMap.
+ * Note that we assert when action does not exist in CommandLineParser::CurrentValueMap.
+ * \param actionname name of the action to lookup
+ * \return CurrentValueMap of the action
+ */
+const std::string MapOfActions::getCurrentValue(string actionname)
+{
+  if (CurrentValueMap.find(actionname) != CurrentValueMap.end())
+    return CurrentValueMap[actionname];
+  else
+    return std::string();
 }
 
@@ -1269 +1284 @@
 }
 
+/** Getter for MapOfActions::TypeMap::name.
+ * \param actionname name of the action to look up
+ * \return name of type of the action
+ */
+const std::string MapOfActions::getValueType(string actionname)
+{
+  return TypeMap[actionname]->name();
+}
+
 /** Getter for MapOfActions::TypeMap.
  * \param actionname name of the action to look up
  * \return type of the action
  */
-std::string MapOfActions::getValueType(string actionname)
-{
-  return TypeMap[actionname]->name();
+const std::type_info * MapOfActions::getType(string actionname)
+{
+  return TypeMap[actionname];
 }
 

src/Actions/MapOfActions.hpp

@@ -141 +141 @@
 
   // getter for the action descriptions and short forms
-  std::string getDescription(std::string actionname);
-  std::string getKeyAndShortForm(std::string actionname);
-  std::string getShortForm(std::string actionname);
+  const std::string getDescription(std::string actionname);
+  const std::string getKeyAndShortForm(std::string actionname);
+  const std::string getShortForm(std::string actionname);
   std::map <std::string, std::string> getShortFormToActionMap();
+  const std::string getCurrentValue(std::string actionname);
 
   void AddOptionsToParser();
@@ -151 +152 @@
   bool hasValue(std::string actionname);
   bool isShortFormPresent(std::string shortform);
-  std::string  getValueType(std::string actionname);
+  const std::string  getValueType(std::string actionname);
+  const std::type_info * getType(std::string actionname);
 
   std::set<std::string> generic;

src/Actions/ValueStorage.cpp

@@ -29 +29 @@
 ValueStorage::~ValueStorage() {};
 
-std::string ValueStorage::getDescription(std::string actionname) {
+const std::string ValueStorage::getCurrentValue(std::string actionname) {
+  return MapOfActions::getInstance().getCurrentValue(actionname);
+}
+
+const std::string ValueStorage::getDescription(std::string actionname) {
   return MapOfActions::getInstance().getDescription(actionname);
 }
 
+const std::string ValueStorage::getShortForm(std::string actionname) {
+  return MapOfActions::getInstance().getShortForm(actionname);
+}
+
+const std::type_info * ValueStorage::getType(std::string actionname) {
+  return MapOfActions::getInstance().getType(actionname);
+}
+
 CONSTRUCT_SINGLETON(ValueStorage)

src/Actions/ValueStorage.hpp

@@ -48 +48 @@
    * \return text describing the key's contents
    */
-  std::string getDescription(std::string actionname);
+  const std::string getCurrentValue(std::string actionname);
+  const std::string getDescription(std::string actionname);
+  const std::string getShortForm(std::string actionname);
+  const std::type_info * getType(std::string actionname);
 
 protected: