Changeset 333


Ignore:
Timestamp:
May 25, 2006 1:05:49 PM (13 years ago)
Author:
andreasw
Message:

finished examples subdir

Location:
trunk/Cbc
Files:
1 added
4 deleted
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r332 r333  
    6565        $(top_srcdir)/../Clp/src/CbcOrClpParam.cpp \
    6666        $(top_srcdir)/../Clp/src/CbcOrClpParam.hpp \
    67         $(top_srcdir)/configure $(top_srcdir)/inc/config_cbc.h.in \
    68         AUTHORS INSTALL
     67        $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \
     68        $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL
    6969@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_2 = .Externals-stamp
    7070@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_3 = Externals
     
    7979mkinstalldirs = $(install_sh) -d
    8080CONFIG_HEADER = $(top_builddir)/inc/config_cbc.h
    81 CONFIG_CLEAN_FILES = cbc_addlibs.txt
     81CONFIG_CLEAN_FILES = examples/Makefile cbc_addlibs.txt \
     82        examples/sudoku_sample.csv examples/quad.mps \
     83        examples/quad2.mps
    8284SOURCES =
    8385DIST_SOURCES =
     
    358360distclean-hdr:
    359361        -rm -f inc/config_cbc.h inc/stamp-h1
     362examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
     363        cd $(top_builddir) && $(SHELL) ./config.status $@
    360364cbc_addlibs.txt: $(top_builddir)/config.status $(srcdir)/cbc_addlibs.txt.in
    361365        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    506510        $(am__remove_distdir)
    507511        mkdir $(distdir)
    508         $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/../Clp/src $(distdir)/inc
     512        $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/../Clp/src $(distdir)/examples $(distdir)/inc
    509513        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    510514        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/Cbc/configure

    r332 r333  
    2105321053
    2105421054##############################################################################
     21055#                   VPATH links for example input files                      #
     21056##############################################################################
     21057
     21058# In case this is a VPATH configuration we need to make sure that the
     21059# input files for the examples are available in the VPATH directory.
     21060
     21061echo "$as_me:$LINENO: checking whether this is a VPATH configuration" >&5
     21062echo $ECHO_N "checking whether this is a VPATH configuration... $ECHO_C" >&6
     21063if test `cd $srcdir; pwd` != `pwd`; then
     21064  coin_vpath_config=yes;
     21065else
     21066  coin_vpath_config=no;
     21067fi
     21068echo "$as_me:$LINENO: result: $coin_vpath_config" >&5
     21069echo "${ECHO_T}$coin_vpath_config" >&6
     21070
     21071
     21072if test $coin_vpath_config = yes; then
     21073            ac_config_links="$ac_config_links examples/sudoku_sample.csv:examples/sudoku_sample.csv"
     21074
     21075fi
     21076
     21077
     21078if test $coin_vpath_config = yes; then
     21079            ac_config_links="$ac_config_links examples/quad.mps:examples/quad.mps"
     21080
     21081fi
     21082
     21083
     21084if test $coin_vpath_config = yes; then
     21085            ac_config_links="$ac_config_links examples/quad2.mps:examples/quad2.mps"
     21086
     21087fi
     21088
     21089
     21090##############################################################################
    2105521091#                   Finishing up by writing all the output                   #
    2105621092##############################################################################
     
    2105821094# Here list all the files that configure should create (except for the
    2105921095# configuration header file)
    21060                                         ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile cbc_addlibs.txt"
     21096                                                  ac_config_files="$ac_config_files Makefile examples/Makefile src/Makefile test/Makefile cbc_addlibs.txt"
    2106121097
    2106221098
     
    2175921795  # Handling of arguments.
    2176021796  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     21797  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
    2176121798  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    2176221799  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     
    2176421801  "src/CbcOrClpParam.cpp" ) CONFIG_LINKS="$CONFIG_LINKS src/CbcOrClpParam.cpp:../Clp/src/CbcOrClpParam.cpp" ;;
    2176521802  "src/CbcOrClpParam.hpp" ) CONFIG_LINKS="$CONFIG_LINKS src/CbcOrClpParam.hpp:../Clp/src/CbcOrClpParam.hpp" ;;
     21803  "examples/sudoku_sample.csv" ) CONFIG_LINKS="$CONFIG_LINKS examples/sudoku_sample.csv:examples/sudoku_sample.csv" ;;
     21804  "examples/quad.mps" ) CONFIG_LINKS="$CONFIG_LINKS examples/quad.mps:examples/quad.mps" ;;
     21805  "examples/quad2.mps" ) CONFIG_LINKS="$CONFIG_LINKS examples/quad2.mps:examples/quad2.mps" ;;
    2176621806  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2176721807  "inc/config_cbc.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_cbc.h" ;;
  • trunk/Cbc/configure.ac

    r332 r333  
    115115
    116116##############################################################################
     117#                   VPATH links for example input files                      #
     118##############################################################################
     119
     120# In case this is a VPATH configuration we need to make sure that the
     121# input files for the examples are available in the VPATH directory.
     122
     123AC_COIN_VPATH_LINK(examples/sudoku_sample.csv)
     124AC_COIN_VPATH_LINK(examples/quad.mps)
     125AC_COIN_VPATH_LINK(examples/quad2.mps)
     126
     127##############################################################################
    117128#                   Finishing up by writing all the output                   #
    118129##############################################################################
     
    121132# configuration header file)
    122133AC_CONFIG_FILES([Makefile
     134                 examples/Makefile
    123135                 src/Makefile
    124136                 test/Makefile
  • trunk/Cbc/examples/crew.cpp

    r86 r333  
    3535  // Read in model using argv[1]
    3636  // and assert that it is a clean model
    37   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     37  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    3838  if (argc>=2) mpsFileName = argv[1];
    3939  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/driver.cpp

    r100 r333  
    3636  // Read in model using argv[1]
    3737  // and assert that it is a clean model
    38   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     38  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    3939  if (argc>=2) mpsFileName = argv[1];
    4040  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/driver2.cpp

    r100 r333  
    3636  // Read in model using argv[1]
    3737  // and assert that it is a clean model
    38   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     38  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    3939  if (argc>=2) mpsFileName = argv[1];
    4040  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/fast0507.cpp

    r176 r333  
    7070  // Read in model using argv[1]
    7171  // and assert that it is a clean model
    72   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     72  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    7373  if (argc>=2) mpsFileName = argv[1];
    7474  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/fast0507b.cpp

    r176 r333  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.h"
    79
    810#include <cassert>
     
    7577  // Read in model using argv[1]
    7678  // and assert that it is a clean model
    77   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     79  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    7880  if (argc>=2) mpsFileName = argv[1];
    7981  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/hotstart.cpp

    r230 r333  
    6060  // Read in model using argv[1]
    6161  // and assert that it is a clean model
    62   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     62  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    6363  if (argc>=2) mpsFileName = argv[1];
    6464  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/longthin.cpp

    r176 r333  
    4444  // Read in model using argv[1]
    4545  // and assert that it is a clean model
    46   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     46  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    4747  if (argc>=2) mpsFileName = argv[1];
    4848  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/lotsize.cpp

    r65 r333  
    3636  // Read in model using argv[1]
    3737  // and assert that it is a clean model
    38   std::string mpsFileName = "miplib3/10teams";
     38  std::string mpsFileName = "../../Data/miplib3/10teams";
    3939  if (argc>=2) mpsFileName = argv[1];
    4040  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/minimum.cpp

    r79 r333  
    1212  // Read in example model
    1313  // and assert that it is a clean model
    14   int numMpsReadErrors = solver1.readMps("../../Mps/Sample/p0033.mps","");
     14  int numMpsReadErrors = solver1.readMps("../../Data/Sample/p0033.mps","");
    1515  assert(numMpsReadErrors==0);
    1616
  • trunk/Cbc/examples/nway.cpp

    r215 r333  
    3535  // Read in model using argv[1]
    3636  // and assert that it is a clean model
    37   std::string mpsFileName = "miplib3/10teams";
     37  std::string mpsFileName = "../../Data/miplib3/10teams";
    3838  if (argc>=2) mpsFileName = argv[1];
    3939  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/repeat.cpp

    r234 r333  
    6565  // Read in model using argv[1]
    6666  // and assert that it is a clean model
    67   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     67  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    6868  if (argc>=2) mpsFileName = argv[1];
    6969  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/sample1.cpp

    r2 r333  
    88#include <cassert>
    99
     10#include "CbcConfig.h"
     11
    1012// For Branch and bound
    1113#include "OsiSolverInterface.hpp"
    1214#include "CbcModel.hpp"
    1315
    14 #ifdef COIN_USE_CLP
     16#ifdef COIN_HAS_CLP
    1517#include "OsiClpSolverInterface.hpp"
    1618#endif
     
    8082  // Define your favorite OsiSolver
    8183 
    82 #ifdef COIN_USE_CLP
     84#ifdef COIN_HAS_CLP
    8385  ClpSimplex simplex;
    8486#endif
  • trunk/Cbc/examples/sample2.cpp

    r225 r333  
    7373  // Read in model using argv[1]
    7474  // and assert that it is a clean model
    75   std::string mpsFileName = "../../Mps/Sample/p0033.mps";
     75  std::string mpsFileName = "../../Data/Sample/p0033.mps";
    7676  if (argc>=2) mpsFileName = argv[1];
    7777  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/examples/sample3.cpp

    r176 r333  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.h"
    79
    810#include <assert.h>
     
    1820#include "CbcCutGenerator.hpp"
    1921#include "CbcHeuristicLocal.hpp"
    20 #ifdef COIN_USE_CLP
     22#ifdef COIN_HAS_CLP
    2123#include "OsiClpSolverInterface.hpp"
    2224#endif
    23 #ifdef COIN_USE_OSL
     25#ifdef COIN_HAS_OSL
    2426#include "OsiOslSolverInterface.hpp"
    2527#endif
     
    9092  // Define your favorite OsiSolver
    9193 
    92 #ifdef COIN_USE_CLP
     94#ifdef COIN_HAS_CLP
    9395  OsiClpSolverInterface solver1;
    9496  //solver1.messageHandler()->setLogLevel(0);
    9597  solver1.getModelPtr()->setDualBound(1.0e10);
    9698#endif
    97 #ifdef COIN_USE_OSL
     99#ifdef COIN_HAS_OSL
    98100  OsiOslSolverInterface solver1;
    99101  //solver1.messageHandler()->setLogLevel(0);
  • trunk/Cbc/examples/sample4.cpp

    r2 r333  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.h"
    79
    810#include <cassert>
     
    1719#include "CbcCompareUser.hpp"
    1820#include "CoinTime.hpp"
    19 #ifdef COIN_USE_CLP
     21#ifdef COIN_HAS_CLP
    2022#include "OsiClpSolverInterface.hpp"
    2123#endif
     
    4143  // Define your favorite OsiSolver
    4244 
    43 #ifdef COIN_USE_CLP
     45#ifdef COIN_HAS_CLP
    4446  OsiClpSolverInterface solver1;
    4547  //solver1.messageHandler()->setLogLevel(0);
  • trunk/Cbc/examples/sample5.cpp

    r176 r333  
    55#  pragma warning(disable:4786)
    66#endif
     7
     8#include "CbcConfig.h"
    79
    810#include <cassert>
     
    1719#include "CbcCutGenerator.hpp"
    1820#include "CbcHeuristicLocal.hpp"
    19 #ifdef COIN_USE_CLP
     21#ifdef COIN_HAS_CLP
    2022#include "OsiClpSolverInterface.hpp"
    2123#endif
    22 #ifdef COIN_USE_OSL
     24#ifdef COIN_HAS_OSL
    2325#include "OsiOslSolverInterface.hpp"
    2426#endif
     
    7779  */
    7880 
    79 #ifdef COIN_USE_CLP
     81#ifdef COIN_HAS_CLP
    8082  OsiClpSolverInterface solver1;
    81 #elif COIN_USE_OSL
     83#elif COIN_HAS_OSL
    8284  OsiOslSolverInterface solver1;
    8385#endif
     
    210212  model.addCutGenerator(&mixedGen,-1,"MixedIntegerRounding");
    211213
    212 #ifdef COIN_USE_CLP
     214#ifdef COIN_HAS_CLP
    213215  OsiClpSolverInterface * osiclp = dynamic_cast< OsiClpSolverInterface*> (model.solver());
    214216  // go faster stripes
  • trunk/Cbc/examples/sos.cpp

    r60 r333  
    3535  // Read in model using argv[1]
    3636  // and assert that it is a clean model
    37   std::string mpsFileName = "miplib3/10teams";
     37  std::string mpsFileName = "../../Data/miplib3/10teams";
    3838  if (argc>=2) mpsFileName = argv[1];
    3939  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • trunk/Cbc/src/Makefile.am

    r332 r333  
    228228# and that therefore should be installed in 'install'
    229229include_HEADERS = \
     230        ../inc/config_cbc.h \
    230231        CbcBranchActual.hpp \
    231232        CbcBranchBase.hpp \
     233        CbcBranchLotsize.hpp \
     234        CbcBranchCut.hpp \
    232235        CbcCompareActual.hpp \
    233236        CbcCompareBase.hpp \
  • trunk/Cbc/src/Makefile.in

    r332 r333  
    518518# and that therefore should be installed in 'install'
    519519include_HEADERS = \
     520        ../inc/config_cbc.h \
    520521        CbcBranchActual.hpp \
    521522        CbcBranchBase.hpp \
     523        CbcBranchLotsize.hpp \
     524        CbcBranchCut.hpp \
    522525        CbcCompareActual.hpp \
    523526        CbcCompareBase.hpp \
     
    772775
    773776distdir: $(DISTFILES)
     777        $(mkdir_p) $(distdir)/../inc
    774778        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    775779        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.