Changeset 043598 for src/Parameters

Timestamp:

Jun 11, 2015, 11:21:41 PM (10 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:

37a67f

Parents:

33e801

git-author:

Frederik Heber <heber@…> (05/17/15 04:24:19)

git-committer:

Frederik Heber <heber@…> (06/11/15 23:21:41)

Message:

Replaced all std::string by ParameterPair where used as ("key = value;") tuples.

• this fixes an issue with vectors of key-value-pairs converted into a single string for use in a python command.

Location:

src/Parameters/Validators/Specific

Files:

• KeyValueValidator.cpp (modified) (3 diffs)
• KeyValueValidator.hpp (modified) (2 diffs)

src/Parameters/Validators/Specific/KeyValueValidator.cpp

@@ -38 +38 @@
 #include "KeyValueValidator.hpp"
 
-bool KeyValueValidator::isValid(const std::string & _value) const
+bool KeyValueValidator::isValid(const KeyValuePair & _value) const
 {
   size_t keyvaluestart = 0;
@@ -66 +66 @@
 }
 
-bool KeyValueValidator::operator==(const Validator<std::string> &_instance) const
+bool KeyValueValidator::operator==(const Validator<KeyValuePair> &_instance) const
 {
   const KeyValueValidator *inst =
@@ -76 +76 @@
 }
 
-Validator< std::string >* KeyValueValidator::clone() const
+Validator< KeyValuePair >* KeyValueValidator::clone() const
 {
-  Validator< std::string > *inst =
+  Validator< KeyValuePair > *inst =
       new KeyValueValidator();
   return inst;

src/Parameters/Validators/Specific/KeyValueValidator.hpp

@@ -15 +15 @@
 #endif
 
-#include <string>
-
+#include "Parameters/Specifics/KeyValuePair.hpp"
 #include "Parameters/Validators/Validator.hpp"
 
@@ -22 +21 @@
  * concatenation of the following pattern "...=...;"
  */
-class KeyValueValidator : public Validator<std::string>
+class KeyValueValidator : public Validator<KeyValuePair>
 {
-  bool isValid(const std::string & _value) const;
-  bool operator==(const Validator<std::string> &_instance) const;
-  Validator< std::string >* clone() const;
+  bool isValid(const KeyValuePair & _value) const;
+  bool operator==(const Validator<KeyValuePair> &_instance) const;
+  Validator< KeyValuePair >* clone() const;
 };