Changeset 800 for trunk/Clp/examples
- Timestamp:
- Jun 9, 2006 10:05:57 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/examples/makeDual.cpp
r799 r800 56 56 int numberExtraRows=0; 57 57 for (iRow=0;iRow<numberRows;iRow++) { 58 if (rowLower[iRow]< -1.0e20) {59 } else if (rowUpper[iRow]> 1.0e20) {58 if (rowLower[iRow]<=-1.0e20) { 59 } else if (rowUpper[iRow]>=1.0e20) { 60 60 } else { 61 61 if (rowUpper[iRow]!=rowLower[iRow]) … … 70 70 for (iColumn=0;iColumn<numberColumns;iColumn++) { 71 71 double offset=0.0; 72 if (columnUpper[iColumn]> 1.0e20) {72 if (columnUpper[iColumn]>=1.0e20) { 73 73 if (columnLower[iColumn]>-1.0e20) 74 74 offset=columnLower[iColumn]; 75 } else if (columnLower[iColumn]< -1.0e20) {75 } else if (columnLower[iColumn]<=-1.0e20) { 76 76 offset=columnUpper[iColumn]; 77 77 } else { … … 101 101 for (iColumn=0;iColumn<numberColumns;iColumn++) { 102 102 // Offset is already in 103 if (columnUpper[iColumn]> 1.0e20) {103 if (columnUpper[iColumn]>=1.0e20) { 104 104 if (columnLower[iColumn]>-1.0e20) { 105 105 fromColumnsLower[iColumn]=-COIN_DBL_MAX; … … 110 110 fromColumnsUpper[iColumn]=objective[iColumn]; 111 111 } 112 } else if (columnLower[iColumn]< -1.0e20) {112 } else if (columnLower[iColumn]<=-1.0e20) { 113 113 fromColumnsLower[iColumn]=objective[iColumn]; 114 114 fromColumnsUpper[iColumn]=COIN_DBL_MAX; … … 119 119 int kRow=0; 120 120 for (iRow=0;iRow<numberRows;iRow++) { 121 if (rowLower[iRow]< -1.0e20) {121 if (rowLower[iRow]<=-1.0e20) { 122 122 assert (rowUpper[iRow]<1.0e20); 123 123 newObjective[kRow]=-rowUpper[iRow]; … … 126 126 which[kRow]=iRow; 127 127 kRow++; 128 } else if (rowUpper[iRow]> 1.0e20) {128 } else if (rowUpper[iRow]>=1.0e20) { 129 129 newObjective[kRow]=-rowLower[iRow]; 130 130 fromRowsLower[kRow]=0.0;
Note: See TracChangeset
for help on using the changeset viewer.