Ignore:
Timestamp:
May 12, 2006 2:30:07 PM (14 years ago)
Author:
andreasw
Message:

finished (for now) conversion of Cbc to autotools

Location:
trunk
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        22Data/Netlib   https://www.coin-or.org/svn/Data/trunk/Netlib
        33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
         4Data/miplib3  https://www.coin-or.org/svn/Data/trunk/miplib3
        45CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
        56Cgl           https://www.coin-or.org/svn/Cgl/trunk/Cgl
  • trunk/Cbc/src/unitTestClp.cpp

    r310 r312  
    191191// where:
    192192//   -mpsDir: directory containing mps test files
    193 //       Default value V1="../Mps/Sample"   
     193//       Default value V1="../../Data/Sample"   
    194194//   -netlibDir: directory containing netlib files
    195 //       Default value V2="../Mps/Netlib"
     195//       Default value V2="../../Data/Netlib"
    196196//   -test
    197197//       If specified, then netlib test set run
     
    247247      std::cerr <<"  where:\n";
    248248      std::cerr <<"    -mpsDir: directory containing mps test files\n";
    249       std::cerr <<"        Default value V1=\"../Mps/Sample\"\n";
     249      std::cerr <<"        Default value V1=\"../../Data/Sample\"\n";
    250250      std::cerr <<"    -netlibDir: directory containing netlib files\n";
    251       std::cerr <<"        Default value V2=\"../Mps/Netlib\"\n";
     251      std::cerr <<"        Default value V2=\"../../Data/Netlib\"\n";
    252252      std::cerr <<"    -test\n";
    253253      std::cerr <<"        If specified, then netlib testset run.\n";
     
    264264    mpsDir=parms["-mpsDir"] + dirsep;
    265265  else
    266     mpsDir = dirsep == '/' ? "../Mps/Sample/" : "..\\Mps\\Sample\\";
     266    mpsDir = dirsep == '/' ? "../../Data/Sample/" : "..\\..\\Data\\Sample\\";
    267267 
    268268  // Set directory containing netlib data files.
     
    271271    netlibDir=parms["-netlibDir"] + dirsep;
    272272  else
    273     netlibDir = dirsep == '/' ? "../Mps/Netlib/" : "..\\Mps\\Netlib\\";
     273    netlibDir = dirsep == '/' ? "../../Data/Netlib/" : "..\\..\\Data\\Netlib\\";
    274274  if (!empty.numberRows()) {
    275275    testingMessage( "Testing ClpSimplex\n" );
     
    941941    if (returnCode) {
    942942      // probable cause is that gz not there
    943       fprintf(stderr,"Unable to open finnis.mps in COIN/Mps/Netlib!\n");
     943      fprintf(stderr,"Unable to open finnis.mps in Data/Netlib!\n");
    944944      fprintf(stderr,"Most probable cause is finnis.mps is gzipped i.e. finnis.mps.gz and libz has not been activated\n");
    945945      fprintf(stderr,"Either gunzip files or edit Makefiles/Makefile.location to get libz\n");
     
    17581758  // Set directory containing miplib data files.
    17591759  std::string miplibDir;
    1760   miplibDir = dirsep == '/' ? "./Samples/miplib3/" : ".\\Samples\\miplib3\\";
     1760  miplibDir = dirsep == '/' ? "../../Data/miplib3/" : "..\\..\\Data\\miplib3\\";
    17611761  std::string test1 = miplibDir +"p0033";
    17621762  fp=fopen(test1.c_str(),"r");
Note: See TracChangeset for help on using the changeset viewer.