Changeset dc438c

Timestamp:

Nov 16, 2012, 11:10:56 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:

dbf6c7

Parents:

284551

git-author:

Michael Ankele <ankele@…> (10/23/12 11:20:01)

git-committer:

Frederik Heber <heber@…> (11/16/12 11:10:56)

Message:

Refactoring: ShapeTypeValidator as DiscreteValidator.

• added ShapeTypeValidator clone() and operator==().

Location:

src

Files:

• Parameters/Validators/DiscreteValidator.hpp (modified) (1 diff)
• Parameters/Validators/Specific/ShapeTypeValidator.cpp (modified) (1 diff)
• Parameters/Validators/Specific/ShapeTypeValidator.hpp (modified) (1 diff)
• Shapes/ShapeFactory.cpp (modified) (2 diffs)
• Shapes/ShapeFactory.hpp (modified) (2 diffs)

src/Parameters/Validators/DiscreteValidator.hpp

@@ -42 +42 @@
 
   void appendValidValue(const T &_value) throw(ParameterValidatorException);
-  const std::vector<T> &getValidValues() const;
+  virtual const std::vector<T> &getValidValues() const;
 
 private:

src/Parameters/Validators/Specific/ShapeTypeValidator.cpp

@@ -40 +40 @@
 #include "Shapes/ShapeFactory.hpp"
 
+ShapeTypeValidator::ShapeTypeValidator() :
+DiscreteValidator<std::string>(std::vector<std::string>())
+{}
+
 bool ShapeTypeValidator::isValid(const std::string & _value) const
 {
   return ShapeFactory::getInstance().isValidShapeName(_value);
+}
+
+const std::vector<std::string> &ShapeTypeValidator::getValidValues() const
+{
+  return ShapeFactory::getInstance().getBaseShapeNames();
 }
 

src/Parameters/Validators/Specific/ShapeTypeValidator.hpp

@@ -18 +18 @@
 #include <string>
 
-#include "Parameters/Validators/Validator.hpp"
+#include "Parameters/Validators/DiscreteValidator.hpp"
 
 /** This validator checks whether the given string is a shape type
  * (i.e. "sphere" etc).
  */
-class ShapeTypeValidator : public Validator<std::string>
+class ShapeTypeValidator : public DiscreteValidator<std::string>
 {
+public:
+  ShapeTypeValidator();
   bool isValid(const std::string & _value) const;
+  virtual const std::vector<std::string> &getValidValues() const;
   bool operator==(const Validator<std::string> &_instance) const;
   Validator< std::string >* clone() const;

src/Shapes/ShapeFactory.cpp

@@ -55 +55 @@
   for (int i=0; i<MAX_ShapeType; i++)
     nameShapeMap.insert(std::pair<std::string, ShapeType>(shapeNames[i], (ShapeType)i));
+
+  // Create baseShapeName list.
+  for (int i=0; i<MAX_ShapeType; i++)
+    if (strcmp(shapeNames[i], "combined") != 0)
+      baseShapeNames.push_back(shapeNames[i]);
 }
 
@@ -77 +82 @@
   NameShapeMap::iterator iter = nameShapeMap.find(name);
   return (iter != nameShapeMap.end());
+}
+
+const std::vector<std::string> &ShapeFactory::getBaseShapeNames()
+{
+  return baseShapeNames;
 }
 

src/Shapes/ShapeFactory.hpp

@@ -28 +28 @@
   ShapeType getShapeByName(const std::string &name);
   std::string getShapeName(ShapeType type);
+  const std::vector<std::string> &getBaseShapeNames();
   bool isValidShapeName(const std::string &name);
 
@@ -40 +41 @@
   // name/type maps
   static const char *shapeNames[];
+  std::vector<std::string> baseShapeNames;
   typedef std::map<ShapeType, std::string> ShapeNameMap;
   ShapeNameMap shapeNameMap;