Changeset 2096 for trunk/Cbc


Ignore:
Timestamp:
Nov 18, 2014 9:19:47 AM (5 years ago)
Author:
forrest
Message:

fix lack of threads

File:
1 edited

Legend:

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

    r2095 r2096  
    45654565  */
    45664566#ifndef NUMBER_THREADS
    4567 #define NUMBER_THREADS 1
     4567#define NUMBER_THREADS 4
    45684568#endif
    45694569  int status[NUMBER_THREADS];
     
    51845184      temp->getDblParam(OsiObjOffset, offset);
    51855185      temp->addRow(n,indices,obj,-COIN_DBL_MAX,CoinMin(cutoff,1.0e25)+offset);
     5186#if defined (CBC_THREAD) && defined (COIN_HAS_CLP)
    51865187      for (int iThread=0;iThread<numberThreads;iThread++) {
    51875188        OsiSolverInterface * solver=
     
    51895190        solver->addRow(n,indices,obj,-COIN_DBL_MAX,CoinMin(cutoff,1.0e25)+offset);
    51905191      }
     5192#endif
    51915193    }
    51925194    // zero objective
     
    51955197    }
    51965198    temp->setObjective(newLower);
     5199#if defined (CBC_THREAD) && defined (COIN_HAS_CLP)
    51975200    for (int iThread=0;iThread<numberThreads;iThread++) {
    51985201      OsiSolverInterface * solver=
     
    52025205      threadNeedsRefreshing[iThread]=3;
    52035206    }
     5207#endif
    52045208    for (int i = 0; i < numberColumns; i++) {
    52055209      newLower[i]=lower[i];
Note: See TracChangeset for help on using the changeset viewer.