wip

Ecos-platform · Jun 28, 2023 · f93f0c5 · f93f0c5
1 parent 84ec6cd
commit f93f0c5
Show file tree

Hide file tree

Showing 22 changed files with 205 additions and 255 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,6 +25,8 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
+set(generatedSourcesDir "${CMAKE_BINARY_DIR}/generated")
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     set(CMAKE_CXX_FLAGS_RELEASE "/O2")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -47,6 +49,7 @@ find_package(spdlog CONFIG REQUIRED)
 find_package(libzip CONFIG REQUIRED)
 find_package(pugixml CONFIG REQUIRED)
 find_package(Thrift CONFIG REQUIRED)
+find_package(CLI11 CONFIG REQUIRED)
 
 # ==============================================================================
 # Targets
@@ -57,6 +60,7 @@ if (ECOS_BUILD_CLI OR ECOS_BUILD_TESTS)
 endif()
 
 add_subdirectory(src)
+add_subdirectory(tool)
 
 if (ECOS_BUILD_CLI)
 
@@ -65,7 +69,6 @@ if (ECOS_BUILD_CLI)
             GIT_REPOSITORY https://github.com/CLIUtils/CLI11
             GIT_TAG        v2.2.0
     )
-
     FetchContent_MakeAvailable(cli11)
 
     add_subdirectory(cli)
@@ -84,7 +87,6 @@ if (ECOS_BUILD_EXAMPLES OR ECOS_BUILD_TESTS)
                 GIT_REPOSITORY https://github.com/catchorg/Catch2.git
                 GIT_TAG v2.13.8
         )
-
         FetchContent_MakeAvailable(Catch2)
 
         enable_testing()

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(publicHeaderDir ${CMAKE_SOURCE_DIR}/include)
-set(generatedSourcesDir "${CMAKE_BINARY_DIR}/generated")
+set(publicHeaderDir ${PROJECT_SOURCE_DIR}/include)
 
 add_subdirectory(proxyfmu)
 
@@ -41,6 +40,8 @@ set(privateHeaders
         "ecos/fmi/fmi_model.hpp"
         "ecos/fmi/fmi_model_instance.hpp"
         "ecos/fmi/fmi_model_sub_resolver.hpp"
+        "ecos/fmi/proxy/proxy_fmu.hpp"
+        "ecos/fmi/proxy/proxy_slave.hpp"
         "ecos/fmi/proxy/proxy_model.hpp"
         "ecos/fmi/proxy/proxy_model_sub_resolver.hpp"
 
@@ -52,10 +53,6 @@ set(privateHeaders
         "ecos/fmi/fmi2/fmi2_slave.hpp"
         "ecos/fmi/fmi2/fmi2_model_description.hpp"
 
-#        "ecos/proxyfmu/process_helper.hpp"
-#        "ecos/proxyfmu/remote_info.hpp"
-#        "ecos/proxyfmu/client/proxy_slave.hpp"
-
         "ecos/ssp/ssp.hpp"
 
         "ecos/util/temp_dir.hpp"
@@ -68,20 +65,13 @@ set(sources
 
         "ecos/logger.cpp"
         "ecos/model_resolver.cpp"
-        "ecos/scenario/scenario.cpp"
-        "ecos/scenario/scenario_loader_xml.cpp"
         "ecos/simulation.cpp"
         "ecos/simulation_runner.cpp"
+
+        "ecos/scenario/scenario.cpp"
+        "ecos/scenario/scenario_loader_xml.cpp"
+
         "ecos/algorithm/fixed_step_algorithm.cpp"
-        "ecos/fmi/fmi_model_sub_resolver.cpp"
-        "ecos/fmi/proxy/proxy_model_sub_resolver.cpp"
-        "ecos/listeners/csv_writer.cpp"
-        "ecos/listeners/simulation_listener.cpp"
-        "ecos/ssp/ssp_loader.cpp"
-        "ecos/structure/simulation_structure.cpp"
-        "ecos/util/temp_dir.cpp"
-        "ecos/util/unzipper.cpp"
-        "ecos/util/uuid.cpp"
 
         "ecos/fmi/fmu.cpp"
         "ecos/fmi/fmi1/fmi1_fmu.cpp"
@@ -90,11 +80,23 @@ set(sources
         "ecos/fmi/fmi2/fmi2_fmu.cpp"
         "ecos/fmi/fmi2/fmi2_slave.cpp"
         "ecos/fmi/fmi2/fmi2_model_description.cpp"
+        "ecos/fmi/fmi_model_sub_resolver.cpp"
 
-#        "ecos/proxyfmu/client/proxy_fmu.cpp"
-#        "ecos/proxyfmu/client/proxy_slave.cpp"
+        "ecos/fmi/proxy/proxy_model_sub_resolver.cpp"
+        "ecos/fmi/proxy/proxy_fmu.cpp"
+        "ecos/fmi/proxy/proxy_slave.cpp"
+
+        "ecos/listeners/csv_writer.cpp"
+        "ecos/listeners/simulation_listener.cpp"
 
         "ecos/ssp/ssp.cpp"
+        "ecos/ssp/ssp_loader.cpp"
+
+        "ecos/structure/simulation_structure.cpp"
+
+        "ecos/util/temp_dir.cpp"
+        "ecos/util/unzipper.cpp"
+        "ecos/util/uuid.cpp"
 
         )
 
@@ -114,14 +116,15 @@ target_include_directories(libecos
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>"
         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
         PRIVATE
+        "${generatedSourcesDir}"
         "${SUBPROCESS_INCLUDE_DIR}"
         "${CMAKE_CURRENT_SOURCE_DIR}"
         )
 target_link_libraries(libecos
         PUBLIC
         fmt::fmt
         PRIVATE
-#        thrift::thrift
+        thrift::thrift
         pugixml::pugixml
         libzip::zip
         spdlog::spdlog)

diff --git a/src/ecos/fmi/fmi2/fmi2_model_description.cpp b/src/ecos/fmi/fmi2/fmi2_model_description.cpp
@@ -1,6 +1,8 @@
 
 #include "fmi2_model_description.hpp"
 
+using namespace ecos;
+
 namespace
 {
 
@@ -54,7 +56,7 @@ std::optional<fmi::scalar_variable> to_scalar_variable(fmi2_import_variable_t* v
 
 } // namespace
 
-namespace fmi
+namespace ecos::fmi
 {
 
 model_description create_model_description(fmi2_import_t* handle)

diff --git a/src/ecos/fmi/fmu.cpp b/src/ecos/fmi/fmu.cpp
@@ -6,18 +6,18 @@
 
 using namespace ecos;
 
-std::unique_ptr<fmu> loadFmu(const std::filesystem::path& fmuPath, bool fmiLogging)
+std::unique_ptr<fmi::fmu> loadFmu(const std::filesystem::path& fmuPath, bool fmiLogging)
 {
-    auto ctx = std::make_unique<fmicontext>(fmiLogging);
+    auto ctx = std::make_unique<fmi::fmicontext>(fmiLogging);
 
-    const std::string fmuName = filesystem::path(fmuPath).stem().string();
+    const std::string fmuName = std::filesystem::path(fmuPath).stem().string();
     auto tmp = std::make_shared<temp_dir>(fmuName);
 
     fmi_version_enu_t version = fmi_import_get_fmi_version(ctx->ctx_, fmuPath.string().c_str(), tmp->path().string().c_str());
     if (version == fmi_version_1_enu) {
-        return std::make_unique<fmi1_fmu>(std::move(ctx), tmp, fmiLogging);
+        return std::make_unique<fmi::fmi1_fmu>(std::move(ctx), tmp, fmiLogging);
     } else if (version == fmi_version_2_0_enu) {
-        return std::make_unique<fmi2_fmu>(std::move(ctx), tmp, fmiLogging);
+        return std::make_unique<fmi::fmi2_fmu>(std::move(ctx), tmp, fmiLogging);
     } else {
         // TODO
     }

diff --git a/src/proxyfmu/process_helper.hpp → src/ecos/fmi/proxy/process_helper.hpp b/src/proxyfmu/process_helper.hpp → src/ecos/fmi/proxy/process_helper.hpp
diff --git a/src/proxyfmu/client/proxy_fmu.cpp → src/ecos/fmi/proxy/proxy_fmu.cpp b/src/proxyfmu/client/proxy_fmu.cpp → src/ecos/fmi/proxy/proxy_fmu.cpp
@@ -1,8 +1,8 @@
 
-#include "proxy_slave.hpp"
-
 #include "proxy_fmu.hpp"
 
+#include "proxy_slave.hpp"
+
 #include "ecos/fmi/fmu.hpp"
 
 #include <memory>
@@ -15,19 +15,19 @@ namespace ecos::proxyfmu
 proxy_fmu::proxy_fmu(const std::filesystem::path& fmuPath, std::optional<remote_info> remote)
     : fmuPath_(fmuPath)
     , remote_(std::move(remote))
-    , modelDescription_(fmilibcpp::loadFmu(fmuPath)->get_model_description())
+    , modelDescription_(fmi::loadFmu(fmuPath)->get_model_description())
 {
-    if (!exists(fmuPath)) throw std::runtime_error("No such file: " + filesystem::absolute(fmuPath).string() + "!");
+    if (!exists(fmuPath)) throw std::runtime_error("No such file: " + std::filesystem::absolute(fmuPath).string() + "!");
 }
 
-const fmilibcpp::model_description& proxy_fmu::get_model_description() const
+const fmi::model_description& proxy_fmu::get_model_description() const
 {
     return modelDescription_;
 }
 
-std::unique_ptr<fmilibcpp::slave> proxy_fmu::new_instance(const std::string& instanceName)
+std::unique_ptr<fmi::slave> proxy_fmu::new_instance(const std::string& instanceName)
 {
     return std::make_unique<proxy_slave>(fmuPath_, instanceName, modelDescription_, remote_);
 }
 
-} // namespace proxyfmu::client
+} // namespace ecos::proxyfmu
diff --git a/src/ecos/fmi/proxy/proxy_fmu.hpp b/src/ecos/fmi/proxy/proxy_fmu.hpp
@@ -0,0 +1,38 @@
+
+#ifndef PROXY_PROXY_FMU_FMU_HPP
+#define PROXY_PROXY_FMU_FMU_HPP
+
+#include "remote_info.hpp"
+
+#include "ecos/fmi/fmu.hpp"
+#include "ecos/fmi/model_description.hpp"
+#include "ecos/fmi/slave.hpp"
+
+#include <optional>
+
+namespace ecos::proxyfmu
+{
+
+class proxy_fmu : public fmi::fmu
+{
+
+private:
+    const std::filesystem::path fmuPath_;
+    const fmi::model_description modelDescription_;
+
+    const std::optional<remote_info> remote_;
+
+public:
+    explicit proxy_fmu(const std::filesystem::path& fmuPath, std::optional<remote_info> remote = std::nullopt);
+
+    [[nodiscard]] const fmi::model_description& get_model_description() const override;
+
+    std::unique_ptr<fmi::slave> new_instance(const std::string& instanceName) override;
+
+    ~proxy_fmu() override = default;
+};
+
+} // namespace proxyfmu::client
+
+
+#endif // PROXY_PROXY_FMU_FMU_HPP
diff --git a/src/ecos/fmi/proxy/proxy_model.hpp b/src/ecos/fmi/proxy/proxy_model.hpp
@@ -2,7 +2,7 @@
 #ifndef ECOS_PROXY_MODEL_HPP
 #define ECOS_PROXY_MODEL_HPP
 
-#include "proxyfmu/client/proxy_fmu.hpp"
+#include "proxy_fmu.hpp"
 
 #include "ecos/fmi/fmi_model_instance.hpp"
 #include "ecos/model.hpp"
@@ -26,7 +26,7 @@ class proxy_model : public model
     }
 
 private:
-    proxyfmu::client::proxy_fmu fmu_;
+    proxyfmu::proxy_fmu fmu_;
 };
 
 } // namespace ecos