Changeset 9cd0d0 for src/Parameters/ContinuousParameter_impl.hpp
- Timestamp:
- May 21, 2012, 12:39:55 PM (13 years ago)
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Parameters/ContinuousParameter_impl.hpp
rc5e7313 r9cd0d0 23 23 template<typename T> 24 24 ContinuousParameter<T>::ContinuousParameter(const std::string &_name) : 25 Parameter <T>(_name),25 ParameterInterface<T>(_name), 26 26 ContinuousValue<T>(range<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max())) 27 27 {}; … … 34 34 template<typename T> 35 35 ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const T &_value) : 36 Parameter <T>(_name),36 ParameterInterface<T>(_name), 37 37 ContinuousValue<T>(range<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max())) 38 38 { … … 47 47 template<typename T> 48 48 ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const range<T> &_ValidRange) : 49 Parameter <T>(_name),49 ParameterInterface<T>(_name), 50 50 ContinuousValue<T>(_ValidRange) 51 51 {}; … … 59 59 template<typename T> 60 60 ContinuousParameter<T>::ContinuousParameter(const std::string &_name, const range<T> &_ValidRange, const T &_value) : 61 Parameter <T>(_name),61 ParameterInterface<T>(_name), 62 62 ContinuousValue<T>(_ValidRange) 63 63 { … … 83 83 status = status && 84 84 (*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()); 86 86 return status; 87 87 } … … 92 92 */ 93 93 template<typename T> 94 Parameter <T>* ContinuousParameter<T>::clone() const94 ParameterInterface<T>* ContinuousParameter<T>::clone() const 95 95 { 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()); 97 97 instance->setValue(ContinuousValue<T>::getValue()); 98 98 return instance;
Note:
See TracChangeset
for help on using the changeset viewer.