Changeset 72b6d7 for src


Ignore:
Timestamp:
Aug 30, 2025, 2:41:40 PM (2 months ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
Candidate_v1.7.0, stable
Children:
e83114
Parents:
5a255af
git-author:
Frederik Heber <frederik.heber@…> (08/16/25 10:19:52)
git-committer:
Frederik Heber <frederik.heber@…> (08/30/25 14:41:40)
Message:

SerializablePotential's parameters_t is taken from FunctionModel.

Location:
src/Potentials
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • src/Potentials/SerializablePotential.cpp

    r5a255af r72b6d7  
    7676  /// print coefficients
    7777  const SerializablePotential::ParameterNames_t &paramNames = getParameterNames();
    78   const SerializablePotential::parameters_t &params = getParameters();
     78  const FunctionModel::parameters_t &params = getParameters();
    7979  SerializablePotential::ParameterNames_t::const_iterator nameiter = paramNames.begin();
    80   SerializablePotential::parameters_t::const_iterator valueiter = params.begin();
     80  FunctionModel::parameters_t::const_iterator valueiter = params.begin();
    8181  if (!params.empty()) {
    8282    if (!types.empty())
    … …  
    107107
    108108  // create copy of current parameters as line may contain not all required
    109   SerializablePotential::parameters_t params(getParameters());
     109  FunctionModel::parameters_t params(getParameters());
    110110
    111111  // read in full line
    … …  
    128128  // step through each token
    129129  ConvertTo<size_t> ConvertToIndex;
    130   ConvertTo<SerializablePotential::parameter_t> ConvertToValue;
     130  ConvertTo<FunctionModel::parameter_t> ConvertToValue;
    131131  ConvertTo<SerializablePotential::ParticleType_t> ConvertToParticleType;
    132132  for (tokenizer::iterator tok_iter = tokens.begin();

  • src/Potentials/SerializablePotential.hpp

    r5a255af r72b6d7  
    1313#include <config.h>
    1414#endif
     15
     16#include "FunctionApproximation/FunctionModel.hpp"
    1517
    1618#include <iosfwd>
    … …  
    4446  //!> typedef for a vector of parameter names
    4547  typedef std::vector<std::string> ParameterNames_t;
    46   //!> typedef for a single parameter degree of freedom of the function
    47   typedef double parameter_t;
    48   //!> typedef for the whole set of parameters of the function
    49   typedef std::vector<parameter_t> parameters_t;
    5048
    5149public:
    … …  
    7573   * \return current set of parameters of the model function
    7674   */
    77   virtual parameters_t getParameters() const=0;
     75  virtual FunctionModel::parameters_t getParameters() const=0;
    7876
    7977  /** Getter for the number of parameters of this model function.
    … …  
    132130   * \param params set of parameters to set
    133131   */
    134   virtual void setParameters(const parameters_t &params)=0;
     132  virtual void setParameters(const FunctionModel::parameters_t &params)=0;
    135133
    136134  /** Setter for a given particle type.

  • src/Potentials/unittests/SerializablePotentialUnitTest.cpp

    r5a255af r72b6d7  
    9696    CPPUNIT_ASSERT_NO_THROW(instream >> mockpotential);
    9797    CPPUNIT_ASSERT_EQUAL(
    98         SerializablePotential::parameter_t(1),
     98                FunctionModel::parameter_t(1),
    9999        mockpotential.getParameters()[0]);
    100100  }
    … …  
    107107        SerializerIllegalKeyException);
    108108    CPPUNIT_ASSERT_EQUAL(
    109         SerializablePotential::parameter_t(1),
     109                FunctionModel::parameter_t(1),
    110110        mockpotential.getParameters()[0]);
    111111  }
    … …  
    118118        SerializerMissingValueException);
    119119    CPPUNIT_ASSERT_EQUAL(
    120         SerializablePotential::parameter_t(1),
     120                FunctionModel::parameter_t(1),
    121121        mockpotential.getParameters()[0]);
    122122  }

  • src/Potentials/unittests/stubs/SerializablePotentialMock.cpp

    r5a255af r72b6d7  
    5050
    5151
    52 void SerializablePotentialMock::setParameters(const parameters_t &_params)
     52void SerializablePotentialMock::setParameters(const FunctionModel::parameters_t &_params)
    5353{
    5454  ASSERT( _params.size() == (size_t)1,

  • src/Potentials/unittests/stubs/SerializablePotentialMock.hpp

    r5a255af r72b6d7  
    1616#include <string>
    1717
     18#include "FunctionApproximation/FunctionModel.hpp"
    1819#include "Potentials/SerializablePotential.hpp"
    1920
    … …  
    5455   * \param _params set of parameters to set
    5556   */
    56   void setParameters(const parameters_t &_params);
     57  void setParameters(const FunctionModel::parameters_t &_params);
    5758
    5859  /** Getter for the parameters of this model function.
    … …  
    6061   * \return current set of parameters of the model function
    6162   */
    62   parameters_t getParameters() const
     63  FunctionModel::parameters_t getParameters() const
    6364  { return params; }
    6465
    … …  
    7778private:
    7879  //!> parameter vector with parameters as in enum parameter_enum_t
    79   parameters_t params;
     80  FunctionModel::parameters_t params;
    8081
    8182private:
Note: See TracChangeset for help on using the changeset viewer.