Ignore:
Timestamp:
Aug 25, 2008 10:59:58 AM (11 years ago)
Author:
forrest
Message:

BSP changes from 1247 to 1259

File:
1 edited

Legend:

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

    r1197 r1264  
    784784    for (iSequence=0;iSequence<numberTotal;iSequence++) {
    785785      double value=solution[iSequence];
    786       int iStatus = status_[iSequence];
     786      unsigned char iStatus = status_[iSequence];
    787787      assert (currentStatus(iStatus)==CLP_SAME);
    788788      double lowerValue=lower[iSequence];
     
    989989    int numberTotal = numberColumns_+numberRows_;
    990990    for (iSequence=0;iSequence<numberTotal;iSequence++) {
    991       int iStatus = status_[iSequence];
     991      unsigned char iStatus = status_[iSequence];
    992992      assert (currentStatus(iStatus)==CLP_SAME);
    993993      double lowerValue=lower[iSequence];
     
    10601060      double alpha = multiplier*array[iRow];
    10611061      double value = solution[iSequence];
    1062       int iStatus = status_[iSequence];
     1062      unsigned char iStatus = status_[iSequence];
    10631063      int iWhere = currentStatus(iStatus);
    10641064      if (iWhere==CLP_SAME)
     
    11461146      int iSequence = pivotVariable[iRow];
    11471147      double value = solution[iSequence];
    1148       int iStatus = status_[iSequence];
     1148      unsigned char iStatus = status_[iSequence];
    11491149      int iWhere = currentStatus(iStatus);
    11501150      int original = originalStatus(iStatus);
     
    12561256      int iSequence = pivotVariable[iRow];
    12571257      double value=solution[iSequence];
    1258       int iStatus = status_[iSequence];
     1258      unsigned char iStatus = status_[iSequence];
    12591259      assert (currentStatus(iStatus)==CLP_SAME);
    12601260      double lowerValue=lower[iSequence];
     
    13691369      int iSequence = pivotVariable[iRow];
    13701370      double value=solution[iSequence];
    1371       int iStatus = status_[iSequence];
     1371      unsigned char iStatus = status_[iSequence];
    13721372      assert (currentStatus(iStatus)==CLP_SAME);
    13731373      double lowerValue=lower[iSequence];
     
    15121512    double * lower = model_->lowerRegion();
    15131513    double * cost = model_->costRegion();
    1514     int iStatus = status_[iSequence];
     1514    unsigned char iStatus = status_[iSequence];
    15151515    assert (currentStatus(iStatus)==CLP_SAME);
    15161516    double lowerValue=lower[iSequence];
     
    17131713    double * lower = model_->lowerRegion();
    17141714    double * cost = model_->costRegion();
    1715     int iStatus = status_[iSequence];
     1715    unsigned char iStatus = status_[iSequence];
    17161716    assert (currentStatus(iStatus)==CLP_SAME);
    17171717    double lowerValue=lower[iSequence];
Note: See TracChangeset for help on using the changeset viewer.