Fix connection geometry for connections from end to start (#930)

Author: lochel

src/OMSimulatorLib/Connection.cpp

@@ -139,12 +139,12 @@ oms_status_enu_t oms::Connection::exportToSSD(pugi::xml_node &root) const
   return oms_status_ok;
 }
 
-void oms::Connection::setGeometry(const oms::ssd::ConnectionGeometry* newGeometry)
+void oms::Connection::setGeometry(const oms::ssd::ConnectionGeometry* newGeometry, bool inverse)
 {
   oms::ssd::ConnectionGeometry* geometry_ = reinterpret_cast<oms::ssd::ConnectionGeometry*>(this->geometry);
   if (geometry_)
     delete geometry_;
-  geometry_ = new oms::ssd::ConnectionGeometry(*newGeometry);
+  geometry_ = new oms::ssd::ConnectionGeometry(*newGeometry, inverse);
   this->geometry = reinterpret_cast<ssd_connection_geometry_t*>(geometry_);
 }
 
@@ -171,6 +171,11 @@ void oms::Connection::setTLMParameters(double delay, double alpha, double linear
   tlmparameters->angularimpedance = angualrimpedance;
 }
 
+bool oms::Connection::isStrictEqual(const oms::ComRef& signalA, const oms::ComRef& signalB) const
+{
+  return signalA == oms::ComRef(this->conA) && signalB == oms::ComRef(this->conB);
+}
+
 bool oms::Connection::isEqual(const oms::ComRef& signalA, const oms::ComRef& signalB) const
 {
   return (signalA == oms::ComRef(this->conA) && signalB == oms::ComRef(this->conB)) || (signalA == oms::ComRef(this->conB) && signalB == oms::ComRef(this->conA));

src/OMSimulatorLib/Connection.h

@@ -60,15 +60,16 @@ namespace oms
     const oms::ComRef getSignalB() const {return oms::ComRef(conB);}
 
     const oms::ssd::ConnectionGeometry* getGeometry() const {return reinterpret_cast<oms::ssd::ConnectionGeometry*>(geometry);}
-    void setGeometry(const oms::ssd::ConnectionGeometry* newGeometry);
+    void setGeometry(const oms::ssd::ConnectionGeometry* newGeometry, bool inverse=false);
     void setTLMParameters(const oms_tlm_connection_parameters_t* parameters);
     void setTLMParameters(double delay, double alpha, double linearimpedance, double angualrimpedance);
     oms_tlm_connection_parameters_t* getTLMParameters() const {return tlmparameters;}
 
     oms_connection_type_enu_t getType() const {return type;}
 
     bool isEqual(const oms::Connection& connection) const;
-    bool isEqual(const oms::ComRef& signalA, const oms::ComRef& signalB) const;
+    bool isEqual(const oms::ComRef& signalA, const oms::ComRef& signalB) const; ///< "A->B" and "B->A" are treated the same
+    bool isStrictEqual(const oms::ComRef& signalA, const oms::ComRef& signalB) const; ///< "A->B" is not strict equal "B->A"
     bool containsSignal(const oms::ComRef& signal) const;
     bool containsSignalB(const oms::ComRef& signal) const;
 

src/OMSimulatorLib/System.cpp

@@ -1452,7 +1452,8 @@ oms_status_enu_t oms::System::setConnectionGeometry(const oms::ComRef& crefA, co
   for (auto& connection : connections)
     if (connection && connection->isEqual(crefA, crefB))
     {
-      connection->setGeometry(geometry);
+      bool inverse = connection->isStrictEqual(crefB, crefA);
+      connection->setGeometry(geometry, inverse);
       return oms_status_ok;
     }
 

src/OMSimulatorLib/Util.h

@@ -77,4 +77,16 @@ static inline bool almostEqualRelativeAndAbs(double a, double b, double reltol=D
   return false;
 }
 
+template <class T>
+void reverseArray(T* array, unsigned int length)
+{
+  T tmp;
+  for (unsigned int start = 0, end = length-1; start < end; start++, end--)
+  {
+    tmp = array[start];
+    array[start] = array[end];
+    array[end] = tmp;
+  }
+}
+
 #endif

src/OMSimulatorLib/ssd/ConnectionGeometry.cpp

@@ -33,6 +33,7 @@
 
 #include "../Logging.h"
 #include "Tags.h"
+#include "Util.h"
 
 #include <string.h>
 #include <sstream>
@@ -47,7 +48,7 @@ oms::ssd::ConnectionGeometry::ConnectionGeometry()
   this->n = 0;
 }
 
-oms::ssd::ConnectionGeometry::ConnectionGeometry(const oms::ssd::ConnectionGeometry& rhs)
+oms::ssd::ConnectionGeometry::ConnectionGeometry(const oms::ssd::ConnectionGeometry& rhs, bool inverse)
 {
   logTrace();
 
@@ -59,6 +60,11 @@ oms::ssd::ConnectionGeometry::ConnectionGeometry(const oms::ssd::ConnectionGeome
     this->pointsY = new double[rhs.n];
     memcpy(this->pointsX, rhs.pointsX, n*sizeof(double));
     memcpy(this->pointsY, rhs.pointsY, n*sizeof(double));
+    if (inverse)
+    {
+      reverseArray(this->pointsX, this->n);
+      reverseArray(this->pointsY, this->n);
+    }
   }
   else
   {

src/OMSimulatorLib/ssd/ConnectionGeometry.h

@@ -46,7 +46,7 @@ namespace oms
     {
     public:
       ConnectionGeometry();
-      ConnectionGeometry(const ConnectionGeometry& rhs);
+      ConnectionGeometry(const ConnectionGeometry& rhs, bool inverse=false);
       ~ConnectionGeometry();
 
       ConnectionGeometry& operator=(ConnectionGeometry const& rhs);