Changeset 409


Ignore:
Timestamp:
Jul 13, 2006 5:40:00 PM (13 years ago)
Author:
forrest
Message:

now that I understand .am

Location:
branches/devel/Cbc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/examples/ClpDynamicInterface.cpp

    r403 r409  
    139139      if (nInt==numberColumns2&&!iPass&&!cbcModel_->getNodeCount())
    140140        printf("pure 0-1 problem\n");
    141 #define ENUMERATE
     141      //#define ENUMERATE
    142142#ifndef ENUMERATE
    143143      CbcModel small(solver);
  • branches/devel/Cbc/examples/Makefile.in

    r393 r409  
    2323        CbcSolver2.@OBJEXT@ \
    2424        CbcSolver3.@OBJEXT@ \
     25        ClpDynamicInterface.@OBJEXT@ \
    2526        ClpQuadInterface.@OBJEXT@ \
     27        CoinWarmStartBasisDynamic.@OBJEXT@ \
    2628        CbcBranchFollow2.@OBJEXT@ \
    2729        CbcBranchUser.@OBJEXT@ \
     
    8082        driver2.@OBJEXT@ driver2@EXEEXT@ \
    8183        driver.@OBJEXT@ driver@EXEEXT@ \
     84        dynamic.@OBJEXT@ dynamic@EXEEXT@ \
    8285        fast0507b.@OBJEXT@ fast0507b@EXEEXT@ \
    8386        fast0507.@OBJEXT@ fast0507@EXEEXT@ \
  • branches/devel/Cbc/examples/dynamic.cpp

    r403 r409  
    3737  // Read in model using argv[1]
    3838  // and assert that it is a clean model
    39   std::string mpsFileName = "miplib3/mkc";
     39  std::string mpsFileName = "../../Data/miplib3/mkc";
    4040  if (argc>=2) mpsFileName = argv[1];
    4141  int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
  • branches/devel/Cbc/src/Makefile.am

    r406 r409  
    249249        CbcCutGenerator.hpp \
    250250        CbcEventHandler.hpp \
     251        CbcFeasibilityBase.hpp \
    251252        CbcHeuristic.hpp \
    252253        CbcHeuristicFPump.hpp \
Note: See TracChangeset for help on using the changeset viewer.