Merge branch 'fix-minimization-fsm' into 'main'

Fix minimization fsm

See merge request computational-modeling/maxpluslib!1

Author: MarcG-TUE

include/maxplus/algebra/mpmatrix.h

@@ -41,7 +41,7 @@
 #ifndef MAXPLUS_ALGEBRA_MATRIX_H_INCLUDED
 #define MAXPLUS_ALGEBRA_MATRIX_H_INCLUDED
 
-#include "base/analysis/mcm/mcmgraph.h"
+#include "maxplus/base/analysis/mcm/mcmgraph.h"
 #include "mptype.h"
 #include <memory>
 #include <unordered_set>

include/maxplus/algebra/mpsparsematrix.h

@@ -40,7 +40,7 @@
 #ifndef MAXPLUS_ALGEBRA_SPARSEMATRIX_H_INCLUDED
 #define MAXPLUS_ALGEBRA_SPARSEMATRIX_H_INCLUDED
 
-#include "algebra/mpmatrix.h"
+#include "mpmatrix.h"
 #include "mptype.h"
 #include <vector>
 

include/maxplus/algebra/mptype.h

@@ -44,8 +44,8 @@
 #ifndef BASE_MAXPLUS_MPTYPE_H_INCLUDED
 #define BASE_MAXPLUS_MPTYPE_H_INCLUDED
 
-#include "base/basic_types.h"
-#include "base/string/cstring.h"
+#include "maxplus/base/basic_types.h"
+#include "maxplus/base/string/cstring.h"
 #include <cassert>
 #include <cmath>
 
@@ -115,6 +115,7 @@ inline CDouble MP_MIN(CDouble a, CDouble b) { return CDouble(MP_MIN(MPTime(a), M
 const MPTime MP_MINUSINFINITY = MPTime(-1.0e+30);
 
 inline bool MP_ISMINUSINFINITY(CDouble a) { return a < MPTIME_MIN_INF_VAL; }
+inline bool MP_ISMINUSINFINITY(MPTime a) { return a < MP_MINUSINFINITY; }
 
 inline MPTime MP_PLUS(CDouble a, CDouble b) {
     return (MP_ISMINUSINFINITY(a) || MP_ISMINUSINFINITY(b)) ? MP_MINUSINFINITY

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

@@ -45,7 +45,7 @@
 #ifndef BASE_ANALYSIS_MCM_MCM_H_INCLUDED
 #define BASE_ANALYSIS_MCM_MCM_H_INCLUDED
 
-#include "base/analysis/mcm/mcmgraph.h"
+#include "maxplus/base/analysis/mcm/mcmgraph.h"
 
 namespace Graphs {
 

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

@@ -51,7 +51,7 @@
 #ifndef BASE_ANALYSIS_MCM_MCMDG_H_INCLUDED
 #define BASE_ANALYSIS_MCM_MCMDG_H_INCLUDED
 
-#include "base/analysis/mcm/mcmgraph.h"
+#include "maxplus/base/analysis/mcm/mcmgraph.h"
 
 namespace Graphs {
 

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

@@ -42,7 +42,7 @@
 #ifndef BASE_ANALYSIS_MCM_MCMGRAPH_H_INCLUDED
 #define BASE_ANALYSIS_MCM_MCMGRAPH_H_INCLUDED
 
-#include "base/basic_types.h"
+#include "maxplus/base/basic_types.h"
 #include <memory>
 #include <utility>
 
@@ -252,7 +252,7 @@ void stronglyConnectedMCMgraph(MCMgraph &g,
  * The function removes all hidden nodes and edges from the graph. All visible
  * edges are assigned a new id starting in the range [0,nrNodes()).
  */
-void relabelMCMgraph(std::shared_ptr<MCMgraph> g);
+void relabelMCMgraph(MCMgraph& g);
 
 /**
  * addLongestDelayEdgesToMCMgraph ()
@@ -261,7 +261,7 @@ void relabelMCMgraph(std::shared_ptr<MCMgraph> g);
  * with no delay are removed and edges with more than one delay element
  * are converted into a sequence of edges with one delay element.
  */
-void addLongestDelayEdgesToMCMgraph(std::shared_ptr<MCMgraph> g);
+void addLongestDelayEdgesToMCMgraph(MCMgraph& g);
 
 } // namespace Graphs
 #endif

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

@@ -52,7 +52,7 @@
 #ifndef BASE_ANALYSIS_MCM_MCMHOWARD_H_INCLUDED
 #define BASE_ANALYSIS_MCM_MCMHOWARD_H_INCLUDED
 
-#include "base/analysis/mcm/mcmgraph.h"
+#include "maxplus/base/analysis/mcm/mcmgraph.h"
 #include <memory>
 namespace Graphs {
 /**

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

@@ -48,7 +48,7 @@
 #ifndef BASE_ANALYSIS_MCM_MCMYTO_H_INCLUDED
 #define BASE_ANALYSIS_MCM_MCMYTO_H_INCLUDED
 
-#include "base/analysis/mcm/mcmgraph.h"
+#include "maxplus/base/analysis/mcm/mcmgraph.h"
 #include <cstdint>
 #include <memory>
 #include <vector>