refactor

Author: restenb

.gitignore

@@ -9,6 +9,8 @@ cmake-build-*/
 
 # Visual Studio Code
 .vscode/
+.lsp/
+.clj-kondo
 
 
 CMakeUserPresets.json

data/xsd/OspSystemStructure.xsd

@@ -77,6 +77,7 @@
     <xs:complexType name="variableEndpoint">
         <xs:attribute name="simulator" use="required" type="xs:string"/>
         <xs:attribute name="name" use="required" type="xs:string"/>
+        <xs:attribute name="eccoparam" type="xs:string"/>
     </xs:complexType>
     <xs:complexType name="signalEndpoint">
         <xs:attribute name="function" use="required" type="xs:string"/>

include/cosim/system_structure.hpp

@@ -133,6 +133,18 @@ inline std::ostream& operator<<(std::ostream& s, const full_variable_name& v)
     return s;
 }
 
+/// Writes a `power_bond` to an output stream.
+/*
+inline std::ostream& operator<<(std::ostream& s, const power_bond& pb)
+{
+    s << "u_a: " << pb.u_a << std::endl
+      << "u_b: " << pb.u_b << std::endl
+      << "y_a: " << pb.y_a << std::endl
+      << "y_b: " << pb.y_b << std::endl;
+    return s;
+}
+*/
+
 /// Returns a string representation of a `full_variable_name`.
 std::string to_text(const full_variable_name& v);
 
@@ -213,8 +225,45 @@ class system_structure
         full_variable_name target;
     };
 
+    /// Information about a powerbond connection. For use with the ecco algorithm only.
+    struct power_bond
+    {
+        /// The u_a variable in the bond, according to the description of the ecco algorithm.
+        full_variable_name u_a{"", ""};
+
+        /// The u_b variable in the bond, according to the description of the ecco algorithm.
+        full_variable_name u_b{"", ""};
+
+        /// The y_a variable in the bond, according to the description of the ecco algorithm.
+        full_variable_name y_a{"", ""};
+
+        /// The y_b variable in the bond, according to the description of the ecco algorithm.
+        full_variable_name y_b{"", ""};
+
+        void set_ua(full_variable_name& ua)
+        {
+            u_a = ua;
+        }
+
+        void set_ub(full_variable_name& ub)
+        {
+            u_b = ub;
+        }
+
+        void set_ya(full_variable_name& ya)
+        {
+            y_a = ya;
+        }
+
+        void set_yb(full_variable_name& yb)
+        {
+            y_b = yb;
+        }
+    };
+
 private:
     using entity_map = std::unordered_map<std::string, entity>;
+    using power_bond_map = std::unordered_map<std::string, power_bond>;
     using connection_map =
         std::unordered_map<full_variable_name, full_variable_name>;
     using connection_transform =
@@ -251,6 +300,9 @@ class system_structure
         add_entity({std::string(name), type, {}, std::move(parameters)});
     }
 
+    power_bond_map get_power_bonds();
+    void add_power_bond(std::string name, power_bond pb);
+
     /**
      *  Returns a list of the entities in the system.
      *
@@ -328,6 +380,8 @@ class system_structure
     // Connections. Target is key, source is value.
     connection_map connections_;
 
+    power_bond_map powerBonds_;
+
     // Cache for fast lookup of model info, indexed by model UUID.
     struct model_info
     {

src/cosim/algorithm/ecco_algorithm.cpp

@@ -286,22 +286,22 @@ class ecco_algorithm::impl
 
         const auto dt = to_double_duration(stepSize, currentTime);
 
-        for (std::size_t i = 0; i < uVariables_.size(); i+=2) {
+        for (std::size_t i = 0; i < uVariables_.size(); i += 2) {
             auto u_a = uVariables_.at(i);
-            auto u_b = uVariables_.at(i+1);
+            auto u_b = uVariables_.at(i + 1);
             auto y_a = yVariables_.at(i);
-            auto y_b = yVariables_.at(i+1);
+            auto y_b = yVariables_.at(i + 1);
 
             double u_a_value = simulators_.at(u_a.simulator).sim->get_real(u_a.reference);
             double u_b_value = simulators_.at(u_b.simulator).sim->get_real(u_b.reference);
             double y_a_value = simulators_.at(y_a.simulator).sim->get_real(y_a.reference);
             double y_b_value = simulators_.at(y_b.simulator).sim->get_real(y_b.reference);
 
             double power_a = u_a_value * y_a_value;
-            energies_.at(i).push_back(power_a*dt);
+            energies_.at(i).push_back(power_a * dt);
 
             double power_b = u_b_value * y_b_value;
-            energies_.at(i+1).push_back(power_b*dt);
+            energies_.at(i + 1).push_back(power_b * dt);
 
             double power_residual = std::abs(power_a - power_b);
 
@@ -320,7 +320,7 @@ class ecco_algorithm::impl
             mean_square += std::pow(energy_residual / (params.abs_tolerance + params.rel_tolerance * energy_level), 2);
         }
         const auto num_bonds = power_residuals.size(); // TODO: Still valid for multidimensial bonds?
-        const auto error_estimate = std::sqrt(mean_square / (double) num_bonds);
+        const auto error_estimate = std::sqrt(mean_square / (double)num_bonds);
 
         // std::cout << power_a << " " << power_b << " " << energy_level << " " << energy_residual << " " << sum_power_residual << " " << error_estimate << std::endl;
         if (prev_error_estimate_ == 0 || error_estimate == 0) {
@@ -355,13 +355,14 @@ class ecco_algorithm::impl
     std::vector<cosim::variable_id> yVariables_{};
     std::vector<std::vector<double>> energies_{};
 
-    double get_mean(const std::vector<double>& elems) {
+    double get_mean(const std::vector<double>& elems)
+    {
         if (elems.empty()) return 0.0;
         double sum{};
         for (auto elem : elems) {
             sum += elem;
         }
-        return sum / (double) elems.size();
+        return sum / (double)elems.size();
     }
 
     struct connection_ss
@@ -546,7 +547,8 @@ ecco_algorithm::ecco_algorithm(ecco_parameters params, std::optional<unsigned in
 }
 
 
-ecco_algorithm::~ecco_algorithm() noexcept {
+ecco_algorithm::~ecco_algorithm() noexcept
+{
     pimpl_->print_average_energies();
 }