Use (+) for max plus operator instead of i=unicode not displayed corr…

…ectly by dear #11
Lecrapouille · Jan 9, 2024 · 8174a53 · 8174a53
1 parent 24a66fc
commit 8174a53
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/src/Editor/PetriEditor.cpp b/src/Editor/PetriEditor.cpp
@@ -422,7 +422,7 @@ void Editor::showDynamicLinearSystem() const
         SparseMatrix<double> B; SparseMatrix<double> C;
         toSysLin(m_net, D, A, B, C);
         SparseMatrix<double>::display_for_julia = false;
-        ImGui::Text(u8"%s", "X(n) = D . X(n) ⨁ A . X(n-1) ⨁ B . U(n)\nY(n) = C . X(n)");
+        ImGui::Text(u8"%s", "X(n) = D . X(n) (+) A . X(n-1) (+) B . U(n)\nY(n) = C . X(n)");
         ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_None;
         if (ImGui::BeginTabBar("syslin", tab_bar_flags))
         {

diff --git a/src/Net/Algorithms.cpp b/src/Net/Algorithms.cpp
@@ -358,9 +358,9 @@ std::stringstream showCounterEquation(Net const& net, std::string const& comment
                 {
                     ss << "(t)";
                 }
-                separator2 = (minplus_notation ? " ⨁ " : ", ");
+                separator2 = (minplus_notation ? " (+) " : ", ");
             }
-            separator1 = (minplus_notation ? " ⨁ " : ", ");
+            separator1 = (minplus_notation ? " (+) " : ", ");
         }
         ss << (minplus_notation ? "" : ")") << std::endl;
     }
@@ -403,9 +403,9 @@ std::stringstream showDaterEquation(Net const& net, std::string const& comment,
                 }
                 ss << ")";
 
-                separator2 = (maxplus_notation ? " ⨁ " : ", ");
+                separator2 = (maxplus_notation ? " (+) " : ", ");
             }
-            separator1 = (maxplus_notation ? " ⨁ " : ", ");
+            separator1 = (maxplus_notation ? " (+) " : ", ");
         }
         ss << (maxplus_notation ? "" : ")") << std::endl;
     }

diff --git a/tests/EventGraphTests.cpp b/tests/EventGraphTests.cpp
@@ -208,18 +208,18 @@ TEST(TestEventGraph, TestToDaterEquation)
     // --
     expected.str(
         "# Timed event graph represented as dater equation (max-plus algebra):\n"
-        "# T1(n) = 1 T0(n) ⨁ 1 T2(n - 1) ⨁ 1 T1(n - 2)\n"
-        "# T2(n) = 1 T1(n - 1) ⨁ 2 T0(n)\n"
-        "# T3(n) = T1(n) ⨁ T2(n)\n");
+        "# T1(n) = 1 T0(n) (+) 1 T2(n - 1) (+) 1 T1(n - 2)\n"
+        "# T2(n) = 1 T1(n - 1) (+) 2 T0(n)\n"
+        "# T3(n) = T1(n) (+) T2(n)\n");
     obtained = showDaterEquation(net, "# ", false, true);
     ASSERT_STREQ(obtained.str().c_str(), expected.str().c_str());
 
     // --
     expected.str(
         "# Timed event graph represented as dater equation (max-plus algebra):\n"
-        "# x1(n) = 1 u(n) ⨁ 1 x2(n - 1) ⨁ 1 x1(n - 2)\n"
-        "# x2(n) = 1 x1(n - 1) ⨁ 2 u(n)\n"
-        "# y(n) = x1(n) ⨁ x2(n)\n");
+        "# x1(n) = 1 u(n) (+) 1 x2(n - 1) (+) 1 x1(n - 2)\n"
+        "# x2(n) = 1 x1(n - 1) (+) 2 u(n)\n"
+        "# y(n) = x1(n) (+) x2(n)\n");
     obtained = showDaterEquation(net, "# ", true, true);
     ASSERT_STREQ(obtained.str().c_str(), expected.str().c_str());
 }
@@ -258,18 +258,18 @@ TEST(TestEventGraph, TestToCounterEquation)
     // --
     expected.str(
         "# Timed event graph represented as counter equation (min-plus algebra):\n"
-        "# T1(t) = T0(t - 1) ⨁ 1 T2(t - 1) ⨁ 2 T1(t - 1)\n"
-        "# T2(t) = 1 T1(t - 1) ⨁ T0(t - 2)\n"
-        "# T3(t) = T1(t) ⨁ T2(t)\n");
+        "# T1(t) = T0(t - 1) (+) 1 T2(t - 1) (+) 2 T1(t - 1)\n"
+        "# T2(t) = 1 T1(t - 1) (+) T0(t - 2)\n"
+        "# T3(t) = T1(t) (+) T2(t)\n");
     obtained = showCounterEquation(net, "# ", false, true);
     ASSERT_STREQ(obtained.str().c_str(), expected.str().c_str());
 
     // --
     expected.str(
         "# Timed event graph represented as counter equation (min-plus algebra):\n"
-        "# x1(t) = u(t - 1) ⨁ 1 x2(t - 1) ⨁ 2 x1(t - 1)\n"
-        "# x2(t) = 1 x1(t - 1) ⨁ u(t - 2)\n"
-        "# y(t) = x1(t) ⨁ x2(t)\n");
+        "# x1(t) = u(t - 1) (+) 1 x2(t - 1) (+) 2 x1(t - 1)\n"
+        "# x2(t) = 1 x1(t - 1) (+) u(t - 2)\n"
+        "# y(t) = x1(t) (+) x2(t)\n");
     obtained = showCounterEquation(net, "# ", true, true);
     ASSERT_STREQ(obtained.str().c_str(), expected.str().c_str());
 }