Changeset 9cd0d0 for src/Parameters


Ignore:
Timestamp:
May 21, 2012, 12:39:55 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:
0ba371
Parents:
c5e7313
git-author:
Michael Ankele <ankele@…> (04/13/12 12:39:07)
git-committer:
Michael Ankele <ankele@…> (05/21/12 12:39:55)
Message:

refactoring: rename Paramater -> ParameterInterface

Location:
src/Parameters
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • src/Parameters/ContinuousParameter.hpp

    rc5e7313 r9cd0d0  
    1717
    1818#include "ContinuousValue.hpp"
    19 #include "Parameter.hpp"
     19#include "ParameterInterface.hpp"
    2020
    2121/** This class encapsulates a clonable, continuous value.
    … …  
    2323 */
    2424template <typename T>
    25 class ContinuousParameter : public Parameter<T>, public ContinuousValue<T>
     25class ContinuousParameter : public ParameterInterface<T>, public ContinuousValue<T>
    2626{
    2727public:
    … …  
    3737      { return !((*this)==(_instance)); }
    3838
    39   Parameter<T>* clone() const;
     39  ParameterInterface<T>* clone() const;
    4040
    4141private:

  • src/Parameters/ContinuousParameter_impl.hpp

    rc5e7313 r9cd0d0  
    2323template<typename T>
    2424ContinuousParameter<T>::ContinuousParameter(const std::string &_name) :
    25   Parameter<T>(_name),
     25  ParameterInterface<T>(_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<T>(_name),
     36  ParameterInterface<T>(_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<T>(_name),
     49  ParameterInterface<T>(_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<T>(_name),
     61  ParameterInterface<T>(_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<T>::getName() == _instance.Parameter<T>::getName());
     85  status = status && (ParameterInterface<T>::getName() == _instance.ParameterInterface<T>::getName());
    8686  return status;
    8787}
    … …  
    9292 */
    9393template<typename T>
    94 Parameter<T>* ContinuousParameter<T>::clone() const
     94ParameterInterface<T>* ContinuousParameter<T>::clone() const
    9595{
    96   ContinuousParameter<T> *instance = new ContinuousParameter<T>(Parameter<T>::getName(), ContinuousValue<T>::getValidRange());
     96  ContinuousParameter<T> *instance = new ContinuousParameter<T>(ParameterInterface<T>::getName(), ContinuousValue<T>::getValidRange());
    9797  instance->setValue(ContinuousValue<T>::getValue());
    9898  return instance;

  • src/Parameters/DiscreteParameter.hpp

    rc5e7313 r9cd0d0  
    1717
    1818#include "DiscreteValue.hpp"
    19 #include "Parameter.hpp"
     19#include "ParameterInterface.hpp"
    2020
    2121#include <vector>
    … …  
    2525 */
    2626template <typename T>
    27 class DiscreteParameter : public Parameter<T>, public DiscreteValue<T>
     27class DiscreteParameter : public ParameterInterface<T>, public DiscreteValue<T>
    2828{
    2929public:
    … …  
    3838      { return !((*this)==(_instance)); }
    3939
    40   Parameter<T>* clone() const;
     40  ParameterInterface<T>* clone() const;
    4141
    4242private:

  • src/Parameters/DiscreteParameter_impl.hpp

    rc5e7313 r9cd0d0  
    2323template<typename T>
    2424DiscreteParameter<T>::DiscreteParameter(const std::string &_name) :
    25   Parameter<T>(_name)
     25  ParameterInterface<T>(_name)
    2626{};
    2727
    … …  
    3333template<typename T>
    3434DiscreteParameter<T>::DiscreteParameter(const std::string &_name, const std::vector<T> &_ValidValues) :
    35   Parameter<T>(_name),
     35  ParameterInterface<T>(_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<T>(_name),
     47  ParameterInterface<T>(_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<T>::getName() == _instance.Parameter<T>::getName());
     71  status = status && (ParameterInterface<T>::getName() == _instance.ParameterInterface<T>::getName());
    7272  return status;
    7373}
    … …  
    7878 */
    7979template<typename T>
    80 Parameter<T>* DiscreteParameter<T>::clone() const
     80ParameterInterface<T>* DiscreteParameter<T>::clone() const
    8181{
    82   DiscreteParameter<T> *instance = new DiscreteParameter<T>(Parameter<T>::getName(), DiscreteValue<T>::getValidValues());
     82  DiscreteParameter<T> *instance = new DiscreteParameter<T>(ParameterInterface<T>::getName(), DiscreteValue<T>::getValidValues());
    8383  instance->setValue(DiscreteValue<T>::getValue());
    8484  return instance;

  • src/Parameters/ParameterInterface.hpp

    rc5e7313 r9cd0d0  
    2525 */
    2626template <class T>
    27 class Parameter : virtual public ValueInterface<T>, public Clone<Parameter<T> >
     27class ParameterInterface : virtual public ValueInterface<T>, public Clone<ParameterInterface<T> >
    2828{
    2929public:
    30   Parameter(const std::string &_name) : name(_name) {}
    31   virtual ~Parameter() {}
     30  ParameterInterface(const std::string &_name) : name(_name) {}
     31  virtual ~ParameterInterface() {}
    3232
    3333  const std::string &getName() const { return name; }
    3434
    35   virtual Parameter* clone() const=0;
     35  virtual ParameterInterface* clone() const=0;
    3636
    3737private:
    38   Parameter();
     38  ParameterInterface();
    3939
    4040private:

  • src/Parameters/unittests/Makefile.am

    rc5e7313 r9cd0d0  
    4646        ../Parameters/ContinuousParameter.hpp \
    4747        ../Parameters/ContinuousParameter_impl.hpp \
    48         ../Parameters/Parameter.hpp \
     48        ../Parameters/ParameterInterface.hpp \
    4949        ../Parameters/Range.hpp \
    5050        ../Parameters/ValueInterface.hpp
    … …  
    6969        ../Parameters/DiscreteParameter.hpp \
    7070        ../Parameters/DiscreteParameter_impl.hpp \
    71         ../Parameters/Parameter.hpp \
     71        ../Parameters/ParameterInterface.hpp \
    7272        ../Parameters/ValueInterface.hpp
    7373DiscreteParameterTest_LDADD = \
Note: See TracChangeset for help on using the changeset viewer.