Ignore:
Timestamp:
Jun 19, 2011 1:23:14 PM (10 years ago)
Author:
stefan
Message:

sync with trunk rev1674

Location:
stable/2.7
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7

    • 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/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
        6 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        7 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
        8 Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
        9 Clp  https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
        10 Osi  https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.2
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.3
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.8
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         8Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
         9Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
         10CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.8/CoinUtils
         11Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.57/Cgl
         12Clp               https://projects.coin-or.org/svn/Clp/stable/1.14/Clp
         13Osi               https://projects.coin-or.org/svn/Osi/stable/0.105/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 1578,​1582-1587,​1589-1600,​1603-1614,​1620-1626,​1631-1633,​1635-1636,​1638-1646,​1650-1652,​1654-1658,​1660-1663,​1665-1671,​1673-1674
  • stable/2.7/Cbc

  • stable/2.7/Cbc/examples/Makefile.in

    r1565 r1675  
    1919# CHANGEME: Here is the name of all object files corresponding to the source
    2020#           code that you wrote in order to define the problem statement
    21 OBJS =  $(DRIVER).@OBJEXT@ \
    22         CbcCompareUser.@OBJEXT@ \
    23         CbcSolver2.@OBJEXT@ \
    24         CbcSolver3.@OBJEXT@ \
    25         ClpQuadInterface.@OBJEXT@ \
    26         CbcBranchFollow2.@OBJEXT@ \
    27         CbcBranchUser.@OBJEXT@ \
    28         CbcBranchLink.@OBJEXT@
     21OBJS =  $(DRIVER).@OBJEXT@
     22
     23#       CbcCompareUser.@OBJEXT@ \
     24#       CbcSolver2.@OBJEXT@ \
     25#       CbcSolver3.@OBJEXT@ \
     26#       ClpQuadInterface.@OBJEXT@ \
     27#       CbcBranchFollow2.@OBJEXT@ \
     28#       CbcBranchUser.@OBJEXT@ \
     29#       CbcBranchLink.@OBJEXT@
    2930
    3031# CHANGEME: Additional libraries
     
    9596else
    9697  ifeq ($(COIN_CXX_IS_CL), TRUE)
    97     LIBS = /link /libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbcSolver.lib libCbc.lib libOsiCbc.lib @CBCLIB_LIBS_INSTALLED@
     98    LIBS = -link -libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbcSolver.lib libCbc.lib libOsiCbc.lib @CBCLIB_LIBS_INSTALLED@
    9899  else
    99100    LIBS = -L@abs_lib_dir@ -lCbcSolver -lCbc -lOsiCbc @CBCLIB_LIBS_INSTALLED@
  • stable/2.7/Cbc/examples/driver4.cpp

    r1574 r1675  
    1515#include "CbcModel.hpp"
    1616#include "OsiClpSolverInterface.hpp"
    17 #include "CbcCompareUser.hpp"
    1817#include "CbcSolver.hpp"
    1918
     
    7574  case 3:
    7675    {
    77       CbcCompareUser compare;
    78       model->setNodeComparison(compare);
     76      //CbcCompareUser compare;
     77      //model->setNodeComparison(compare);
    7978    }
    8079    break;
  • stable/2.7/Cbc/examples/sample1.cpp

    r1574 r1675  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127
    138#include "CbcConfig.h"
     9#include "CoinPragma.hpp"
    1410
    1511// For Branch and bound
     
    1713#include "CbcModel.hpp"
    1814
    19 #ifdef COIN_HAS_CLP
    2015#include "OsiClpSolverInterface.hpp"
    21 #endif
    2216#include "ClpPresolve.hpp"
    2317#include "CbcCompareUser.hpp"
     
    8579  // Define your favorite OsiSolver
    8680 
    87 #ifdef COIN_HAS_CLP
    8881  ClpSimplex simplex;
    89 #endif
    9082  double time0 = cpuTime();
    9183  double time1 = time0;
  • stable/2.7/Cbc/examples/sample2.cpp

    r1574 r1675  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include <cassert>
    127#include <iomanip>
    138
     9#include "CoinPragma.hpp"
    1410
    1511// For Branch and bound
  • stable/2.7/Cbc/examples/sample3.cpp

    r1574 r1675  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include "CbcConfig.h"
     7
     8#include "CoinPragma.hpp"
    129
    1310#include <assert.h>
     
    2320#include "CbcCutGenerator.hpp"
    2421#include "CbcHeuristicLocal.hpp"
    25 #ifdef COIN_HAS_CLP
    2622#include "OsiClpSolverInterface.hpp"
    27 #endif
    28 #ifdef COIN_HAS_OSL
    29 #include "OsiOslSolverInterface.hpp"
    30 #endif
    3123
    3224// Cuts
     
    9587  // Define your favorite OsiSolver
    9688 
    97 #ifdef COIN_HAS_CLP
    9889  OsiClpSolverInterface solver1;
    9990  //solver1.messageHandler()->setLogLevel(0);
    10091  solver1.getModelPtr()->setDualBound(1.0e10);
    101 #endif
    102 #ifdef COIN_HAS_OSL
    103   OsiOslSolverInterface solver1;
    104   //solver1.messageHandler()->setLogLevel(0);
    105 #endif
    10692
    10793  // Read in model using argv[1]
  • stable/2.7/Cbc/examples/sample4.cpp

    r1574 r1675  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include "CbcConfig.h"
     7
     8#include "CoinPragma.hpp"
    129
    1310#include <cassert>
     
    2219#include "CbcCompareUser.hpp"
    2320#include "CoinTime.hpp"
    24 #ifdef COIN_HAS_CLP
    2521#include "OsiClpSolverInterface.hpp"
    26 #endif
    2722
    2823//#############################################################################
     
    4641  // Define your favorite OsiSolver
    4742 
    48 #ifdef COIN_HAS_CLP
    4943  OsiClpSolverInterface solver1;
    5044  //solver1.messageHandler()->setLogLevel(0);
    5145  CbcModel model(solver1);
    52 #endif
    5346  model.solver()->setHintParam(OsiDoReducePrint,true,OsiHintTry);
    5447
  • stable/2.7/Cbc/examples/sample5.cpp

    r1574 r1675  
    44// This code is licensed under the terms of the Eclipse Public License (EPL).
    55
    6 #if defined(_MSC_VER)
    7 // Turn off compiler warning about long names
    8 #  pragma warning(disable:4786)
    9 #endif
    10 
    116#include "CbcConfig.h"
     7
     8#include "CoinPragma.hpp"
    129
    1310#include <cassert>
     
    2219#include "CbcCutGenerator.hpp"
    2320#include "CbcHeuristicLocal.hpp"
    24 #ifdef COIN_HAS_CLP
    2521#include "OsiClpSolverInterface.hpp"
    26 #endif
    27 #ifdef COIN_HAS_OSL
    28 #include "OsiOslSolverInterface.hpp"
    29 #endif
    3022
    3123// Cuts
     
    8274  */
    8375 
    84 #ifdef COIN_HAS_CLP
    8576  OsiClpSolverInterface solver1;
    86 #elif COIN_HAS_OSL
    87   OsiOslSolverInterface solver1;
    88 #endif
    8977  /* From now on we can build model in a solver independent way.
    9078     You can add rows one at a time but for large problems this is slow so
     
    215203  model.addCutGenerator(&mixedGen,-1,"MixedIntegerRounding");
    216204
    217 #ifdef COIN_HAS_CLP
    218205  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (model.solver());
    219206  // go faster stripes
     
    223210    printf("may not be safe if doing cuts in tree which need accuracy (level 2 anyway)\n");
    224211  }
    225 #endif
    226212
    227213  // Allow rounding heuristic
Note: See TracChangeset for help on using the changeset viewer.