refactor

Author: markaren

export/examples/BouncingBall/bouncing_ball.cpp

@@ -10,7 +10,7 @@ using namespace fmu4cpp;
 class BouncingBall : public fmu_base {
 
 public:
-    explicit BouncingBall(const fmu_data &data) : fmu_base(data) {
+    FMU4CPP_CTOR(BouncingBall) {
 
         register_variable(
                 real(

export/examples/Resource/resource.cpp

@@ -10,7 +10,7 @@ using namespace fmu4cpp;
 class Resource : public fmu_base {
 
 public:
-    explicit Resource(const fmu_data &data) : fmu_base(data) {
+    FMU4CPP_CTOR(Resource) {
 
         std::ifstream ifs(resourceLocation() / "file.txt");
 

export/examples/SimplePendulum/simple_pendulum.cpp

@@ -10,7 +10,7 @@ constexpr double pi = 3.14159265358979323846;
 class SimplePendulum : public fmu_base {
 
 public:
-    explicit SimplePendulum(const fmu_data &data) : fmu_base(data) {
+    FMU4CPP_CTOR(SimplePendulum) {
 
         register_variable(real("angle", &angle_)
                                   .setCausality(causality_t::OUTPUT)

export/include/fmu4cpp/fmu_base.hpp

@@ -16,10 +16,6 @@
 
 #include <filesystem>
 
-#define FMU4CPP_INSTANTIATE(MODELCLASS)                                                         \
-    std::unique_ptr<fmu4cpp::fmu_base> fmu4cpp::createInstance(const fmu4cpp::fmu_data &data) { \
-        return std::make_unique<MODELCLASS>(data);                                              \
-    }
 
 namespace fmu4cpp {
 
@@ -290,6 +286,15 @@ namespace fmu4cpp {
         std::unordered_map<unsigned int, size_t> vrToStringIndices_;
     };
 
+
+#define FMU4CPP_INSTANTIATE(MODELCLASS)                                                         \
+    std::unique_ptr<fmu4cpp::fmu_base> fmu4cpp::createInstance(const fmu4cpp::fmu_data &data) { \
+        return std::make_unique<MODELCLASS>(data);                                              \
+    }
+
+#define FMU4CPP_CTOR(MODELCLASS) \
+    explicit MODELCLASS(fmu4cpp::fmu_data data) : fmu_base(std::move(data))
+
     model_info get_model_info();
 
     std::unique_ptr<fmu_base> createInstance(const fmu_data &data);

export/tests/fmi2/array_test.cpp

@@ -14,8 +14,7 @@
 class Model : public fmu4cpp::fmu_base {
 
 public:
-    explicit Model(const fmu4cpp::fmu_data &data)
-        : fmu_base(data), reals_(4) {
+    FMU4CPP_CTOR(Model), reals_(4) {
 
         for (int i = 0; i < reals_.size(); i++) {
             register_variable(

export/tests/fmi2/identity_test.cpp

@@ -13,7 +13,7 @@
 class Model : public fmu4cpp::fmu_base {
 
 public:
-    explicit Model(const fmu4cpp::fmu_data &data) : fmu_base(data) {
+    FMU4CPP_CTOR(Model) {
 
         register_variable(integer("integerIn", &integer_)
                                   .setCausality(fmu4cpp::causality_t::INPUT)

export/tests/fmi3/array_test.cpp

@@ -14,8 +14,7 @@
 class Model : public fmu4cpp::fmu_base {
 
 public:
-    explicit Model(const fmu4cpp::fmu_data &data)
-        : fmu_base(data), reals_(4) {
+    FMU4CPP_CTOR(Model), reals_(4) {
 
         for (int i = 0; i < reals_.size(); i++) {
             register_variable(

export/tests/fmi3/identity_test.cpp

@@ -14,7 +14,7 @@
 class Model : public fmu4cpp::fmu_base {
 
 public:
-    explicit Model(const fmu4cpp::fmu_data &data) : fmu_base(data) {
+    FMU4CPP_CTOR(Model) {
 
         register_variable(integer("integerIn", &integer_)
                                   .setCausality(fmu4cpp::causality_t::INPUT)