Changeset 0b84b9 for src/Parser


Ignore:
Timestamp:
May 31, 2012, 1:25:16 PM (13 years ago)
Author:
Michael Ankele <ankele@…>
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:
7d98e7
Parents:
3c5ef5
git-author:
Michael Ankele <ankele@…> (04/17/12 14:12:33)
git-committer:
Michael Ankele <ankele@…> (05/31/12 13:25:16)
Message:

renamed old Parser/Parameter classes

Location:
src/Parser
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • src/Parser/FormatParser_Parameters.cpp

    r3c5ef5 r0b84b9  
    8787 * @param instance parameter to add
    8888 */
    89 void FormatParser_Parameters::appendParameter(Parameter *instance)
     89void FormatParser_Parameters::appendParameter(ParserParameter *instance)
    9090{
    9191  storage->registerInstance(instance);
    … …  
    109109 * @return pointer to instance with this \a _name
    110110 */
    111 Parameter *FormatParser_Parameters::getParameter(const std::string &_name) const
     111ParserParameter *FormatParser_Parameters::getParameter(const std::string &_name) const
    112112{
    113113  return storage->getByName(_name);
    … …  
    187187          +key+"' with value "+valuestream.str()+"!");
    188188      if (params.haveParameter(key)) {
    189         Parameter *instance = params.getParameter(key);
     189        ParserParameter *instance = params.getParameter(key);
    190190        instance->set(valuestream.str());
    191191      }

  • src/Parser/FormatParser_Parameters.hpp

    r3c5ef5 r0b84b9  
    2020#include "Parser/Parameters/ParameterStorage.hpp"
    2121
    22 class Parameter;
     22class ParserParameter;
    2323
    2424/** This class is an interface to the internal parameters of any FormatParser.
    … …  
    4141
    4242  // accessing parameters in storage
    43   void appendParameter(Parameter *instance);
     43  void appendParameter(ParserParameter *instance);
    4444  bool haveParameter(const std::string &_name) const;
    45   Parameter *getParameter(const std::string &_name) const;
     45  ParserParameter *getParameter(const std::string &_name) const;
    4646
    4747protected:

  • src/Parser/Parameters/ContinuousParameter.hpp

    r3c5ef5 r0b84b9  
    2323 */
    2424template <typename T>
    25 class ContinuousParameter : public Parameter, public ContinuousValue<T>
     25class ContinuousParameter : public ParserParameter, public ContinuousValue<T>
    2626{
    2727public:
    … …  
    3737      { return !((*this)==(_instance)); }
    3838
    39   Parameter* clone() const;
     39  ParserParameter* clone() const;
    4040
    4141private:

  • src/Parser/Parameters/ContinuousParameter_impl.hpp

    r3c5ef5 r0b84b9  
    2323template<typename T>
    2424ContinuousParameter<T>::ContinuousParameter(const std::string &_name) :
    25   Parameter(_name),
     25  ParserParameter(_name),
    2626  ContinuousValue<T>(range<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max()))
    2727{};
    … …  
    3434template<typename T>
    3535ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const T &_value) :
    36   Parameter(_name),
     36  ParserParameter(_name),
    3737  ContinuousValue<T>(range<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max()))
    3838{
    … …  
    4747template<typename T>
    4848ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const range<T> &_ValidRange) :
    49   Parameter(_name),
     49  ParserParameter(_name),
    5050  ContinuousValue<T>(_ValidRange)
    5151{};
    … …  
    5959template<typename T>
    6060ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const range<T> &_ValidRange, const T &_value) :
    61   Parameter(_name),
     61  ParserParameter(_name),
    6262  ContinuousValue<T>(_ValidRange)
    6363{
    … …  
    8383  status = status &&
    8484      (*dynamic_cast<const ContinuousValue<T> *>(this) == dynamic_cast<const ContinuousValue<T> &>(_instance));
    85   status = status && (Parameter::getName() == _instance.Parameter::getName());
     85  status = status && (ParserParameter::getName() == _instance.ParserParameter::getName());
    8686  return status;
    8787}
    … …  
    9292 */
    9393template<typename T>
    94 Parameter* ContinuousParameter<T>::clone() const
     94ParserParameter* ContinuousParameter<T>::clone() const
    9595{
    96   ContinuousParameter<T> *instance = new ContinuousParameter<T>(Parameter::getName(), ContinuousValue<T>::getValidRange());
     96  ContinuousParameter<T> *instance = new ContinuousParameter<T>(ParserParameter::getName(), ContinuousValue<T>::getValidRange());
    9797  instance->setValue(ContinuousValue<T>::getValue());
    9898  return instance;

  • src/Parser/Parameters/ContinuousValue.hpp

    r3c5ef5 r0b84b9  
    2727 */
    2828template <class T>
    29 class ContinuousValue : virtual public ValueInterface
     29class ContinuousValue : virtual public ParserValueInterface
    3030{
    3131  //!> unit test needs to have access to internal values

  • src/Parser/Parameters/DiscreteParameter.hpp

    r3c5ef5 r0b84b9  
    2525 */
    2626template <typename T>
    27 class DiscreteParameter : public Parameter, public DiscreteValue<T>
     27class DiscreteParameter : public ParserParameter, public DiscreteValue<T>
    2828{
    2929public:
    … …  
    3838      { return !((*this)==(_instance)); }
    3939
    40   Parameter* clone() const;
     40  ParserParameter* clone() const;
    4141
    4242private:

  • src/Parser/Parameters/DiscreteParameter_impl.hpp

    r3c5ef5 r0b84b9  
    2323template<typename T>
    2424DiscreteParameter<T>::DiscreteParameter(const std::string &_name) :
    25   Parameter(_name)
     25  ParserParameter(_name)
    2626{};
    2727
    … …  
    3333template<typename T>
    3434DiscreteParameter<T>::DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues) :
    35   Parameter(_name),
     35  ParserParameter(_name),
    3636  DiscreteValue<T>(_ValidValues)
    3737{};
    … …  
    4545template<typename T>
    4646DiscreteParameter<T>::DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues, const T &_value) :
    47   Parameter(_name),
     47  ParserParameter(_name),
    4848  DiscreteValue<T>(_ValidValues)
    4949{
    … …  
    6969  status = status &&
    7070      (*dynamic_cast<const DiscreteValue<T> *>(this) == dynamic_cast<const DiscreteValue<T> &>(_instance));
    71   status = status && (Parameter::getName() == _instance.Parameter::getName());
     71  status = status && (ParserParameter::getName() == _instance.ParserParameter::getName());
    7272  return status;
    7373}
    … …  
    7878 */
    7979template<typename T>
    80 Parameter* DiscreteParameter<T>::clone() const
     80ParserParameter* DiscreteParameter<T>::clone() const
    8181{
    82   DiscreteParameter<T> *instance = new DiscreteParameter<T>(Parameter::getName(), DiscreteValue<T>::getValidValues());
     82  DiscreteParameter<T> *instance = new DiscreteParameter<T>(ParserParameter::getName(), DiscreteValue<T>::getValidValues());
    8383  instance->setValue(DiscreteValue<T>::getValue());
    8484  return instance;

  • src/Parser/Parameters/DiscreteValue.hpp

    r3c5ef5 r0b84b9  
    2727 */
    2828template <class T>
    29 class DiscreteValue : virtual public ValueInterface
     29class DiscreteValue : virtual public ParserValueInterface
    3030{
    3131  //!> unit test needs to have access to internal values

  • src/Parser/Parameters/Parameter.hpp

    r3c5ef5 r0b84b9  
    66 */
    77
    8 #ifndef PARAMETER_HPP_
    9 #define PARAMETER_HPP_
     8#ifndef PARSERPARAMETER_HPP_
     9#define PARSERPARAMETER_HPP_
    1010
    1111// include config.h
    … …  
    2424 *
    2525 */
    26 class Parameter : virtual public ValueInterface, public Clone<Parameter>
     26class ParserParameter : virtual public ParserValueInterface, public Clone<ParserParameter>
    2727{
    2828public:
    29   Parameter(const std::string &_name) : name(_name) {}
    30   virtual ~Parameter() {}
     29  ParserParameter(const std::string &_name) : name(_name) {}
     30  virtual ~ParserParameter() {}
    3131
    3232  const std::string &getName() const { return name; }
    3333
    34   virtual Parameter* clone() const=0;
     34  virtual ParserParameter* clone() const=0;
    3535
    3636private:
    37   Parameter();
     37  ParserParameter();
    3838
    3939private:
    … …  
    4242
    4343
    44 #endif /* PARAMETER_HPP_ */
     44#endif /* PARSERPARAMETER_HPP_ */

  • src/Parser/Parameters/ParameterStorage.cpp

    r3c5ef5 r0b84b9  
    3737{
    3838  for (const_iterator iter = _storage.getBeginIter(); iter != _storage.getEndIter(); ++iter) {
    39     Parameter *instance = (iter->second)->clone();
     39    ParserParameter *instance = (iter->second)->clone();
    4040    registerInstance(instance);
    4141  }
    … …  
    4949}
    5050
    51 CONSTRUCT_REGISTRY(Parameter)
     51CONSTRUCT_REGISTRY(ParserParameter)

  • src/Parser/Parameters/ParameterStorage.hpp

    r3c5ef5 r0b84b9  
    2323 *
    2424 */
    25 class ParameterStorage : public Registry<Parameter>
     25class ParameterStorage : public Registry<ParserParameter>
    2626{
    2727public:

  • src/Parser/Parameters/StringParameter.cpp

    r3c5ef5 r0b84b9  
    3131 */
    3232StringParameter::StringParameter(const std::string &_name) :
    33   Parameter(_name),
     33  ParserParameter(_name),
    3434  ValueSet(false)
    3535{}
    … …  
    4141 */
    4242StringParameter::StringParameter(const std::string &_name, const std::string &_value) :
    43   Parameter(_name),
     43  ParserParameter(_name),
    4444  ValueSet(true),
    4545  value(_value)
    … …  
    6363  if (ValueSet && _instance.ValueSet)
    6464    status = status && (value == _instance.value);
    65   status = status && (Parameter::getName() == _instance.Parameter::getName());
     65  status = status && (ParserParameter::getName() == _instance.ParserParameter::getName());
    6666  return status;
    6767}
    … …  
    7171 * @return copy of this instance with same value
    7272 */
    73 Parameter* StringParameter::clone() const
     73ParserParameter* StringParameter::clone() const
    7474{
    75   StringParameter *instance = new StringParameter(Parameter::getName(), get());
     75  StringParameter *instance = new StringParameter(ParserParameter::getName(), get());
    7676  return instance;
    7777}

  • src/Parser/Parameters/StringParameter.hpp

    r3c5ef5 r0b84b9  
    2525 *
    2626 */
    27 class StringParameter : public Parameter,  virtual public ValueInterface
     27class StringParameter : public ParserParameter,  virtual public ParserValueInterface
    2828{
    2929public:
    … …  
    4242      { return !((*this)==(_instance)); }
    4343
    44   Parameter* clone() const;
     44  ParserParameter* clone() const;
    4545
    4646private:

  • src/Parser/Parameters/ValueInterface.hpp

    r3c5ef5 r0b84b9  
    66 */
    77
    8 #ifndef VALUEINTERFACE_HPP_
    9 #define VALUEINTERFACE_HPP_
     8#ifndef PARSERVALUEINTERFACE_HPP_
     9#define PARSERVALUEINTERFACE_HPP_
    1010
    1111// include config.h
    … …  
    1717 *
    1818 */
    19 class ValueInterface
     19class ParserValueInterface
    2020{
    2121public:
    22   virtual ~ValueInterface() {};
     22  virtual ~ParserValueInterface() {};
    2323
    2424  virtual bool isValid(const std::string _value) const=0;
    … …  
    2727};
    2828
    29 #endif /* VALUEINTERFACE_HPP_ */
     29#endif /* PARSERVALUEINTERFACE_HPP_ */

  • src/Parser/Parameters/unittests/ParameterStorageUnitTest.cpp

    r3c5ef5 r0b84b9  
    5353    ValidValues.push_back(i);
    5454  range<double> ValidRange(1., 4.);
    55   Parameter *intParam = new DiscreteParameter<int>("intParam", ValidValues);
    56   Parameter *doubleParam = new ContinuousParameter<double>("doubleParam", ValidRange);
     55  ParserParameter *intParam = new DiscreteParameter<int>("intParam", ValidValues);
     56  ParserParameter *doubleParam = new ContinuousParameter<double>("doubleParam", ValidRange);
    5757  // note: delete is done by registry in tearDown ...
    5858
Note: See TracChangeset for help on using the changeset viewer.