added yto test

Author: MarcG-TUE

include/maxplus/base/analysis/mcm/mcmyto.h

@@ -104,7 +104,7 @@ using graph = struct Graph {
  * The function computes the maximum cycle mean of edge weight per edge of
  * an MCMgraph using Young-Tarjan-Orlin's algorithm.
  */
-CDouble maxCycleMeanYoungTarjanOrlin(const MCMgraph& mcmGraph);
+CDouble maxCycleMeanYoungTarjanOrlin(MCMgraph& mcmGraph);
 
 /**
  * maxCycleMeanAndCriticalCycleYoungTarjanOrlin ()
@@ -124,7 +124,7 @@ maxCycleMeanAndCriticalCycleYoungTarjanOrlin(MCMgraph& mcmGraph, std::shared_ptr
  * The function computes the maximum cycle ratio of edge weight over delay of
  * an MCMgraph using Young-Tarjan-Orlin's algorithm.
  */
-CDouble maxCycleRatioYoungTarjanOrlin(const MCMgraph& mcmGraph);
+CDouble maxCycleRatioYoungTarjanOrlin(MCMgraph& mcmGraph);
 
 /**
  * maxCycleRatioAndCriticalCycleYoungTarjanOrlin ()

src/testbench/base/mcmtest.cc

@@ -5,6 +5,7 @@
 #include "base/analysis/mcm/mcmdg.h"
 #include "base/analysis/mcm/mcmgraph.h"
 #include <base/analysis/mcm/mcmhoward.h>
+#include <base/analysis/mcm/mcmyto.h>
 #include "mcmtest.h"
 #include "testing.h"
 
@@ -28,12 +29,12 @@ MCMgraph makeGraph1() {
     MCMnode &n3 = *g.addNode(3);
     MCMnode &n4 = *g.addNode(4);
     g.addEdge(0, n0, n1, 1.0, 1.0);
-    g.addEdge(1, n1, n2, 2.0, 0.0);
+    g.addEdge(1, n1, n2, 2.0, 4.0);
     g.addEdge(2, n2, n3, 3.0, 0.0);
-    g.addEdge(3, n3, n0, 4.0, 0.0);
-    g.addEdge(4, n3, n3, 2.0, 0.0);
+    g.addEdge(3, n3, n0, 4.0, 1.0);
+    g.addEdge(4, n3, n3, 1.0, 0.3);
     g.addEdge(5, n3, n4, 10.0, 0.0);
-    g.addEdge(6, n4, n4, 1.0, 0.0);
+    g.addEdge(6, n4, n4, 1.0, 1.0);
     return g;
 }
 
@@ -93,15 +94,44 @@ void MCMTest::test_karp() {
     CDouble result = maximumCycleMeanKarp(g);
     ASSERT_APPROX_EQUAL(2.5, result, 1e-5);
 
-    result = maximumCycleMeanKarpDouble(g, nullptr);
+    const MCMnode *criticalNode;
+    result = maximumCycleMeanKarpDouble(g, &criticalNode);
     ASSERT_APPROX_EQUAL(2.5, result, 1e-5);
+    MCMnodes& nodes = g.getNodes();
+    ASSERT_THROW(criticalNode->id == 0 || criticalNode->id == 1 || criticalNode->id == 2
+                 || criticalNode->id == 3);
 
-
-    ASSERT_APPROX_EQUAL(1.0, 1.0, 1e-5);
 }
 
 /// Test MCM YTO.
 void MCMTest::test_yto() {
     std::cout << "Running test: MCM-YTO" << std::endl;
-    ASSERT_APPROX_EQUAL(1.0, 1.0, 1e-5);
+
+    MCMgraph g = makeGraph1();
+    CDouble result = maxCycleMeanYoungTarjanOrlin(g);
+    ASSERT_APPROX_EQUAL(2.5, result, 1e-5);
+
+    std::shared_ptr<std::vector<const MCMedge *>> cycle;
+    result = maxCycleMeanAndCriticalCycleYoungTarjanOrlin(g, &cycle);
+    ASSERT_APPROX_EQUAL(2.5, result, 1e-5);
+    ASSERT_THROW(cycle->size() == 4);
+    int eid = cycle->at(0)->id;
+    ASSERT_THROW(eid == 0 || eid == 1 || eid == 2 || eid == 3);
+
+    result = maxCycleRatioYoungTarjanOrlin(g);
+    ASSERT_APPROX_EQUAL(10.0/3.0, result, 1e-5);
+
+    result = maxCycleRatioAndCriticalCycleYoungTarjanOrlin(g, &cycle);
+    ASSERT_APPROX_EQUAL(10.0 / 3.0, result, 1e-5);
+    eid = cycle->at(0)->id;
+    ASSERT_THROW(eid == 4);
+
+    result = minCycleRatioYoungTarjanOrlin(g);
+    ASSERT_APPROX_EQUAL(1.0, result, 1e-5);
+
+    result = minCycleRatioAndCriticalCycleYoungTarjanOrlin(g, &cycle);
+    ASSERT_APPROX_EQUAL(1.0, result, 1e-5);
+    eid = cycle->at(0)->id;
+    ASSERT_THROW(eid == 6);
+
 }