Changeset 72b6d7 for src/Potentials/unittests

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.

• before we (re-)defined the type but this causes problems later where the potentials inherit from both EmpiricalPotential and SerializablePotential.

Location:

src/Potentials/unittests

Files:

• SerializablePotentialUnitTest.cpp (modified) (3 diffs)
• stubs/SerializablePotentialMock.cpp (modified) (1 diff)
• stubs/SerializablePotentialMock.hpp (modified) (4 diffs)

src/Potentials/unittests/SerializablePotentialUnitTest.cpp

@@ -96 +96 @@
     CPPUNIT_ASSERT_NO_THROW(instream >> mockpotential);
     CPPUNIT_ASSERT_EQUAL(
-        SerializablePotential::parameter_t(1),
+                FunctionModel::parameter_t(1),
         mockpotential.getParameters()[0]);
   }
@@ -107 +107 @@
         SerializerIllegalKeyException);
     CPPUNIT_ASSERT_EQUAL(
-        SerializablePotential::parameter_t(1),
+                FunctionModel::parameter_t(1),
         mockpotential.getParameters()[0]);
   }
@@ -118 +118 @@
         SerializerMissingValueException);
     CPPUNIT_ASSERT_EQUAL(
-        SerializablePotential::parameter_t(1),
+                FunctionModel::parameter_t(1),
         mockpotential.getParameters()[0]);
   }

src/Potentials/unittests/stubs/SerializablePotentialMock.cpp

@@ -50 +50 @@
 
 
-void SerializablePotentialMock::setParameters(const parameters_t &_params)
+void SerializablePotentialMock::setParameters(const FunctionModel::parameters_t &_params)
 {
   ASSERT( _params.size() == (size_t)1,

src/Potentials/unittests/stubs/SerializablePotentialMock.hpp

@@ -16 +16 @@
 #include <string>
 
+#include "FunctionApproximation/FunctionModel.hpp"
 #include "Potentials/SerializablePotential.hpp"
 
@@ -54 +55 @@
    * \param _params set of parameters to set
    */
-  void setParameters(const parameters_t &_params);
+  void setParameters(const FunctionModel::parameters_t &_params);
 
   /** Getter for the parameters of this model function.
@@ -60 +61 @@
    * \return current set of parameters of the model function
    */
-  parameters_t getParameters() const
+  FunctionModel::parameters_t getParameters() const
   { return params; }
 
@@ -77 +78 @@
 private:
   //!> parameter vector with parameters as in enum parameter_enum_t
-  parameters_t params;
+  FunctionModel::parameters_t params;
 
 private: