fixes

Author: Marc Geilen

documentation/Doxyfile.doc

@@ -62,8 +62,6 @@ class MCMedge {
 };
 
 using MCMedges = list<std::shared_ptr<MCMedge>>;
-using MCMedgesIter = MCMedges::iterator;
-using MCMedgesCIter = MCMedges::const_iterator;
 
 class MCMnode {
 public:
@@ -80,8 +78,6 @@ struct MCMNodeLess {
 };
 
 using MCMnodes = list<std::shared_ptr<MCMnode>>;
-using MCMnodesIter = MCMnodes::iterator;
-using MCMnodesCIter = MCMnodes::const_iterator;
 
 class MCMgraph {
 public:

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

@@ -113,7 +113,7 @@ CDouble maxCycleMeanYoungTarjanOrlin(std::shared_ptr<MCMgraph> mcmGraph);
  * in due time.
  */
 CDouble
-maxCycleMeanAndCriticalCycleYoungTarjanOrlin(std::shared_ptr<MCMgraph> mcmGraph, std::shared_ptr<MCMedge> **cycle, uint *len);
+maxCycleMeanAndCriticalCycleYoungTarjanOrlin(const MCMgraph& mcmGraph, std::shared_ptr<MCMedge> **cycle, uint *len);
 
 /**
  * maxCycleRatioYoungTarjanOrlin ()
@@ -153,7 +153,7 @@ CDouble minCycleRatioYoungTarjanOrlin(std::shared_ptr<MCMgraph> mcmGraph);
  * in due time.
  */
 CDouble
-minCycleRatioAndCriticalCycleYoungTarjanOrlin(std::shared_ptr<MCMgraph> mcmGraph, std::shared_ptr<MCMedge> **cycle, uint *len);
+minCycleRatioAndCriticalCycleYoungTarjanOrlin(const MCMgraph& mcmGraph, std::shared_ptr<MCMedge> **cycle, uint *len);
 
 /**
  * getDelay ()
@@ -173,7 +173,7 @@ double getWeight(std::shared_ptr<MCMedge> e);
  * to graph input for Young-Tarjan-Orlin's algorithm.
  * It assumes that the id's of the nodes are 0 <= id < number of nodes
  */
-void convertMCMgraphToYTOgraph(std::shared_ptr<MCMgraph> g,
+void convertMCMgraphToYTOgraph(const MCMgraph& g,
                                graph *gr,
                                double (*costFunction)(std::shared_ptr<MCMedge> e),
                                double (*transit_timeFunction)(std::shared_ptr<MCMedge> e));

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

@@ -1102,10 +1102,10 @@ Matrix::mp_generalized_eigenvectors() const {
     std::map<uint, std::shared_ptr<MCMgraph>> sccMapInv;
 
     // map from node of precGraph to its SCC
-    std::map<std::weak_ptr<MCMnode>, uint> sccMap;
+    std::map<std::shared_ptr<MCMnode>, uint> sccMap;
 
     // map from nodes of precGraph to the cycle mean of its SCC
-    std::map<std::weak_ptr<MCMnode>, MPTime> cycleMeansMap;
+    std::map<std::shared_ptr<MCMnode>, MPTime> cycleMeansMap;
 
     // vector such that element k is a node from precGraph in the critical path of SCC k
     std::vector<std::shared_ptr<MCMnode>> criticalNodes;

src/algebra/mpmatrix.cc

@@ -1003,7 +1003,6 @@ SparseMatrix::mpGeneralizedEigenvectors() {
         Vector lambda = evev.second;
         gevl.push_back(std::make_pair(SparseVector(ev, sizes), SparseVector(lambda, sizes)));
     }
-
     return std::make_pair(evl, gevl);
 }
 

src/algebra/mpsparsematrix.cc

@@ -88,7 +88,7 @@ CDouble mcmDG(MCMgraph *mcmGraph) {
     u = Q_u.front();
     Q_u.pop_front();
     do {
-        for (MCMedgesIter iter = u->out.begin(); iter != u->out.end(); iter++) {
+        for (auto iter = u->out.begin(); iter != u->out.end(); iter++) {
             std::shared_ptr<MCMedge> e = *iter;
             std::shared_ptr<MCMnode> v = e->dst;
 
@@ -109,7 +109,7 @@ CDouble mcmDG(MCMgraph *mcmGraph) {
 
     // Compute lambda using Karp's theorem
     l = -INT_MAX;
-    for (MCMnodesCIter iter = mcmGraph->getNodes().begin(); iter != mcmGraph->getNodes().end();
+    for (auto iter = mcmGraph->getNodes().begin(); iter != mcmGraph->getNodes().end();
          iter++) {
         u = *iter;