Changeset 231


Ignore:
Timestamp:
Oct 17, 2003 1:18:14 PM (17 years ago)
Author:
forrest
Message:

For Windows

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplexPrimal.cpp

    r225 r231  
    743743        lastCleaned=-1; // carry on
    744744      }
    745       bool unflagged = unflag();
     745      bool unflagged = unflag()!=0;
    746746      if ( lastCleaned!=numberIterations_||unflagged) {
    747747        handler_->message(CLP_PRIMAL_OPTIMAL,messages_)
  • trunk/ClpSolve.cpp

    r225 r231  
    2525#endif
    2626//#############################################################################
     27#ifndef NO_INTERRUPT
    2728// Allow for interrupts
    2829// But is this threadsafe ? (so switched off by option
     
    3536  return;
    3637}
    37 
     38#endif
    3839/** General solve algorithm which can do presolve
    3940    special options (bits)
     
    5859  ClpMatrixBase * saveMatrix=NULL;
    5960  ClpSimplex * model2 = this;
     61#ifndef NO_INTERRUPT
    6062  bool interrupt = (options.getSpecialOption(2)==0);
    6163  sighandler_t saveSignal=SIG_DFL;
     
    6567    saveSignal = signal(SIGINT,signal_handler);
    6668  }
     69#endif
    6770  ClpPresolve pinfo;
    6871  double timePresolve=0.0;
     
    193196    }
    194197  }
     198#ifndef NO_INTERRUPT
    195199  if (interrupt)
    196200    currentModel = model2;
     201#endif
    197202  // See if worth trying +- one matrix
    198203  bool plusMinus=false;
     
    686691    // We will be using all rows
    687692    int * whichRows = new int [numberRows];
    688     for (int iRow=0;iRow<numberRows;iRow++)
     693    for (iRow=0;iRow<numberRows;iRow++)
    689694      whichRows[iRow]=iRow;
    690695    double originalOffset;
     
    701706      double * sumFixed = new double[numberRows];
    702707      memset (sumFixed,0,numberRows*sizeof(double));
    703       int iRow,iColumn;
    704708      // zero out ones in small problem
    705709      for (iColumn=0;iColumn<numberSort;iColumn++) {
     
    726730      delete [] sumFixed;
    727731      // Solve
     732#ifndef NO_INTERRUPT
    728733      if (interrupt)
    729734        currentModel = &small;
     735#endif
    730736      small.primal();
    731737      totalIterations += small.numberIterations();
     
    783789      }
    784790    }
     791#ifndef NO_INTERRUPT
    785792    if (interrupt)
    786793      currentModel = model2;
     794#endif
    787795    for (i=0;i<numberArtificials;i++)
    788796      sort[i] = i + originalNumberColumns;
     
    839847    timeX=time2;
    840848    delete model2;
     849#ifndef NO_INTERRUPT
    841850    if (interrupt)
    842851      currentModel = this;
     852#endif
    843853    checkSolution();
    844854    setLogLevel(saveLevel);
     
    865875  handler_->printing(presolve==ClpSolve::presolveOn)
    866876    <<timePresolve;
    867   handler_->printing(timeIdiot)
     877  handler_->printing(timeIdiot!=0.0)
    868878    <<timeIdiot;
    869879  handler_->message()<<CoinMessageEol;
  • trunk/Test/ClpMain.cpp

    r225 r231  
    16951695                fileName = "-";
    16961696              } else {
    1697                 if (field[0]=='/'||field[0]=='~')
     1697                if (field[0]=='/'||field[0]=='~'||field[0]=='\\')
    16981698                  fileName = field;
    16991699                else
Note: See TracChangeset for help on using the changeset viewer.