Removed Terminal::getConnectionInfo() which is not necessary in C++ (…

…no notification) Signed-off-by: Sébastien LAIGRE <[email protected]>
powsybl · May 24, 2022 · 7b9e2ef · 7b9e2ef
1 parent a5cc01a
commit 7b9e2ef
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 27 deletions.
diff --git a/include/powsybl/iidm/Connectable.hpp b/include/powsybl/iidm/Connectable.hpp
@@ -67,12 +67,12 @@ class Connectable : public Identifiable {
 
     Terminal& getTerminal(unsigned long index);
 
-    void move(Terminal& oldTerminal, const std::string& oldConnectionInfo, const std::string& busId, bool connected);
+    void move(Terminal& oldTerminal, const std::string& busId, bool connected);
 
-    void move(Terminal& oldTerminal, const std::string& oldConnectionInfo, unsigned long node, const std::string& voltageLevelId);
+    void move(Terminal& oldTerminal, unsigned long node, const std::string& voltageLevelId);
 
 private:
-    void attachTerminal(Terminal& oldTerminal, const std::string& oldConnectionInfo, VoltageLevel& voltageLevel, std::unique_ptr<Terminal>&& terminal);
+    void attachTerminal(Terminal& oldTerminal, VoltageLevel& voltageLevel, std::unique_ptr<Terminal>&& terminal);
 
     friend class bus_terminal::BusBreakerViewImpl;
 

diff --git a/include/powsybl/iidm/Terminal.hpp b/include/powsybl/iidm/Terminal.hpp
@@ -62,8 +62,6 @@ class Terminal : public MultiVariantObject {
 
     stdcxx::Reference<Connectable> getConnectable();
 
-    virtual const std::string& getConnectionInfo() const = 0;
-
     double getI() const;
 
     virtual const NodeBreakerView& getNodeBreakerView() const = 0;

diff --git a/src/iidm/BusTerminal.cpp b/src/iidm/BusTerminal.cpp
@@ -75,11 +75,6 @@ BusTerminal::BusView& BusTerminal::getBusView() {
     return m_busView;
 }
 
-const std::string& BusTerminal::getConnectionInfo() const {
-    static std::string s_connectionInfo = stdcxx::format("bus %1%, %2%", getBusBreakerView().getConnectableBus().get().getId(), getBusBreakerView().getBus() ? "connected" : "disconnected");
-    return s_connectionInfo;
-}
-
 const BusTerminal::NodeBreakerView& BusTerminal::getNodeBreakerView() const {
     throw AssertionError("Not implemented");
 }

diff --git a/src/iidm/BusTerminal.hpp b/src/iidm/BusTerminal.hpp
@@ -40,8 +40,6 @@ class BusTerminal : public Terminal {
 
     BusView& getBusView() override;
 
-    const std::string& getConnectionInfo() const override;
-
     const NodeBreakerView& getNodeBreakerView() const override;
 
     NodeBreakerView& getNodeBreakerView() override;

diff --git a/src/iidm/BusTerminalViews.cpp b/src/iidm/BusTerminalViews.cpp
@@ -43,7 +43,7 @@ stdcxx::Reference<Bus> BusBreakerViewImpl::getConnectableBus() {
 }
 
 void BusBreakerViewImpl::moveConnectable(const std::string& busId, bool connected) {
-    m_terminal.getConnectable().get().move(m_terminal, m_terminal.getConnectionInfo(), busId, connected);
+    m_terminal.getConnectable().get().move(m_terminal, busId, connected);
 }
 
 void BusBreakerViewImpl::setConnectableBus(const std::string& busId) {

diff --git a/src/iidm/Connectable.cpp b/src/iidm/Connectable.cpp
@@ -35,7 +35,7 @@ Terminal& Connectable::addTerminal(std::unique_ptr<Terminal>&& terminal) {
     return *m_terminals.back();
 }
 
-void Connectable::attachTerminal(Terminal& oldTerminal, const std::string& /*oldConnectionInfo*/, VoltageLevel& voltageLevel, std::unique_ptr<Terminal>&& terminal) {
+void Connectable::attachTerminal(Terminal& oldTerminal, VoltageLevel& voltageLevel, std::unique_ptr<Terminal>&& terminal) {
     // first, attach new terminal to connectable and to voltage level of destination, to ensure that the new terminal is valid
     terminal->setConnectable(stdcxx::ref(*this));
     voltageLevel.attach(*terminal, false);
@@ -100,7 +100,7 @@ std::vector<std::reference_wrapper<Terminal> > Connectable::getTerminals() const
     return terminals;
 }
 
-void Connectable::move(Terminal& oldTerminal, const std::string& oldConnectionInfo, const std::string& busId, bool connected) {
+void Connectable::move(Terminal& oldTerminal, const std::string& busId, bool connected) {
     const auto& bus = getNetwork().getBusBreakerView().getBus(busId);
     if (!bus) {
         throw PowsyblException(stdcxx::format("Bus '%1%' not found", busId));
@@ -119,10 +119,10 @@ void Connectable::move(Terminal& oldTerminal, const std::string& oldConnectionIn
         .build();
 
     // detach the terminal from its previous voltage level
-    attachTerminal(oldTerminal, oldConnectionInfo, bus.get().getVoltageLevel(), std::move(terminalExt));
+    attachTerminal(oldTerminal, bus.get().getVoltageLevel(), std::move(terminalExt));
 }
 
-void Connectable::move(Terminal& oldTerminal, const std::string& oldConnectionInfo, unsigned long node, const std::string& voltageLevelId) {
+void Connectable::move(Terminal& oldTerminal, unsigned long node, const std::string& voltageLevelId) {
     const auto& voltageLevel = getNetwork().find<VoltageLevel>(voltageLevelId);
     if (! voltageLevel) {
         throw PowsyblException(stdcxx::format("Voltage level '%1%' not found", voltageLevelId));
@@ -140,7 +140,7 @@ void Connectable::move(Terminal& oldTerminal, const std::string& oldConnectionIn
         .build();
 
     // detach the terminal from its previous voltage level
-    attachTerminal(oldTerminal, oldConnectionInfo, voltageLevel, std::move(terminalExt));
+    attachTerminal(oldTerminal, voltageLevel, std::move(terminalExt));
 }
 
 void Connectable::reduceVariantArraySize(unsigned long number) {

diff --git a/src/iidm/NodeTerminal.cpp b/src/iidm/NodeTerminal.cpp
@@ -79,11 +79,6 @@ const stdcxx::optional<unsigned long>& NodeTerminal::getConnectedComponentNumber
     return m_connectedComponentNumber[getNetwork().getVariantIndex()];
 }
 
-const std::string& NodeTerminal::getConnectionInfo() const {
-    static std::string s_connectionInfo = stdcxx::format("bus %1%, %2%", getBusBreakerView().getConnectableBus().get().getId(), getBusBreakerView().getBus() ? "connected" : "disconnected");
-    return s_connectionInfo;
-}
-
 unsigned long NodeTerminal::getNode() const {
     return m_node;
 }

diff --git a/src/iidm/NodeTerminal.hpp b/src/iidm/NodeTerminal.hpp
@@ -38,8 +38,6 @@ class NodeTerminal : public Terminal {
 
     BusView& getBusView() override;
 
-    const std::string& getConnectionInfo() const override;
-
     const NodeBreakerView& getNodeBreakerView() const override;
 
     NodeBreakerView& getNodeBreakerView() override;

diff --git a/src/iidm/NodeTerminalViews.cpp b/src/iidm/NodeTerminalViews.cpp
@@ -45,7 +45,7 @@ stdcxx::Reference<Bus> BusBreakerViewImpl::getConnectableBus() {
 }
 
 void BusBreakerViewImpl::moveConnectable(const std::string& busId, bool connected) {
-    m_terminal.getConnectable().get().move(m_terminal, m_terminal.getConnectionInfo(), busId, connected);
+    m_terminal.getConnectable().get().move(m_terminal, busId, connected);
 }
 
 void BusBreakerViewImpl::setConnectableBus(const std::string& /*busId*/) {
@@ -89,7 +89,7 @@ unsigned long NodeBreakerViewImpl::getNode() const {
 }
 
 void NodeBreakerViewImpl::moveConnectable(unsigned long node, const std::string& voltageLevelId) {
-    m_terminal.getConnectable().get().move(m_terminal, m_terminal.getConnectionInfo(), node, voltageLevelId);
+    m_terminal.getConnectable().get().move(m_terminal, node, voltageLevelId);
 }
 
 }  // namespace node_terminal