Remove read write from scalar_variable (#108)

Author: markaren

examples/multiple_fmus.cpp

@@ -33,15 +33,19 @@ int main()
     slave2->step(1E-4);
 
     double ref;
-    auto var = md1->get_variable_by_name("MotorDiskRev").as_real();
-    assert(var.valueReference() == 105);
-    var.read(*slave1, ref);
-    std::cout << "MotorDiskRev=" << ref << std::endl;
-
-    auto vr = md2->get_value_reference("Temperature_Room");
-    assert(vr == 47);
-    slave2->read_real(vr, ref);
-    std::cout << "Temperature_Room=" << ref << std::endl;
+    {
+        auto vr = md1->get_variable_by_name("MotorDiskRev").value_reference;
+        assert(vr == 105);
+        slave1->read_real(vr, ref);
+        std::cout << "MotorDiskRev=" << ref << std::endl;
+    }
+
+    {
+        auto vr = md2->get_value_reference("Temperature_Room");
+        assert(vr == 47);
+        slave2->read_real(vr, ref);
+        std::cout << "Temperature_Room=" << ref << std::endl;
+    }
 
     slave1->terminate();
     slave2->terminate();

include/fmi4cpp/fmi2/xml/typed_scalar_variable.hpp

@@ -101,9 +101,6 @@ class typed_scalar_variable
         return attribute_;
     }
 
-    virtual bool read(fmu_reader& reader, T& ref) = 0;
-
-    virtual bool write(fmu_writer& writer, T value) = 0;
 };
 
 template<typename T, typename U>
@@ -138,9 +135,6 @@ class integer_variable : public bounded_scalar_variable<int, integer_attribute>
     integer_variable(
         const scalar_variable& variable,
         const integer_attribute& attribute);
-
-    bool read(fmu_reader& reader, int& ref) override;
-    bool write(fmu_writer& writer, int value) override;
 };
 
 class real_variable : public bounded_scalar_variable<double, real_attribute>
@@ -159,9 +153,6 @@ class real_variable : public bounded_scalar_variable<double, real_attribute>
     [[nodiscard]] std::optional<unsigned int> derivative() const;
     [[nodiscard]] std::optional<std::string> unit() const;
     [[nodiscard]] std::optional<std::string> displayUnit() const;
-
-    bool read(fmu_reader& reader, double& ref) override;
-    bool write(fmu_writer& writer, double value) override;
 };
 
 
@@ -172,9 +163,6 @@ class string_variable : public typed_scalar_variable<std::string, string_attribu
     string_variable(
         const scalar_variable& variable,
         const string_attribute& attribute);
-
-    bool read(fmu_reader& reader, std::string& ref) override;
-    bool write(fmu_writer& writer, std::string value) override;
 };
 
 class boolean_variable : public typed_scalar_variable<bool, boolean_attribute>
@@ -184,9 +172,6 @@ class boolean_variable : public typed_scalar_variable<bool, boolean_attribute>
     boolean_variable(
         const scalar_variable& variable,
         const boolean_attribute& attribute);
-
-    bool read(fmu_reader& reader, bool& ref) override;
-    bool write(fmu_writer& writer, bool value) override;
 };
 
 class enumeration_variable : public typed_scalar_variable<int, enumeration_attribute>
@@ -196,9 +181,6 @@ class enumeration_variable : public typed_scalar_variable<int, enumeration_attri
     enumeration_variable(
         const scalar_variable& variable,
         const enumeration_attribute& attribute);
-
-    bool read(fmu_reader& reader, int& ref) override;
-    bool write(fmu_writer& writer, int value) override;
 };
 
 

src/fmi4cpp/fmi2/xml/scalar_variable.cpp

@@ -138,15 +138,6 @@ integer_variable::integer_variable(
     : bounded_scalar_variable(variable, attribute)
 {}
 
-bool integer_variable::read(fmu_reader& reader, int& ref)
-{
-    return reader.read_integer(valueReference(), ref);
-}
-
-bool integer_variable::write(fmu_writer& writer, int value)
-{
-    return writer.write_integer(valueReference(), value);
-}
 
 real_variable::real_variable(
     const scalar_variable& variable,
@@ -189,73 +180,27 @@ bool real_variable::reinit() const
     return attribute_.reinit;
 }
 
-bool real_variable::read(fmu_reader& reader, double& ref)
-{
-    return reader.read_real(valueReference(), ref);
-}
-
-bool real_variable::write(fmu_writer& writer, double value)
-{
-    return writer.write_real(valueReference(), value);
-}
-
 
 string_variable::string_variable(
     const scalar_variable& variable,
     const string_attribute& attribute)
     : typed_scalar_variable(variable, attribute)
 {}
 
-bool string_variable::read(fmu_reader& reader, std::string& ref)
-{
-    fmi2String str;
-    auto status = reader.read_string(valueReference(), str);
-    ref = str;
-    return status;
-}
-
-bool string_variable::write(fmu_writer& writer, std::string value)
-{
-    return writer.write_string(valueReference(), value.c_str());
-}
-
 
 boolean_variable::boolean_variable(
     const scalar_variable& variable,
     const boolean_attribute& attribute)
     : typed_scalar_variable(variable, attribute)
 {}
 
-bool boolean_variable::read(fmu_reader& reader, bool& ref)
-{
-    fmi2Boolean _ref;
-    auto status = reader.read_boolean(valueReference(), _ref);
-    ref = _ref != 0;
-    return status;
-}
-
-bool boolean_variable::write(fmu_writer& writer, bool value)
-{
-    return writer.write_boolean(valueReference(), value);
-}
-
 
 enumeration_variable::enumeration_variable(
     const scalar_variable& variable,
     const enumeration_attribute& attribute)
     : typed_scalar_variable(variable, attribute)
 {}
 
-bool enumeration_variable::read(fmu_reader& reader, int& ref)
-{
-    return reader.read_integer(valueReference(), ref);
-}
-
-bool enumeration_variable::write(fmu_writer& writer, int value)
-{
-    return writer.write_integer(valueReference(), value);
-}
-
 
 integer_attribute::integer_attribute(const bounded_scalar_variable_attribute<int>& attributes)
     : bounded_scalar_variable_attribute<int>(attributes)