Changeset 800 for trunk/Clp/examples

Timestamp:

Jun 9, 2006 10:05:57 PM (14 years ago)

Author:

ladanyi

Message:

finishing conversion to svn

File:

• trunk/Clp/examples/makeDual.cpp (modified) (6 diffs)

trunk/Clp/examples/makeDual.cpp

@@ -56 +56 @@
   int numberExtraRows=0;
   for (iRow=0;iRow<numberRows;iRow++) {
-    if (rowLower[iRow]<-1.0e20) {
-    } else if (rowUpper[iRow]>1.0e20) {
+    if (rowLower[iRow]<=-1.0e20) {
+    } else if (rowUpper[iRow]>=1.0e20) {
     } else {
       if (rowUpper[iRow]!=rowLower[iRow])
@@ -70 +70 @@
   for (iColumn=0;iColumn<numberColumns;iColumn++) {
     double offset=0.0;
-    if (columnUpper[iColumn]>1.0e20) {
+    if (columnUpper[iColumn]>=1.0e20) {
       if (columnLower[iColumn]>-1.0e20)
         offset=columnLower[iColumn];
-    } else if (columnLower[iColumn]<-1.0e20) {
+    } else if (columnLower[iColumn]<=-1.0e20) {
       offset=columnUpper[iColumn];
     } else {
@@ -101 +101 @@
   for (iColumn=0;iColumn<numberColumns;iColumn++) {
     // Offset is already in
-    if (columnUpper[iColumn]>1.0e20) {
+    if (columnUpper[iColumn]>=1.0e20) {
       if (columnLower[iColumn]>-1.0e20) {
         fromColumnsLower[iColumn]=-COIN_DBL_MAX;
@@ -110 +110 @@
         fromColumnsUpper[iColumn]=objective[iColumn];
       }
-    } else if (columnLower[iColumn]<-1.0e20) {
+    } else if (columnLower[iColumn]<=-1.0e20) {
       fromColumnsLower[iColumn]=objective[iColumn];
       fromColumnsUpper[iColumn]=COIN_DBL_MAX;
@@ -119 +119 @@
   int kRow=0;
   for (iRow=0;iRow<numberRows;iRow++) {
-    if (rowLower[iRow]<-1.0e20) {
+    if (rowLower[iRow]<=-1.0e20) {
       assert (rowUpper[iRow]<1.0e20);
       newObjective[kRow]=-rowUpper[iRow];
@@ -126 +126 @@
       which[kRow]=iRow;
       kRow++;
-    } else if (rowUpper[iRow]>1.0e20) {
+    } else if (rowUpper[iRow]>=1.0e20) {
       newObjective[kRow]=-rowLower[iRow];
       fromRowsLower[kRow]=0.0;