add get_value_refs method and corresponding tests for uniqueness

Author: markaren

export/include/fmu4cpp/fmu_base.hpp

@@ -226,6 +226,8 @@ namespace fmu4cpp {
             return false;
         }
 
+        [[nodiscard]] std::vector<unsigned int> get_value_refs() const;
+
         virtual ~fmu_base() = default;
 
     protected:

export/src/fmu4cpp/fmu_base.cpp

@@ -66,31 +66,31 @@ namespace fmu4cpp {
         return indentedString;
     }
 
-    IntVariable fmu_base::integer(const std::string &name, int *ptr, const std::function<void(int)>& onChange) {
+    IntVariable fmu_base::integer(const std::string &name, int *ptr, const std::function<void(int)> &onChange) {
         return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
     }
 
     IntVariable fmu_base::integer(const std::string &name, const std::function<int()> &getter, const std::optional<std::function<void(int)>> &setter) {
         return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, getter, setter};
     }
 
-    RealVariable fmu_base::real(const std::string &name, double *ptr, const std::function<void(double)>& onChange) {
+    RealVariable fmu_base::real(const std::string &name, double *ptr, const std::function<void(double)> &onChange) {
         return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
     }
 
     RealVariable fmu_base::real(const std::string &name, const std::function<double()> &getter, const std::optional<std::function<void(double)>> &setter) {
         return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, getter, setter};
     }
 
-    BoolVariable fmu_base::boolean(const std::string &name, bool *ptr, const std::function<void(bool)>& onChange) {
+    BoolVariable fmu_base::boolean(const std::string &name, bool *ptr, const std::function<void(bool)> &onChange) {
         return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
     }
 
     BoolVariable fmu_base::boolean(const std::string &name, const std::function<bool()> &getter, const std::optional<std::function<void(bool)>> &setter) {
         return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, getter, setter};
     }
 
-    StringVariable fmu_base::string(const std::string &name, std::string *ptr, const std::function<void(std::string)>& onChange) {
+    StringVariable fmu_base::string(const std::string &name, std::string *ptr, const std::function<void(std::string)> &onChange) {
         return {name, static_cast<unsigned int>(numVariables_), ++numVariables_, ptr, onChange};
     }
 
@@ -149,6 +149,16 @@ namespace fmu4cpp {
         return std::to_string(fnv1a(ss.str()));
     }
 
+    std::vector<unsigned> fmu_base::get_value_refs() const {
+        std::vector<unsigned int> indices;
+        auto allVars = collect(integers_, reals_, booleans_, strings_);
+        indices.reserve(allVars.size());
+        for (auto v: allVars) {
+            indices.emplace_back(v->value_reference());
+        }
+
+        return indices;
+    }
 
     std::string fmu_base::make_description_v2() const {
 

export/tests/fmi2/array_test.cpp

@@ -7,6 +7,7 @@
 
 #include <cstdarg>
 #include <iostream>
+#include <unordered_set>
 
 #include <fmu4cpp/fmu_base.hpp>
 
@@ -61,6 +62,13 @@ TEST_CASE("test_array") {
     Model model({});
     const auto guid = model.guid();
 
+    auto vrs = model.get_value_refs();
+    REQUIRE(vrs.size() == 4 + 1);// 4 variables + 1 for time
+    std::unordered_set<unsigned int> unique_vrs(vrs.begin(), vrs.end());
+
+    // Check that all are unique
+    REQUIRE(unique_vrs.size() == vrs.size());
+
     std::cout << model.make_description_v2() << std::endl;
 
     fmi2CallbackFunctions callbackFunctions;

export/tests/fmi2/identity_test.cpp

@@ -6,6 +6,7 @@
 #include <catch2/catch_approx.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <cstdarg>
+#include <unordered_set>
 
 #include <fmu4cpp/fmu_base.hpp>
 
@@ -161,6 +162,14 @@ TEST_CASE("test_identity") {
     Model model({});
     const auto guid = model.guid();
 
+    auto vrs = model.get_value_refs();
+    REQUIRE(vrs.size() == 8 + 1);// 8 variables + 1 for time
+    std::unordered_set<unsigned int> unique_vrs(vrs.begin(), vrs.end());
+
+    // Check that all are unique
+    REQUIRE(unique_vrs.size() == vrs.size());
+
+
     const auto realIn = model.get_real_variable("realIn");
     const auto stringIn = model.get_string_variable("stringIn");
     const auto integerIn = model.get_int_variable("integerIn");

export/tests/fmi3/array_test.cpp

@@ -1,5 +1,4 @@
 
-#include "fmi3/fmi3Functions.h"
 #include "fmi3/fmi3Functions.h"
 
 #include <catch2/catch_approx.hpp>
@@ -8,6 +7,7 @@
 
 #include <cstdarg>
 #include <iostream>
+#include <unordered_set>
 
 #include <fmu4cpp/fmu_base.hpp>
 
@@ -57,13 +57,20 @@ TEST_CASE("test_array") {
 
     Model model({});
     const auto guid = model.guid();
-    
+
+    auto vrs = model.get_value_refs();
+    REQUIRE(vrs.size() == 4 + 1);// 4 variables + 1 for time
+    std::unordered_set<unsigned int> unique_vrs(vrs.begin(), vrs.end());
+
+    // Check that all are unique
+    REQUIRE(unique_vrs.size() == vrs.size());
+
     auto c = fmi3InstantiateCoSimulation("array", guid.c_str(), "", false, true, false, false, nullptr, 0, nullptr, fmilogger, nullptr);
     REQUIRE(c);
-    
-    REQUIRE(fmi3EnterInitializationMode(c,false, 0, 0, false, 0) == fmi3OK);
+
+    REQUIRE(fmi3EnterInitializationMode(c, false, 0, 0, false, 0) == fmi3OK);
     REQUIRE(fmi3ExitInitializationMode(c) == fmi3OK);
-    
+
 
     std::vector<double> values(4);
     for (int i = 1; i <= 4; i++) {// account for time

export/tests/fmi3/identity_test.cpp

@@ -7,6 +7,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <cstdarg>
 #include <iostream>
+#include <unordered_set>
 
 #include <fmu4cpp/fmu_base.hpp>
 
@@ -158,6 +159,13 @@ TEST_CASE("test_identity") {
     Model model({});
     const auto guid = model.guid();
 
+    auto vrs = model.get_value_refs();
+    REQUIRE(vrs.size() == 8 + 1);// 8 variables + 1 for time
+    std::unordered_set<unsigned int> unique_vrs(vrs.begin(), vrs.end());
+
+    // Check that all are unique
+    REQUIRE(unique_vrs.size() == vrs.size());
+
     const auto realIn = model.get_real_variable("realIn");
     const auto stringIn = model.get_string_variable("stringIn");
     const auto integerIn = model.get_int_variable("integerIn");