Changeset a8188d for src/Actions/MapOfActions.hpp

Timestamp:

Oct 30, 2010, 6:44:28 PM (15 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:

4885f85

Parents:

df32ee

git-author:

Frederik Heber <heber@…> (10/26/10 09:20:41)

git-committer:

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

Message:

Renaming MapOfActions::CurrentValue -> CurrentValueMap.

File:

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

src/Actions/MapOfActions.hpp

@@ -17 +17 @@
 #include <vector>
 #include <typeinfo>
+
 
 #include "Exceptions/IllegalTypeException.hpp"
@@ -32 +33 @@
 
 namespace po = boost::program_options;
-namespace fs = boost::filesystem;
 
 using boost::lexical_cast;
@@ -138 +138 @@
   friend class MapOfActionsTest;
 public:
-  enum OptionTypes { None, Boolean, Integer, File, ListOfIntegers, Double, ListOfDoubles, String, ListOfStrings, Vector, ListOfVectors, Box, Molecule, ListOfMolecules, Atom, ListOfAtoms, Element, ListOfElements };
+  enum OptionTypes { None, Boolean, File, Integer, ListOfIntegers, Double, ListOfDoubles, String, ListOfStrings, Vector, ListOfVectors, Box, Molecule, ListOfMolecules, Atom, ListOfAtoms, Element, ListOfElements };
 
   // getter for the action descriptions and short forms
@@ -175 +175 @@
   void queryCurrentValue(const char * name, std::vector<const element *>&_T);
   void queryCurrentValue(const char * name, std::vector<molecule *>&_T);
-  void queryCurrentValue(const char * name, fs::path&_T);
+  void queryCurrentValue(const char * name, boost::filesystem::path&_T);
+
   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
-      if (CurrentValue.find(name) == CurrentValue.end())
+      if (CurrentValueMap.find(name) == CurrentValueMap.end())
         throw MissingValueException(__FILE__, __LINE__);
-      _T = lexical_cast<T>(CurrentValue[name].c_str());
-      CurrentValue.erase(name);
+      _T = lexical_cast<T>(CurrentValueMap[name].c_str());
+      CurrentValueMap.erase(name);
     } else
       throw IllegalTypeException(__FILE__,__LINE__);
@@ -190 +191 @@
     T temp;
     if (typeid( std::vector<T> ) == *TypeMap[name]) { // constructor of type_info is private, hence can only store by ref or ptr
-      if (CurrentValue.find(name) == CurrentValue.end())
+      if (CurrentValueMap.find(name) == CurrentValueMap.end())
         throw MissingValueException(__FILE__, __LINE__);
-      std::istringstream stream(CurrentValue[name]);
-      CurrentValue.erase(name);
+      std::istringstream stream(CurrentValueMap[name]);
+      CurrentValueMap.erase(name);
       while (!stream.fail()) {
         stream >> temp >> std::ws;
@@ -211 +212 @@
   void setCurrentValue(const char * name, std::vector<const element *>&_T);
   void setCurrentValue(const char * name, std::vector<molecule *>&_T);
-  void setCurrentValue(const char * name, fs::path&_T);
+  void setCurrentValue(const char * name, boost::filesystem::path&_T);
+
   template<class T> void setCurrentValue(const char * name, T &_T)
   {
@@ -217 +219 @@
     if (typeid( T ) == *TypeMap[name]) {  // constructor of type_info is private, hence can only store by ref or ptr
       stream << _T;
-      CurrentValue[name] = stream.str();
+      CurrentValueMap[name] = stream.str();
     } else
       throw IllegalTypeException(__FILE__,__LINE__);
@@ -229 +231 @@
         stream << (*iter) << " ";
       }
-      CurrentValue[name] = stream.str();
+      CurrentValueMap[name] = stream.str();
     } else
       throw IllegalTypeException(__FILE__,__LINE__);
@@ -244 +246 @@
 
   // map of the action names and their description
-  std::map<std::string, std::string> CurrentValue;
+  std::map<std::string, std::string> CurrentValueMap;
   std::map<std::string, std::string> DescriptionMap;
   std::map<std::string, std::string> ShortFormMap;