sync

Author: Marc Geilen

documentation/.gitignore

@@ -1 +1,2 @@
-/html/
+/html/
+Doxyfile.doc

include/maxplus/algebra/mpmatrix.h

@@ -47,7 +47,6 @@
 #include <unordered_set>
 #include <vector>
 
-
 class CString;
 
 namespace MaxPlus {
@@ -66,7 +65,7 @@ class Vector {
     ~Vector();
 
     Vector(Vector &&) = default;
-    Vector &operator=(Vector &&) = default;
+    Vector &operator=(Vector &&) = delete;
 
     [[nodiscard]] inline unsigned int getSize() const {
         return static_cast<unsigned int>(this->table.size());
@@ -76,7 +75,7 @@ class Vector {
 
     void put(unsigned int row, MPTime value);
 
-    void toString(CString &outString, double scale = 1.0) const;
+    void toString(CString &outString, CDouble scale = 1.0) const;
 
     Vector(const Vector &);
 
@@ -125,7 +124,7 @@ class Vector {
     MPTime minimalFiniteElement(unsigned int *itsPosition_Ptr = nullptr) const;
 
 private:
-    vector<MPTime> table;
+    std::vector<MPTime> table;
 };
 
 enum class MatrixFill { MinusInfinity, Zero, Identity };
@@ -172,21 +171,21 @@ class Matrix {
 
     [[nodiscard]] Matrix *getTransposedCopy() const;
 
-    [[nodiscard]] virtual Matrix *getSubMatrix(const list<unsigned int> &rowIndices,
-                                               const list<unsigned int> &colIndices) const;
+    [[nodiscard]] virtual Matrix *getSubMatrix(const std::list<unsigned int> &rowIndices,
+                                               const std::list<unsigned int> &colIndices) const;
 
-    [[nodiscard]] Matrix *getSubMatrix(const list<unsigned int> &indices) const;
+    [[nodiscard]] Matrix *getSubMatrix(const std::list<unsigned int> &indices) const;
 
-    [[nodiscard]] Matrix *getSubMatrixNonSquare(const list<unsigned int> &indices) const;
+    [[nodiscard]] Matrix *getSubMatrixNonSquare(const std::list<unsigned int> &indices) const;
 
     /**
      * Increases the number of rows of the matrix by n and fills the new elements with -\infty.
      */
     void addRows(uint n);
 
-    void toString(CString &outString, double scale = 1.0) const;
-    void toMatlabString(CString &outString, double scale = 1.0) const;
-    void toLaTeXString(CString &outString, double scale = 1.0) const;
+    void toString(CString &outString, CDouble scale = 1.0) const;
+    void toMatlabString(CString &outString, CDouble scale = 1.0) const;
+    void toLaTeXString(CString &outString, CDouble scale = 1.0) const;
 
     // Algebraic operations.
     [[nodiscard]] Matrix *add(MPTime increase) const;
@@ -264,7 +263,7 @@ class Matrix {
 
     Matrix();
 
-    vector<MPTime> table;
+    std::vector<MPTime> table;
     unsigned int szRows;
     unsigned int szCols;
 };
@@ -296,16 +295,16 @@ class ExtendedMatrix : public Matrix {
     }
 
     void put(unsigned int row, unsigned int column, MPTime value, std::unordered_set<int> &);
-    [[nodiscard]] Matrix *getSubMatrix(const list<unsigned int> &rowIndices,
-                                       const list<unsigned int> &colIndices) const override;
+    [[nodiscard]] Matrix *getSubMatrix(const std::list<unsigned int> &rowIndices,
+                                       const std::list<unsigned int> &colIndices) const override;
 
     // factory methods
     [[nodiscard]] Matrix *makeMatrix(unsigned int nr_rows, unsigned int nr_cols) const override;
 
     [[nodiscard]] std::unordered_set<int> getBufferSet(unsigned int row, unsigned int column) const;
 
 private:
-    vector<std::unordered_set<int>> bufferSets;
+    std::vector<std::unordered_set<int>> bufferSets;
 };
 
 /****************************************************
@@ -320,11 +319,11 @@ class VectorList : private std::vector<std::unique_ptr<Vector>> {
 
     VectorList(VectorList &&) = default;
     VectorList &operator=(VectorList &&) = delete;
-    
+
     // Implicit copying is not allowed
     //  => Intentionally private and not implemented
-    VectorList(const VectorList &)=delete;
-    VectorList &operator=(const VectorList &)=delete;
+    VectorList(const VectorList &) = delete;
+    VectorList &operator=(const VectorList &) = delete;
 
     [[nodiscard]] const Vector &vectorRefAt(unsigned int n) const; // vector at index 'n'
     Vector &vectorRefAt(unsigned int n);
@@ -337,9 +336,9 @@ class VectorList : private std::vector<std::unique_ptr<Vector>> {
 
     void grow(); // append one vector place
 
-    void toString(CString &outString, double scale = 1.0) const;
+    void toString(CString &outString, CDouble scale = 1.0) const;
 
-    // bool findSimilar(const Vector& vec, double threshold) const;
+    // bool findSimilar(const Vector& vec, CDouble threshold) const;
     //  similar - differs by a constant within a threshold
 
 private:
@@ -358,14 +357,12 @@ inline const Vector &VectorList::lastVectorRef() const { return *this->at(this->
 
 inline Vector &VectorList::lastVectorRef() { return *this->at(this->size() - 1); }
 
-inline unsigned int VectorList::getSize() const {
-    return static_cast<unsigned int>(this->size());
-}
+inline unsigned int VectorList::getSize() const { return static_cast<unsigned int>(this->size()); }
 
 inline void VectorList::grow() {
     auto last = static_cast<unsigned int>(this->size());
     this->resize(last + 1);
-    this->insert(this->begin()+last, std::make_unique<Vector>(oneVectorSize, MP_MINUSINFINITY));
+    this->insert(this->begin() + last, std::make_unique<Vector>(oneVectorSize, MP_MINUSINFINITY));
 }
 
 } // namespace MaxPlus

include/maxplus/algebra/mpsparsematrix.h

@@ -44,7 +44,6 @@
 #include "mptype.h"
 #include <vector>
 
-
 class CString;
 
 namespace MaxPlus {
@@ -88,9 +87,9 @@ class SparseVector {
     void putAll(unsigned int startRow, unsigned int endRow, MPTime value);
     void insertVector(unsigned int startRow, const SparseVector &v);
 
-    void toString(CString &outString, double scale = 1.0) const;
+    void toString(CString &outString, CDouble scale = 1.0) const;
 
-    SparseVector& operator=(const SparseVector &);
+    SparseVector &operator=(const SparseVector &);
 
     [[nodiscard]] MPTime norm() const;
 
@@ -137,8 +136,8 @@ class SparseVector {
 class SparseMatrix {
 public:
     explicit SparseMatrix(unsigned int rowSize = 0,
-                 unsigned int colSize = 0,
-                 MPTime value = MP_MINUSINFINITY);
+                          unsigned int colSize = 0,
+                          MPTime value = MP_MINUSINFINITY);
 
     SparseMatrix(const SparseMatrix &);
 
@@ -173,7 +172,7 @@ class SparseMatrix {
 
     void insertMatrix(unsigned int startRow, unsigned int startColumn, const SparseMatrix &M);
 
-    SparseMatrix& operator=(const SparseMatrix &);
+    SparseMatrix &operator=(const SparseMatrix &);
 
     [[nodiscard]] MPTime norm() const;
 
@@ -189,7 +188,7 @@ class SparseMatrix {
 
     void compress();
 
-    void toString(CString &outString, double scale = 1.0) const;
+    void toString(CString &outString, CDouble scale = 1.0) const;
 
     MPTime mpEigenvalue();
 
@@ -208,7 +207,7 @@ class SparseMatrix {
     bool isTransposed;
     // table contains column vectors (if isTransposed is false)
     // a pair (n, v) means that the vector v is repeated n times.
-    vector<std::pair<unsigned int, SparseVector>> table;
+    std::vector<std::pair<unsigned int, SparseVector>> table;
     std::pair<unsigned int, unsigned int> find(unsigned int col);
     void doTranspose();
     SparseMatrix combine(const SparseMatrix &vecB, MPTime f(MPTime a, MPTime b));

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

@@ -63,7 +63,7 @@ CDouble maximumCycleMeanKarpDouble(const MCMgraph& g, MCMnode **criticalNode = n
  * actor a.
  */
 v_uint
-mcmGetAdjacentActors(uint a, v_uint &nodeId, v_uint &actorId, vector<v_uint> &graph, uint nrNodes);
+mcmGetAdjacentActors(uint a, const v_uint &nodeId, const v_uint &actorId, const std::vector<v_uint> &graph, uint nrNodes);
 
 } // namespace Graphs
 #endif

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

@@ -61,7 +61,7 @@ class MCMedge {
     CDouble d;
 };
 
-using MCMedges = list<std::shared_ptr<MCMedge>>;
+using MCMedges = std::list<std::shared_ptr<MCMedge>>;
 
 class MCMnode {
 public:
@@ -77,7 +77,7 @@ struct MCMNodeLess {
     bool operator()(std::shared_ptr<MCMnode> const &lhs, std::shared_ptr<MCMnode> const &rhs) const { return lhs->id < rhs->id; };
 };
 
-using MCMnodes = list<std::shared_ptr<MCMnode>>;
+using MCMnodes = std::list<std::shared_ptr<MCMnode>>;
 
 class MCMgraph {
 public:
@@ -90,11 +90,15 @@ class MCMgraph {
     // Copy Constructor
     MCMgraph(const MCMgraph &g);
 
-    const MCMnodes &getNodes() const { return nodes; };
+    MCMgraph(MCMgraph &&) = default;
+    MCMgraph &operator=(MCMgraph &&) = delete;
+    MCMgraph& operator=(const MCMgraph& other) = delete;
 
-    uint nrVisibleNodes() const {
+    [[nodiscard]] const MCMnodes &getNodes() const { return nodes; };
+
+    [[nodiscard]] uint nrVisibleNodes() const {
         uint nrNodes = 0;
-        for (auto &node : nodes) {
+        for (const auto &node : nodes) {
             if (node->visible) {
                 nrNodes++;
             }
@@ -110,7 +114,7 @@ class MCMgraph {
         return nullptr;
     };
 
-    const MCMedges &getEdges() const { return edges; };
+    [[nodiscard]] const MCMedges &getEdges() const { return edges; };
 
     std::shared_ptr<MCMedge> getEdge(CId id) {
         for (auto &edge : edges) {
@@ -180,15 +184,15 @@ class MCMgraph {
     }
 
     // Add an edge to the MCMgraph.
-    void addEdge(std::shared_ptr<MCMedge> e) {
+    void addEdge(const std::shared_ptr<MCMedge>& e) {
         this->edges.push_back(e);
         e->src->out.push_back(e);
         e->dst->in.push_back(e);
     }
 
     // Remove an edge from the MCMgraph.
     // Note: containers of edges are lists, so remove is expensive!
-    void removeEdge(std::shared_ptr<MCMedge> e) {
+    void removeEdge(const std::shared_ptr<MCMedge>& e) {
         this->edges.remove(e);
         e->src->out.remove(e);
         e->dst->in.remove(e);
@@ -224,7 +228,7 @@ class MCMgraph {
     MCMedges edges;
 };
 
-using MCMgraphs = list<std::shared_ptr<MCMgraph>>;
+using MCMgraphs = std::list<std::shared_ptr<MCMgraph>>;
 using MCMgraphsIter = MCMgraphs::iterator;
 
 /**

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

@@ -59,7 +59,7 @@ namespace Graphs {
  * The function converts a weighted directed graph used in the MCM algorithms
  * to a sparse matrix input for Howard's algorithm.
  */
-void convertMCMgraphToMatrix(MCMgraph *g, int *ij, double *A);
+void convertMCMgraphToMatrix(MCMgraph *g, int *ij, CDouble *A);
 
 /**
  * Howard ()
@@ -77,11 +77,11 @@ void convertMCMgraphToMatrix(MCMgraph *g, int *ij, double *A);
  *
  */
 void Howard(int *ij,
-            double *A,
+            CDouble *A,
             int nr_nodes,
             int nr_arcs,
-            double *chi,
-            double *v,
+            CDouble *chi,
+            CDouble *v,
             int *policy,
             int *nr_iterations,
             int *nr_components);

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

@@ -49,11 +49,12 @@
 #define BASE_ANALYSIS_MCM_MCMYTO_H_INCLUDED
 
 #include "base/analysis/mcm/mcmgraph.h"
+#include <cstdint>
 namespace Graphs {
 
-typedef struct Node {
+using node = struct Node {
     // index into nodes array of graph structure is id - 1
-    long id;
+    std::int32_t id;
     struct Arc *first_arc_out;
     struct Arc *first_arc_in;
     struct Node *link; // for one way linked list
@@ -66,31 +67,31 @@ typedef struct Node {
     struct Node *right_sibling;
 
     // next entries for maintenance of edge keys
-    long level;
-    double cost_t;         // sum of costs on edges of tree path to node with
+    std::int32_t level;
+    CDouble cost_t;         // sum of costs on edges of tree path to node with
                            // respect to original edge costs
-    double transit_time_t; // sum of transit time on edges of tree path
+    CDouble transit_time_t; // sum of transit time on edges of tree path
                            // to node
     struct Arc *v_key;     // pointer to incoming arc with minimum key
-} node;
+};
 
 using arc = struct Arc {
     node *tail;
     node *head;
     struct Arc *next_out; // in incidence list of tail node
     struct Arc *next_in;  // in incidence list of head node
     bool in_tree;
-    double cost;
-    double transit_time;
-    double key;
-    long h_pos;       // of arc in heap
+    CDouble cost;
+    CDouble transit_time;
+    CDouble key;
+    std::int32_t h_pos;       // of arc in heap
     std::shared_ptr<MCMedge> mcmEdge; // MCMedge from which the arc was constructed in the conversion
 };
 
 using graph = struct Graph {
-    long n_nodes;
+    std::int32_t n_nodes;
     node *nodes;
-    long n_arcs;
+    std::int32_t n_arcs;
     arc *arcs;
     node *vs; // additional node with zero cost outgoing edges
 };
@@ -159,13 +160,13 @@ minCycleRatioAndCriticalCycleYoungTarjanOrlin(const MCMgraph& mcmGraph, std::sha
  * getDelay ()
  * The function returns the delay associated with an edge.
  */
-double getDelay(std::shared_ptr<MCMedge> e);
+CDouble getDelay(std::shared_ptr<MCMedge> e);
 
 /**
  * getWeight ()
  * The function returns the weight associated with an edge.
  */
-double getWeight(std::shared_ptr<MCMedge> e);
+CDouble getWeight(std::shared_ptr<MCMedge> e);
 
 /**
  * convertMCMgraphToYTOgraph ()
@@ -175,8 +176,8 @@ double getWeight(std::shared_ptr<MCMedge> e);
  */
 void convertMCMgraphToYTOgraph(const MCMgraph& g,
                                graph *gr,
-                               double (*costFunction)(std::shared_ptr<MCMedge> e),
-                               double (*transit_timeFunction)(std::shared_ptr<MCMedge> e));
+                               CDouble (*costFunction)(std::shared_ptr<MCMedge> e),
+                               CDouble (*transit_timeFunction)(std::shared_ptr<MCMedge> e));
 
 /**
  * mmcycle ()
@@ -186,7 +187,7 @@ void convertMCMgraphToYTOgraph(const MCMgraph& g,
  * edges, alternatively called "length" or "weight".
  */
 
-void mmcycle(graph *gr, double *lambda, arc **cycle, long *len);
+void mmcycle(graph *gr, CDouble *lambda, arc **cycle, std::int32_t *len);
 
 } // namespace Graphs