bugfix in AddArc

frangio68 · May 15, 2019 · 3cc9e52 · 3cc9e52
1 parent 833a36a
commit 3cc9e52
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/MCFSimplex/MCFSimplex.C b/MCFSimplex/MCFSimplex.C
@@ -1925,9 +1925,9 @@ MCFSimplex::Index MCFSimplex::AddArc( cIndex Start , cIndex End ,
  if( usePrimalSimplex ) {
   arcPType *arc = arcsP;
   #if( QUADRATICCOST )
-   while( ( arc->upper != -Inf<FNumber>() ) && ( arc != stopArcsP ) )
+   while( ( arc != stopArcsP ) && ( arc->upper != -Inf<FNumber>() ) )
   #else
-   while( ( arc->ident > DELETED ) && ( arc != stopArcsP ) )
+   while( ( arc != stopArcsP ) && ( arc->ident > DELETED ) )
   #endif
     arc++;
 
@@ -1939,7 +1939,7 @@ MCFSimplex::Index MCFSimplex::AddArc( cIndex Start , cIndex End ,
    stopArcsP++;
    }
 
-  Index pos = ( arc - arcsP ) + 1;
+  Index pos = arc - arcsP;
   arc->tail = nodesP + Start + USENAME0 - 1;
   arc->head = nodesP + End + USENAME0 - 1;
   arc->upper = aU;
@@ -1967,7 +1967,7 @@ MCFSimplex::Index MCFSimplex::AddArc( cIndex Start , cIndex End ,
     stopArcsD++;
     }
 
-   Index pos = ( arc - arcsD ) + 1;
+   Index pos = arc - arcsD;
    arc->tail = nodesD + Start + USENAME0 - 1;
    arc->head = nodesD + End + USENAME0 - 1;
    arc->upper = aU;

diff --git a/RelaxIV/RelaxIV.h b/RelaxIV/RelaxIV.h
@@ -120,7 +120,7 @@
 
 /*----------------------------- DYNMC_MCF_RIV ------------------------------*/
 
-#define DYNMC_MCF_RIV 0
+#define DYNMC_MCF_RIV 3
 
 /**< Decides if the graph topology (arcs, nodes) can be changed.
    If DYNMC_MCF_RIV > 0, the methods of the public interface of class that
@@ -297,6 +297,13 @@ class RelaxIV : public MCFClass {
 
 /*--------------------------------------------------------------------------*/
 
+ virtual inline void GetPar( int par , double &val ) const override
+ {
+  MCFClass::GetPar( par , val );
+  }
+
+ /*--------------------------------------------------------------------------*/
+
    void PreProcess( void ) override;
 
 /**< If this method is called, a preprocessing phase is performed trying to

diff --git a/RelaxIV/makefile b/RelaxIV/makefile
@@ -39,7 +39,7 @@ MCFR4INC = -I$(MCFR4DIR)
 
 # dependencies: every .o from its .C + every recursively included .h- - - - -
 
-$(MCFR4OBJ): $(MCFR4DIR)RelaxIV.C $(MCFClH)
+$(MCFR4OBJ): $(MCFR4DIR)RelaxIV.C $(MCFR4H) $(MCFClH)
 	$(CC) -c $*.C -o $@ $(MCFClINC) $(SW)
 
 ############################# End of makefile ################################
diff --git a/lib/makefile b/lib/makefile
@@ -60,8 +60,8 @@ include $(MCFSxDIR)makefile
 #include $(MCFZBDIR)makefile
 
 # RelaxIV
-#MCFR4DIR = $(libMCFClDIR)RelaxIV/
-#include $(MCFR4DIR)makefile
+MCFR4DIR = $(libMCFClDIR)RelaxIV/
+include $(MCFR4DIR)makefile
 
 # SPTree
 MCFSTDIR = $(libMCFClDIR)SPTree/