changed namespaces and basic types to avoid conflicts

Author: MarcG-TUE

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

@@ -47,7 +47,7 @@
 
 #include "maxplus/base/analysis/mcm/mcmgraph.h"
 
-namespace Graphs {
+namespace MaxPlus::Graphs {
 
 /// <summary>
 ///		The function computes the maximum cycle mean of an MCMgraph using Karp's
@@ -101,5 +101,5 @@ v_uint mcmGetAdjacentActors(uint a,
                             const std::vector<v_uint> &graph,
                             uint nrNodes);
 
-} // namespace Graphs
+} // namespace MaxPlus::Graphs
 #endif

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

@@ -53,7 +53,7 @@
 
 #include "maxplus/base/analysis/mcm/mcmgraph.h"
 
-namespace Graphs {
+namespace MaxPlus::Graphs {
 
 /**
  * mcmDG ()
@@ -66,6 +66,6 @@ namespace Graphs {
  */
 CDouble mcmDG(MCMgraph &mcmGraph);
 
-} // namespace Graphs
+} // namespace MaxPlus::Graphs
 
 #endif

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

@@ -46,7 +46,9 @@
 #include <memory>
 #include <utility>
 
-namespace Graphs {
+using namespace MaxPlus;
+
+namespace MaxPlus::Graphs {
 class MCMnode;
 
 class MCMedge {
@@ -263,5 +265,5 @@ void relabelMCMgraph(MCMgraph &g);
  */
 void addLongestDelayEdgesToMCMgraph(MCMgraph &g);
 
-} // namespace Graphs
+} // namespace MaxPlus::Graphs
 #endif

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

@@ -54,7 +54,7 @@
 
 #include "maxplus/base/analysis/mcm/mcmgraph.h"
 #include <memory>
-namespace Graphs {
+namespace MaxPlus::Graphs {
 /**
  * convertMCMgraphToMatrix ()
  * The function converts a weighted directed graph used in the MCM algorithms
@@ -125,5 +125,5 @@ CDouble maximumCycleMeanHoward(MCMgraph &g, MCMnode **criticalNode);
  */
 CDouble maximumCycleMeanHowardGeneral(MCMgraph &g, MCMnode **criticalNode);
 
-} // namespace Graphs
+} // namespace MaxPlus::Graphs
 #endif

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

@@ -53,7 +53,7 @@
 #include <memory>
 #include <vector>
 
-namespace Graphs {
+namespace MaxPlus::Graphs {
 
 using node = struct Node {
     // index into nodes array of graph structure is id - 1
@@ -186,6 +186,6 @@ void convertMCMgraphToYTOgraph(MCMgraph &g,
 
 void mmcycle(graph &gr, CDouble *lambda, std::vector<const arc *> *cycle);
 
-} // namespace Graphs
+} // namespace MaxPlus::Graphs
 
 #endif

include/maxplus/base/basic_types.h

@@ -47,6 +47,7 @@
 
 /* STL functionality */
 #include <algorithm>
+#include <cstdint>
 #include <fstream>
 #include <iostream>
 #include <list>
@@ -55,16 +56,20 @@
 #include <set>
 #include <vector>
 
+namespace MaxPlus {
+
 /* basic types */
-using uint = unsigned int;
-using v_int = std::vector<int>;
-using v_uint = std::vector<uint>;
+using uint = uint32_t;
+using v_int = std::vector<int32_t>;
+using v_uint = std::vector<uint32_t>;
 
 /* Id */
-using CId = uint;
-using CSize = unsigned long long;
+using CId = uint32_t;
+using CSize = uint64_t;
 
 /* Doubles */
 using CDouble = double;
 
+} // namespace MaxPlus
+
 #endif

include/maxplus/base/fsm/fsm.h

@@ -51,7 +51,9 @@
 #include <set>
 #include <utility>
 
-namespace FSM {
+using namespace MaxPlus;
+
+namespace MaxPlus::FSM {
 
 // the abstract ancestor of FSM types
 namespace Abstract {
@@ -1205,6 +1207,6 @@ class FiniteStateMachine : public Abstract::FiniteStateMachine {
 
 } // namespace Product
 
-} // namespace FSM
+} // namespace MaxPlus::FSM
 
 #endif

include/maxplus/base/fsm/iofsm.h

@@ -19,13 +19,13 @@ using IOASetOfStateRefs = ::FSM::Labeled::SetOfStateRefs<CId, IOAEdgeLabel>;
 using IOASetOfEdges = ::FSM::Labeled::SetOfEdges<CId, IOAEdgeLabel>;
 using IOASetOfEdgeRefs = ::FSM::Labeled::SetOfEdgeRefs<CId, IOAEdgeLabel>;
 
-namespace FSM::Labeled {
+namespace MaxPlus::FSM::Labeled {
 
 class IOAutomaton : public ::FSM::Labeled::FiniteStateMachine<CId, IOAEdgeLabel> {
 public:
     virtual ~IOAutomaton(){};
 };
 
-} // namespace FSM::Labeled
+} // namespace MaxPlus::FSM::Labeled
 
 #endif

include/maxplus/game/policyiteration.h

@@ -51,7 +51,7 @@
 
 namespace MaxPlus {
 
-using namespace ::FSM::Labeled;
+using namespace ::MaxPlus::FSM::Labeled;
 
 /**
  * Policy Iteration Algorithm to solve ratio games.

include/maxplus/game/ratiogame.h

@@ -46,7 +46,7 @@
 
 namespace MaxPlus {
 
-using namespace ::FSM::Labeled;
+using namespace ::MaxPlus::FSM::Labeled;
 
 template <typename SL, typename EL> class RatioGame : virtual public DoubleWeightedGraph<SL, EL> {
 public: