[CoinMp] Correction in coinmp.cpp
Larry A. Taylor
ltaylor at seas.ucla.edu
Wed Nov 21 19:20:44 EST 2007
Skipped content of type multipart/alternative-------------- next part --------------
Index: C:/Documents and Settings/Larry A. Taylor/My Documents/COIN-OR/CoinMP/CoinMP/src/CoinMP.cpp
===================================================================
--- C:/Documents and Settings/Larry A. Taylor/My Documents/COIN-OR/CoinMP/CoinMP/src/CoinMP.cpp (revision 53)
+++ C:/Documents and Settings/Larry A. Taylor/My Documents/COIN-OR/CoinMP/CoinMP/src/CoinMP.cpp (working copy)
@@ -646,10 +646,10 @@
pCoin->clp->setMaximumIterations(CoinGetIntOption(hProb, COIN_INT_MAXITER));
- pCoin->clp->setPrimalObjectiveLimit(CoinGetIntOption(hProb, COIN_REAL_PRIMALOBJLIM));
- pCoin->clp->setDualObjectiveLimit(CoinGetIntOption(hProb, COIN_REAL_DUALOBJLIM));
- pCoin->clp->setPrimalTolerance(CoinGetIntOption(hProb, COIN_REAL_PRIMALOBJTOL));
- pCoin->clp->setDualTolerance(CoinGetIntOption(hProb, COIN_REAL_DUALOBJTOL));
+ pCoin->clp->setPrimalObjectiveLimit(CoinGetRealOption(hProb, COIN_REAL_PRIMALOBJLIM));
+ pCoin->clp->setDualObjectiveLimit(CoinGetRealOption(hProb, COIN_REAL_DUALOBJLIM));
+ pCoin->clp->setPrimalTolerance(CoinGetRealOption(hProb, COIN_REAL_PRIMALOBJTOL));
+ pCoin->clp->setDualTolerance(CoinGetRealOption(hProb, COIN_REAL_DUALOBJTOL));
/* check if it has been changed, leave alone otherwise */
ClpPrimalColumnSteepest primalSteepest(CoinGetIntOption(hProb, COIN_INT_PRIMALPIVOTALG));
@@ -659,7 +659,7 @@
pCoin->clp->setDualRowPivotAlgorithm(dualSteepest);
if (CoinGetIntOption(hProb, COIN_INT_CRASHIND)) {
- pCoin->clp->crash(CoinGetIntOption(hProb, COIN_REAL_CRASHGAP),
+ pCoin->clp->crash(CoinGetRealOption(hProb, COIN_REAL_CRASHGAP),
CoinGetIntOption(hProb, COIN_INT_CRASHPIVOT));
}
switch (CoinGetIntOption(hProb,COIN_INT_SOLVEMETHOD)) {
More information about the CoinMp
mailing list