Generator: removed trackedExternalCount() and untrackedExternalCount().

Indeed, we can't track/untrack an external variable, so we don't need those methods anymore.
cellml · Oct 29, 2024 · 18ac7f3 · 18ac7f3
1 parent ee16fc1
commit 18ac7f3
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 65 deletions.
diff --git a/src/api/libcellml/generator.h b/src/api/libcellml/generator.h
@@ -273,28 +273,6 @@ class LIBCELLML_EXPORT Generator
      */
     size_t untrackedAlgebraicCount(const AnalyserModelPtr &model);
 
-    /**
-     * @brief Get the number of tracked external variables in the given @p model.
-     *
-     * Get the number of tracked external variables in the given @p model.
-     *
-     * @param model The pointer to the @ref AnalyserModel for which to get the number of tracked external variables.
-     *
-     * @return The number of tracked external variables in the model.
-     */
-    size_t trackedExternalCount(const AnalyserModelPtr &model);
-
-    /**
-     * @brief Get the number of untracked external variables in the given @p model.
-     *
-     * Get the number of untracked external variables in the given @p model.
-     *
-     * @param model The pointer to the @ref AnalyserModel for which to get the number of untracked external variables.
-     *
-     * @return The number of untracked external variables in the model.
-     */
-    size_t untrackedExternalCount(const AnalyserModelPtr &model);
-
     /**
      * @brief Get the number of tracked variables in the given @p model.
      *

diff --git a/src/bindings/interface/generator.i b/src/bindings/interface/generator.i
@@ -71,12 +71,6 @@
 %feature("docstring") libcellml::Generator::untrackedAlgebraicCount
 "Returns the number of untracked algebraic variables in the given model.";
 
-%feature("docstring") libcellml::Generator::trackedExternalCount
-"Returns the number of tracked external variables in the given model.";
-
-%feature("docstring") libcellml::Generator::untrackedExternalCount
-"Returns the number of untracked external variables in the given model.";
-
 %feature("docstring") libcellml::Generator::trackedVariableCount
 "Returns the number of tracked variables in the given model.";
 

diff --git a/src/bindings/javascript/generator.cpp b/src/bindings/javascript/generator.cpp
@@ -46,8 +46,6 @@ EMSCRIPTEN_BINDINGS(libcellml_generator)
         .function("untrackedComputedConstantCount", &libcellml::Generator::untrackedComputedConstantCount)
         .function("trackedAlgebraicCount", &libcellml::Generator::trackedAlgebraicCount)
         .function("untrackedAlgebraicCount", &libcellml::Generator::untrackedAlgebraicCount)
-        .function("trackedExternalCount", &libcellml::Generator::trackedExternalCount)
-        .function("untrackedExternalCount", &libcellml::Generator::untrackedExternalCount)
         .function("trackedVariableCount", &libcellml::Generator::trackedVariableCount)
         .function("untrackedVariableCount", &libcellml::Generator::untrackedVariableCount)
         .function("interfaceCode", &libcellml::Generator::interfaceCode)

diff --git a/src/generator.cpp b/src/generator.cpp
@@ -296,24 +296,6 @@ size_t Generator::GeneratorImpl::untrackedAlgebraicCount(const AnalyserModelPtr
     return doTrackedVariableCount(model, model->algebraic(), false);
 }
 
-size_t Generator::GeneratorImpl::trackedExternalCount(const AnalyserModelPtr &model)
-{
-    if (model == nullptr) {
-        return 0;
-    }
-
-    return doTrackedVariableCount(model, model->externals(), true);
-}
-
-size_t Generator::GeneratorImpl::untrackedExternalCount(const AnalyserModelPtr &model)
-{
-    if (model == nullptr) {
-        return 0;
-    }
-
-    return doTrackedVariableCount(model, model->externals(), false);
-}
-
 size_t Generator::GeneratorImpl::trackedVariableCount(const AnalyserModelPtr &model)
 {
     if (model == nullptr) {
@@ -620,7 +602,7 @@ void Generator::GeneratorImpl::addStateAndVariableCountCode(const AnalyserModelP
         code += interface ?
                     mProfile->interfaceExternalCountString() :
                     replace(mProfile->implementationExternalCountString(),
-                            "[EXTERNAL_COUNT]", std::to_string(trackedExternalCount(model)));
+                            "[EXTERNAL_COUNT]", std::to_string(model->externalCount()));
     }
 
     if (!code.empty()) {
@@ -2471,16 +2453,6 @@ size_t Generator::untrackedAlgebraicCount(const AnalyserModelPtr &model)
     return mPimpl->untrackedAlgebraicCount(model);
 }
 
-size_t Generator::trackedExternalCount(const AnalyserModelPtr &model)
-{
-    return mPimpl->trackedExternalCount(model);
-}
-
-size_t Generator::untrackedExternalCount(const AnalyserModelPtr &model)
-{
-    return mPimpl->untrackedExternalCount(model);
-}
-
 size_t Generator::trackedVariableCount(const AnalyserModelPtr &model)
 {
     return mPimpl->trackedVariableCount(model);

diff --git a/src/generator_p.h b/src/generator_p.h
@@ -82,9 +82,6 @@ struct Generator::GeneratorImpl
     size_t trackedAlgebraicCount(const AnalyserModelPtr &model);
     size_t untrackedAlgebraicCount(const AnalyserModelPtr &model);
 
-    size_t trackedExternalCount(const AnalyserModelPtr &model);
-    size_t untrackedExternalCount(const AnalyserModelPtr &model);
-
     size_t trackedVariableCount(const AnalyserModelPtr &model);
     size_t untrackedVariableCount(const AnalyserModelPtr &model);
 

diff --git a/tests/generator/generatortrackedvariables.cpp b/tests/generator/generatortrackedvariables.cpp
@@ -58,9 +58,6 @@ TEST(GeneratorTrackedVariables, noModelOrVariable)
     EXPECT_EQ(size_t(0), generator->trackedAlgebraicCount(nullptr));
     EXPECT_EQ(size_t(0), generator->untrackedAlgebraicCount(nullptr));
 
-    EXPECT_EQ(size_t(0), generator->trackedExternalCount(nullptr));
-    EXPECT_EQ(size_t(0), generator->untrackedExternalCount(nullptr));
-
     EXPECT_EQ(size_t(0), generator->trackedVariableCount(nullptr));
     EXPECT_EQ(size_t(0), generator->untrackedVariableCount(nullptr));
 }