diff options
author | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-11-09 16:39:12 +1100 |
---|---|---|
committer | Carlo Zancanaro <carlo@pc-4w14-0.cs.usyd.edu.au> | 2012-11-09 16:39:12 +1100 |
commit | 9710d8c7a3307fd9477fb426ea1bab7804c6ef37 (patch) | |
tree | b6e1462e3d3b0ed414edafc2242e01822ceb22cd /impl/MCFClass.h | |
parent | b19bd8d8a41664328f33c9b459b2b0100f0b303f (diff) |
A bunch of changes to make it build nicer
In particular:
- fix up the MCF sovler to get rid of all the warnings/errors
- make the build with Wall and Werror and whatnot again
Diffstat (limited to 'impl/MCFClass.h')
-rwxr-xr-x | impl/MCFClass.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/impl/MCFClass.h b/impl/MCFClass.h index f10cb5a..9534776 100755 --- a/impl/MCFClass.h +++ b/impl/MCFClass.h @@ -993,7 +993,7 @@ class MCFClass { /** @name Getting unboundedness certificate @{ */ - virtual Index MCFGetUnbCycl( Index_Set Pred , Index_Set ArcPred ) + virtual Index MCFGetUnbCycl( Index_Set , Index_Set ) { return( Inf<Index>() ); } @@ -1041,7 +1041,7 @@ class MCFClass { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - virtual void MCFPutState( MCFStatePtr S ) {} + virtual void MCFPutState( MCFStatePtr ) {} /**< Restore the solver to the state in which it was when the state `S' was created with MCFGetState() [see above]. @@ -1342,7 +1342,7 @@ class MCFClass { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - virtual CNumber MCFQCoef( cIndex i ) + virtual CNumber MCFQCoef( cIndex ) /**< Return the quadratic coefficients of the cost of the i-th arc. Note that the method is *not* pure virtual: an implementation is provided for "pure @@ -1524,8 +1524,8 @@ class MCFClass { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - virtual void ChgQCoef( cCRow NQCoef = NULL , cIndex_Set nms = NULL , - cIndex strt = 0 , Index stp = Inf<Index>() ) + virtual void ChgQCoef( cCRow NQCoef = NULL , cIndex_Set = NULL , + cIndex = 0 , Index = Inf<Index>() ) //HERE /**< Change the quadratic coefficients of the arc costs. In particular, change the coefficients that are: @@ -1555,7 +1555,7 @@ class MCFClass { /*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - virtual void ChgQCoef( Index arc , cCNumber NQCoef ) + virtual void ChgQCoef( Index , cCNumber NQCoef ) /**< Change the quadratic coefficient of the cost of the i-th arc. |