Ignore:
Timestamp:
Sep 13, 2012 12:31:33 PM (7 years ago)
Author:
forrest
Message:

fix a few problems with Aboca

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/AbcSimplexParallel.cpp

    r1878 r1879  
    11321132  // get sign for finding row of tableau
    11331133  // create as packed
    1134 #ifdef MOVE_REPLACE_PART1A
     1134#if MOVE_REPLACE_PART1A > 0
    11351135  if (!abcFactorization_->usingFT()) {
    11361136#endif
    11371137    usefulArray_[arrayForBtran_].createOneUnpackedElement(pivotRow_, -directionOut_);
    11381138    abcFactorization_->updateColumnTranspose(usefulArray_[arrayForBtran_]);
    1139 #ifdef MOVE_REPLACE_PART1A
     1139#if MOVE_REPLACE_PART1A > 0
    11401140  } else {
    11411141    cilk_spawn abcFactorization_->checkReplacePart1a(&usefulArray_[arrayForReplaceColumn_],pivotRow_);
     
    11781178  //cilk
    11791179  getTableauColumnPart1Cilk();
    1180 #ifndef MOVE_REPLACE_PART1A
     1180#if MOVE_REPLACE_PART1A <= 0
    11811181  cilk_spawn getTableauColumnPart2();
     1182#if MOVE_REPLACE_PART1A == 0
    11821183  cilk_spawn checkReplacePart1();
     1184#endif
    11831185  numberFlipped=flipBounds();
    11841186  cilk_sync;
Note: See TracChangeset for help on using the changeset viewer.