Merge branch 'master' into examples

Author: markaren

export/include/fmu4cpp/fmu_base.hpp

@@ -131,6 +131,8 @@ namespace fmu4cpp {
         void get_boolean(const unsigned int vr[], size_t nvr, bool value[]) const;
 
         void get_string(const unsigned int vr[], size_t nvr, const char *value[]);
+        void get_binary(const unsigned int vr[], size_t nvr, size_t valueSizes[], const uint8_t *values[]);
+
         void set_integer(const unsigned int vr[], size_t nvr, const int value[]);
         void set_real(const unsigned int vr[], size_t nvr, const double value[]);
 
@@ -228,7 +230,7 @@ namespace fmu4cpp {
         std::unordered_map<unsigned int, size_t> vrToStringIndices_;
 
         std::vector<BinaryVariable> binary_;
-        std::vector<std::string> binaryBuffer_;
+        std::vector<std::vector<uint8_t>> binaryBuffer_;
         std::unordered_map<unsigned int, size_t> vrToBinaryIndices_;
 
         std::function<void *(void *)> get_state_ptr_{nullptr};

export/src/fmu4cpp/fmi3/fmi3.cpp

@@ -517,16 +517,26 @@ fmi3Status fmi3SetString(
 }
 
 fmi3Status fmi3GetBinary(fmi3Instance c,
-                         const fmi3ValueReference valueReferences[],
+                         const fmi3ValueReference vr[],
                          size_t nvr,
                          size_t valueSizes[],
                          fmi3Binary values[],
                          size_t nValues) {
 
     const auto component = static_cast<Fmi3Component *>(c);
 
-    component->logger->log(fmiError, "Unsupported function fmi3GetBinary");
-    return fmi3Error;
+    try {
+        component->slave->get_binary(vr, nvr, valueSizes, values);
+        return fmi3OK;
+    } catch (const fmu4cpp::fatal_error &ex) {
+        component->logger->log(fmiFatal, ex.what());
+        component->state = Fmi3Component::State::Invalid;
+        return fmi3Fatal;
+    } catch (const std::exception &ex) {
+        component->logger->log(fmiError, ex.what());
+        component->state = Fmi3Component::State::Terminated;
+        return fmi3Error;
+    }
 }
 
 fmi3Status fmi3SetBinary(fmi3Instance c,

export/src/fmu4cpp/fmu_base.cpp

@@ -106,43 +106,61 @@ void fmu_base::get_integer(const unsigned int vr[], size_t nvr, int value[]) con
         value[i] = integers_[idx].get();
     }
 }
+
 void fmu_base::get_real(const unsigned int vr[], size_t nvr, double value[]) const {
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];
         const auto idx = vrToRealIndices_.at(ref);
         value[i] = reals_[idx].get();
     }
 }
+
 void fmu_base::get_boolean(const unsigned int vr[], size_t nvr, int value[]) const {
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];
         const auto idx = vrToBooleanIndices_.at(ref);
         value[i] = static_cast<int>(booleans_[idx].get());
     }
 }
+
 void fmu_base::get_boolean(const unsigned int vr[], size_t nvr, bool value[]) const {
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];
         const auto idx = vrToBooleanIndices_.at(ref);
         value[i] = booleans_[idx].get();
     }
 }
+
 void fmu_base::get_string(const unsigned int vr[], size_t nvr, const char *value[]) {
     stringBuffer_.clear();
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];
         const auto idx = vrToStringIndices_.at(ref);
-        stringBuffer_.push_back(strings_[idx].get());
+        stringBuffer_.emplace_back(strings_[idx].get());
         value[i] = stringBuffer_.back().c_str();
     }
 }
+
+void fmu_base::get_binary(const unsigned int vr[], size_t nvr, size_t valueSizes[], const uint8_t *values[]) {
+    binaryBuffer_.clear();
+    for (auto i = 0; i < nvr; i++) {
+        const auto ref = vr[i];
+        const auto idx = vrToBinaryIndices_.at(ref);
+        const auto &data = binary_[idx].get();
+        valueSizes[i] = data.size();
+        binaryBuffer_.emplace_back(data.begin(), data.end());
+        values[i] = binaryBuffer_.back().data();
+    }
+}
+
 void fmu_base::set_integer(const unsigned int vr[], size_t nvr, const int value[]) {
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];
         const auto idx = vrToIntegerIndices_.at(ref);
         integers_[idx].set(value[i]);
     }
 }
+
 void fmu_base::set_real(const unsigned int vr[], size_t nvr, const double value[]) {
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];
@@ -164,17 +182,16 @@ void fmu_base::set_boolean(const unsigned int vr[], size_t nvr, const bool value
         booleans_[idx].set(value[i]);
     }
 }
+
 void fmu_base::set_string(const unsigned int vr[], size_t nvr, const char *const value[]) {
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];
         const auto idx = vrToStringIndices_.at(ref);
         strings_[idx].set(value[i]);
     }
 }
+
 void fmu_base::set_binary(const unsigned int vr[], size_t nvr, const size_t valueSizes[], const uint8_t *const value[]) {
-#ifdef FMI2
-    static_assert("set_binary not available for FMI2");
-#endif
 
     for (unsigned i = 0; i < nvr; i++) {
         const auto ref = vr[i];