Changeset 885


Ignore:
Timestamp:
Aug 3, 2012 9:43:44 AM (7 years ago)
Author:
pbelotti
Message:

updating to SCIP 3.0.0

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
        4 ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/stable/1.3
        5 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        6 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
        7 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
        8 ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.0
        9 ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/stable/1.0
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        11 Cbc  https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
        12 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
        13 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
        14 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
        15 Ipopt  https://projects.coin-or.org/svn/Ipopt/stable/3.10/Ipopt
        16 Bonmin  https://projects.coin-or.org/svn/Bonmin/stable/1.5/Bonmin
        17 
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.3/
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.3/
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.2.2/
         4ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.3/
         5ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.3/
         6ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.3/
         7ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.3/
         8ThirdParty/SoPlex  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/trunk
         9ThirdParty/SCIP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/trunk
         10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.7/CoinUtils
         11Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.7/Cbc
         12Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.3/Cgl
         13Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.7/Clp
         14Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.4/Osi
         15Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.2/Ipopt
         16Bonmin  https://projects.coin-or.org/svn/Bonmin/releases/1.5.3/Bonmin
    • Property svn:mergeinfo changed
      /stable/0.4merged: 881
  • trunk/Couenne

  • trunk/Couenne/configure

    r786 r885  
    18061806
    18071807    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    1808     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
     1808    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    18091809      COUENNE_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    18101810
  • trunk/Couenne/src/branch

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/Couenne/src/expression/operators/exprGroup.cpp

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/Couenne/src/main/BonCouenne.cpp

    r875 r885  
    445445                nSGcomputations
    446446#else
    447                 -1,-1
     447                -1., -1
    448448#endif
    449449);
  • trunk/Couenne/src/main/CouenneBab.cpp

    r875 r885  
    265265        objects[i]->setModel(&model_);
    266266      }
    267       model_.addObjects(s.objects().size(), objects);
     267      model_.addObjects ((int) s.objects().size(), objects);
    268268      delete [] objects;
    269269    }
     
    479479          OsiCuts cuts;
    480480          cgl.generateCuts(*model_.solver(), cuts);
    481           std::vector<OsiRowCut *> mycuts(cuts.sizeRowCuts());
     481          std::vector<const OsiRowCut *> mycuts(cuts.sizeRowCuts());
    482482          for(int i = 0 ; i < cuts.sizeRowCuts() ; i++){
    483483            mycuts[i] = cuts.rowCutPtr(i);
    484484          }
    485           model_.solver()->applyRowCuts(mycuts.size(), (const OsiRowCut **) &mycuts[0]);
     485          model_. solver () -> applyRowCuts ((int) mycuts.size(), (const OsiRowCut **) &mycuts[0]);
    486486        }
    487487
  • trunk/Dependencies

    r758 r885  
    66ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
    77ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
    8 ThirdParty/SoPlex https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/stable/1.0
    9 ThirdParty/SCIP   https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/stable/1.0
     8ThirdParty/SoPlex https://projects.coin-or.org/svn/BuildTools/ThirdParty/SoPlex/trunk
     9ThirdParty/SCIP   https://projects.coin-or.org/svn/BuildTools/ThirdParty/SCIP/trunk
    1010CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
    1111Cbc               https://projects.coin-or.org/svn/Cbc/stable/2.7/Cbc
Note: See TracChangeset for help on using the changeset viewer.