Changeset 72b6d7 for src/Potentials/SerializablePotential.cpp

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.

File:

• src/Potentials/SerializablePotential.cpp (modified) (3 diffs)

src/Potentials/SerializablePotential.cpp

@@ -76 +76 @@
   /// print coefficients
   const SerializablePotential::ParameterNames_t &paramNames = getParameterNames();
-  const SerializablePotential::parameters_t &params = getParameters();
+  const FunctionModel::parameters_t &params = getParameters();
   SerializablePotential::ParameterNames_t::const_iterator nameiter = paramNames.begin();
-  SerializablePotential::parameters_t::const_iterator valueiter = params.begin();
+  FunctionModel::parameters_t::const_iterator valueiter = params.begin();
   if (!params.empty()) {
     if (!types.empty())
@@ -107 +107 @@
 
   // create copy of current parameters as line may contain not all required
-  SerializablePotential::parameters_t params(getParameters());
+  FunctionModel::parameters_t params(getParameters());
 
   // read in full line
@@ -128 +128 @@
   // step through each token
   ConvertTo<size_t> ConvertToIndex;
-  ConvertTo<SerializablePotential::parameter_t> ConvertToValue;
+  ConvertTo<FunctionModel::parameter_t> ConvertToValue;
   ConvertTo<SerializablePotential::ParticleType_t> ConvertToParticleType;
   for (tokenizer::iterator tok_iter = tokens.begin();