remove assert and exception macros

Author: MarcG-TUE

include/maxplus/base/exception/exception.h

@@ -99,18 +99,4 @@ class MPException : std::exception {
 
 } // namespace MaxPlus
 
-#define ASSERT(condition, msg)                                                                     \
-    {                                                                                              \
-        if (!(condition))                                                                          \
-            throw MaxPlus::MPException(MaxPlus::MPString(__FILE__) + MaxPlus::MPString(":") + MaxPlus::MPString(__LINE__) + MaxPlus::MPString(": ")  \
-                             + MaxPlus::MPString(msg));                                                      \
-    }
-
-#define EXCEPTION(msg, ...)                                                                        \
-    {                                                                                              \
-        char buf[1024];                                                                            \
-        sprintf(&buf[0], msg, __VA_ARGS__);                                                        \
-        throw MPException(buf);                                                                     \
-    }
-
 #endif

src/base/analysis/mcm/mcmgraph.cc

@@ -42,8 +42,13 @@
 #include "base/analysis/mcm/mcmgraph.h"
 #include "base/analysis/mcm/mcm.h"
 #include "base/analysis/mcm/mcmyto.h"
-#include "base/base.h"
+#include <cassert>
+#include <map>
 #include <memory>
+#include <set>
+#include <vector>
+
+
 
 namespace Graphs {
 /**
@@ -278,14 +283,16 @@ void addLongestDelayEdgesToMCMgraph(MCMgraph &g) {
     }
 }
 
+namespace {
+
 /**
  * getAdjacentNodes ()
  * The function returns a list with nodes directly reachable from
  * node a (in case transpose if false). If transpose is 'true', the
  * graph is transposed and the function returns a list with nodes
  * which are directly reachable from a in the transposed graph.
  */
-static MCMnodeRefs getAdjacentNodes(const MCMnode &a, bool transpose) {
+MCMnodeRefs getAdjacentNodes(const MCMnode &a, bool transpose) {
     MCMnodeRefs node_refs;
 
     if (!transpose) {
@@ -311,7 +318,7 @@ static MCMnodeRefs getAdjacentNodes(const MCMnode &a, bool transpose) {
  * order. Its order is set to -1. If all nodes have order -1, a nullptr pointer is
  * returned.
  */
-static const MCMnode *getNextNode(MCMnodes &nodes, v_int &order) {
+const MCMnode *getNextNode(MCMnodes &nodes, v_int &order) {
     const MCMnode *a = nullptr;
     int orderA = -1;
 
@@ -335,7 +342,7 @@ static const MCMnode *getNextNode(MCMnodes &nodes, v_int &order) {
  * dfsVisit ()
  * The visitor function of the DFS algorithm.
  */
-static void dfsVisit(const MCMnode &u,
+void dfsVisit(const MCMnode &u,
                      int &time,
                      v_int &color,
                      v_int &d,
@@ -367,6 +374,8 @@ static void dfsVisit(const MCMnode &u,
     f[u.id] = time;
 }
 
+} // namespace
+
 /**
  * dfsMCMgraph ()
  * The function performs a depth first search on the graph. The discover
@@ -470,7 +479,8 @@ treeVisitChildren(MCMgraph &g, std::vector<const MCMnode *> &pi, MCMnode *u, MCM
                     break;
                 }
             }
-            ASSERT(v != nullptr, "There must always be a node v.");
+            // There must always be a node v.
+            assert((v != nullptr));
 
             // Add node v to the component
             v->visible = true;

src/base/analysis/mcm/mcmyto.cc

@@ -53,6 +53,7 @@
 #include <cfloat>
 #include <cstdint>
 #include <memory>
+#include <cassert>
 
 namespace Graphs {
 
@@ -470,7 +471,8 @@ class AlgYTO {
 
         while (true) {
             min_a_ptr = GetMin();
-            ASSERT(min_a_ptr != NILA, "No element on heap!");
+            // should be element on heap
+            assert((min_a_ptr != NILA));
 
             *lambda = min_a_ptr->key;
             if (*lambda >= infty) {
@@ -757,7 +759,8 @@ class AlgYTO {
 
         while (true) {
             min_a_ptr = GetMin();
-            ASSERT(min_a_ptr != NILA, "No element on heap!");
+            // there must be an element on the heap
+            assert(min_a_ptr != NILA);
 
             *lambda = min_a_ptr->key;
             if (*lambda >= infty) {