Changeset 1122


Ignore:
Timestamp:
Jan 15, 2009 9:38:09 AM (11 years ago)
Author:
forrest
Message:

compiler errors if not --enable-cbc-parallel

File:
1 edited

Legend:

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

    r1121 r1122  
    23842384  numberLongStrong_=0;
    23852385  double totalTime = 0.0;
     2386#ifdef CBC_THREAD
    23862387  CbcNode * createdNode=NULL;
    2387 #ifdef CBC_THREAD
    23882388  CbcModel ** threadModel = NULL;
    23892389  Coin_pthread_t * threadId = NULL;
     
    25382538  int lastPrintEvery=0;
    25392539  while (true) {
     2540#ifdef CBC_THREAD
    25402541    if (parallelMode()>0&&!locked) {
    25412542      lockThread();
    25422543      locked=true;
    25432544    }
     2545#endif
    25442546#ifdef COIN_HAS_CLP
    25452547    // Possible change of pivot method
     
    25722574#endif
    25732575    if (tree_->empty()) {
     2576#ifdef CBC_THREAD
    25742577      if (parallelMode()>0) {
    25752578#ifdef COIN_DEVELOP
     
    26792682        locked=false; // not needed as break
    26802683      }
     2684#endif
    26812685      break;
    26822686    }
     2687#ifdef CBC_THREAD
    26832688    if (parallelMode()>0) {
    26842689      unlockThread();
    26852690      locked = false;
    26862691    }
     2692#endif
    26872693    // If done 100 nodes see if worth trying reduction
    26882694    if (numberNodes_==100&&saveSolver) {
     
    30383044  active subproblem.
    30393045*/
     3046#ifdef CBC_THREAD
    30403047    CbcNode * node=NULL;
    30413048    if (!parallelMode()||parallelMode()==-1) {
     
    30463053      // Do main work of solving node here
    30473054      doOneNode(this,node,createdNode);
     3055#endif
     3056#ifdef CBC_THREAD
    30483057    } else if (parallelMode()>0) {
    30493058      node = tree_->bestNode(cutoff) ;
     
    32823291      }
    32833292    }
     3293#endif
    32843294  }
    32853295  if (nDeleteNode) {
Note: See TracChangeset for help on using the changeset viewer.