Changeset 1123


Ignore:
Timestamp:
Jan 15, 2009 10:17:28 AM (11 years ago)
Author:
forrest
Message:

trying without parallel again

File:
1 edited

Legend:

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

    r1122 r1123  
    23842384  numberLongStrong_=0;
    23852385  double totalTime = 0.0;
     2386  CbcNode * createdNode=NULL;
    23862387#ifdef CBC_THREAD
    2387   CbcNode * createdNode=NULL;
    23882388  CbcModel ** threadModel = NULL;
    23892389  Coin_pthread_t * threadId = NULL;
     
    30443044  active subproblem.
    30453045*/
     3046    CbcNode * node=NULL;
    30463047#ifdef CBC_THREAD
    3047     CbcNode * node=NULL;
    30483048    if (!parallelMode()||parallelMode()==-1) {
     3049#endif
    30493050      node = tree_->bestNode(cutoff) ;
    30503051      // Possible one on tree worse than cutoff
     
    30533054      // Do main work of solving node here
    30543055      doOneNode(this,node,createdNode);
    3055 #endif
    30563056#ifdef CBC_THREAD
    30573057    } else if (parallelMode()>0) {
Note: See TracChangeset for help on using the changeset viewer.