Ignore:
Timestamp:
Jan 17, 2008 4:21:23 PM (12 years ago)
Author:
forrest
Message:

allow dense solver

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CoinSolve.cpp

    r824 r857  
    246246#include "CbcSolver.hpp"
    247247void addAmplToCbc(CbcSolver *);
     248extern bool malloc_counts_on;
     249extern void stolen_from_ekk_memory(void * info,int type);
    248250int main (int argc, const char *argv[])
    249251{
    250   OsiClpSolverInterface solver1;
    251   CbcSolver control(solver1);
    252   // initialize
    253   control.fillValuesInSolver();
     252  int returnCode;
     253  // Only active if malloc switched on in CbcSolver.cpp
     254  stolen_from_ekk_memory(NULL,0);
     255  malloc_counts_on=true;
     256  {
     257    OsiClpSolverInterface solver1;
     258    CbcSolver control(solver1);
     259    // initialize
     260    control.fillValuesInSolver();
    254261#ifdef COIN_HAS_ASL
    255   addAmplToCbc(&control);
    256 #endif
    257   int returnCode= control.solve (argc, argv, 1);
     262    addAmplToCbc(&control);
     263#endif
     264    returnCode= control.solve (argc, argv, 1);
     265  }
     266  stolen_from_ekk_memory(NULL,1);
     267  malloc_counts_on=false;
    258268  return returnCode;
    259269}
Note: See TracChangeset for help on using the changeset viewer.