Changeset 752


Ignore:
Timestamp:
Apr 26, 2006 1:40:37 PM (13 years ago)
Author:
forrest
Message:

check bounds

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ClpSimplex.cpp

    r751 r752  
    28512851              } else {
    28522852                columnUpperWork_[i]=upperValue*multiplier;
    2853                 if (columnUpperWork_[i]-columnLowerWork_[i]<=primalTolerance) {
     2853                if (fabs(columnUpperWork_[i]-columnLowerWork_[i])<=primalTolerance) {
    28542854                  if (columnLowerWork_[i]>=0.0) {
    28552855                    columnUpperWork_[i] = columnLowerWork_[i];
     
    28822882            } else {
    28832883              rowUpperWork_[i]=upperValue*multiplier;
    2884               if (rowUpperWork_[i]-rowLowerWork_[i]<=primalTolerance) {
     2884              if (fabs(rowUpperWork_[i]-rowLowerWork_[i])<=primalTolerance) {
    28852885                if (rowLowerWork_[i]>=0.0) {
    28862886                  rowUpperWork_[i] = rowLowerWork_[i];
     
    29122912            } else {
    29132913              columnUpperWork_[i]=upperValue*rhsScale_;
    2914               if (columnUpperWork_[i]-columnLowerWork_[i]<=primalTolerance) {
     2914              if (fabs(columnUpperWork_[i]-columnLowerWork_[i])<=primalTolerance) {
    29152915                if (columnLowerWork_[i]>=0.0) {
    29162916                  columnUpperWork_[i] = columnLowerWork_[i];
     
    29412941            } else {
    29422942              rowUpperWork_[i]=upperValue*rhsScale_;
    2943               if (rowUpperWork_[i]-rowLowerWork_[i]<=primalTolerance) {
     2943              if (fabs(rowUpperWork_[i]-rowLowerWork_[i])<=primalTolerance) {
    29442944                if (rowLowerWork_[i]>=0.0) {
    29452945                  rowUpperWork_[i] = rowLowerWork_[i];
     
    29712971            } else {
    29722972              columnUpperWork_[i]=upperValue;
    2973               if (columnUpperWork_[i]-columnLowerWork_[i]<=primalTolerance) {
     2973              if (fabs(columnUpperWork_[i]-columnLowerWork_[i])<=primalTolerance) {
    29742974                if (columnLowerWork_[i]>=0.0) {
    29752975                  columnUpperWork_[i] = columnLowerWork_[i];
     
    30003000            } else {
    30013001              rowUpperWork_[i]=upperValue;
    3002               if (rowUpperWork_[i]-rowLowerWork_[i]<=primalTolerance) {
     3002              if (fabs(rowUpperWork_[i]-rowLowerWork_[i])<=primalTolerance) {
    30033003                if (rowLowerWork_[i]>=0.0) {
    30043004                  rowUpperWork_[i] = rowLowerWork_[i];
     
    31733173            } else {
    31743174              columnUpperWork_[i]=upperValue*multiplier;
    3175               if (columnUpperWork_[i]-columnLowerWork_[i]<=primalTolerance) {
     3175              if (fabs(columnUpperWork_[i]-columnLowerWork_[i])<=primalTolerance) {
    31763176                if (columnLowerWork_[i]>=0.0) {
    31773177                  columnUpperWork_[i] = columnLowerWork_[i];
Note: See TracChangeset for help on using the changeset viewer.