Changeset 301


Ignore:
Timestamp:
Oct 29, 2009 4:56:10 PM (10 years ago)
Author:
bjarni
Message:

Call CoinGetRealOption? for REAL option parameters

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/1.4/CoinMP/src/CoinMP.cpp

    r300 r301  
    13021302        if (CoinGetOptionChanged(hProb, COIN_INT_MAXITER))                      pCoin->clp->setMaximumIterations(CoinGetIntOption(hProb, COIN_INT_MAXITER));
    13031303
    1304         if (CoinGetOptionChanged(hProb, COIN_REAL_PRIMALOBJLIM))        pCoin->clp->setPrimalObjectiveLimit(CoinGetIntOption(hProb, COIN_REAL_PRIMALOBJLIM));
    1305         if (CoinGetOptionChanged(hProb, COIN_REAL_DUALOBJLIM))          pCoin->clp->setDualObjectiveLimit(CoinGetIntOption(hProb, COIN_REAL_DUALOBJLIM));
    1306         if (CoinGetOptionChanged(hProb, COIN_REAL_PRIMALOBJTOL))        pCoin->clp->setPrimalTolerance(CoinGetIntOption(hProb, COIN_REAL_PRIMALOBJTOL));
    1307         if (CoinGetOptionChanged(hProb, COIN_REAL_DUALOBJTOL))          pCoin->clp->setDualTolerance(CoinGetIntOption(hProb, COIN_REAL_DUALOBJTOL));
     1304        if (CoinGetOptionChanged(hProb, COIN_REAL_PRIMALOBJLIM))        pCoin->clp->setPrimalObjectiveLimit(CoinGetRealOption(hProb, COIN_REAL_PRIMALOBJLIM));
     1305        if (CoinGetOptionChanged(hProb, COIN_REAL_DUALOBJLIM))          pCoin->clp->setDualObjectiveLimit(CoinGetRealOption(hProb, COIN_REAL_DUALOBJLIM));
     1306        if (CoinGetOptionChanged(hProb, COIN_REAL_PRIMALOBJTOL))        pCoin->clp->setPrimalTolerance(CoinGetRealOption(hProb, COIN_REAL_PRIMALOBJTOL));
     1307        if (CoinGetOptionChanged(hProb, COIN_REAL_DUALOBJTOL))          pCoin->clp->setDualTolerance(CoinGetRealOption(hProb, COIN_REAL_DUALOBJTOL));
    13081308
    13091309        if (CoinGetOptionChanged(hProb, COIN_INT_PRIMALPIVOTALG)) {
     
    13191319        if (CoinGetOptionChanged(hProb, COIN_INT_CRASHIND)) {
    13201320                if (CoinGetIntOption(hProb, COIN_INT_CRASHIND)) {
    1321                         pCoin->clp->crash(CoinGetIntOption(hProb, COIN_REAL_CRASHGAP),
     1321                        pCoin->clp->crash(CoinGetRealOption(hProb, COIN_REAL_CRASHGAP),
    13221322                                                                CoinGetIntOption(hProb, COIN_INT_CRASHPIVOT));
    13231323                }
Note: See TracChangeset for help on using the changeset viewer.