Changeset d5521e for src

Timestamp:

Sep 19, 2013, 8:24:28 PM (11 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:

87ec81

Parents:

aeb694

git-author:

Frederik Heber <heber@…> (09/17/13 22:53:14)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:24:28)

Message:

FIX: Made most ShapeFactory member function const.

Location:

src/Shapes

Files:

• ShapeFactory.cpp (modified) (3 diffs)
• ShapeFactory.hpp (modified) (1 diff)

src/Shapes/ShapeFactory.cpp

@@ -65 +65 @@
 }
 
-ShapeType ShapeFactory::getShapeByName(const std::string& name)
+ShapeType ShapeFactory::getShapeByName(const std::string& name) const
 {
-  NameShapeMap::iterator iter = nameShapeMap.find(name);
+  NameShapeMap::const_iterator iter = nameShapeMap.find(name);
   ASSERT(iter != nameShapeMap.end(),
       "ShapeFactory::getShapeByName() - unknown name: "+name+".");
@@ -73 +73 @@
 }
 
-std::string ShapeFactory::getShapeName(ShapeType type)
+std::string ShapeFactory::getShapeName(ShapeType type) const
 {
-  ShapeNameMap::iterator iter = shapeNameMap.find(type);
+  ShapeNameMap::const_iterator iter = shapeNameMap.find(type);
   ASSERT(iter != shapeNameMap.end(),
       "ShapeFactory::getShapeName() - unknown type: "+toString(type)+".");
@@ -81 +81 @@
 }
 
-bool ShapeFactory::isValidShapeName(const std::string& name)
+bool ShapeFactory::isValidShapeName(const std::string& name) const
 {
-  NameShapeMap::iterator iter = nameShapeMap.find(name);
+  NameShapeMap::const_iterator iter = nameShapeMap.find(name);
   return (iter != nameShapeMap.end());
 }
 
-const std::vector<std::string> &ShapeFactory::getBaseShapeNames()
+const std::vector<std::string> &ShapeFactory::getBaseShapeNames() const
 {
   return baseShapeNames;

src/Shapes/ShapeFactory.hpp

@@ -26 +26 @@
 public:
 
-  ShapeType getShapeByName(const std::string &name);
-  std::string getShapeName(ShapeType type);
-  const std::vector<std::string> &getBaseShapeNames();
-  bool isValidShapeName(const std::string &name);
+  ShapeType getShapeByName(const std::string &name) const;
+  std::string getShapeName(ShapeType type) const;
+  const std::vector<std::string> &getBaseShapeNames() const;
+  bool isValidShapeName(const std::string &name) const;
 
   // create a shape