Changeset 1551 for trunk/Clp/src/ClpSimplexPrimal.cpp

Timestamp:

May 24, 2010 7:34:44 PM (11 years ago)

Author:

mjs

Message:

Rerun formatting after JJF patches (1533 and 1535).

File:

• trunk/Clp/src/ClpSimplexPrimal.cpp (modified) (5 diffs)

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -2757 +2757 @@
           // do ratio test and re-compute dj
 #ifdef CLP_USER_DRIVEN
-          if (solveType_!=2||(moreSpecialOptions_&512)==0) {
-#endif
-              primalRow(rowArray_[1], rowArray_[3], rowArray_[2],
-                    ifValuesPass);
+          if (solveType_ != 2 || (moreSpecialOptions_ & 512) == 0) {
+#endif
+               primalRow(rowArray_[1], rowArray_[3], rowArray_[2],
+                         ifValuesPass);
 #ifdef CLP_USER_DRIVEN
           } else {
-              int status = eventHandler_->event(ClpEventHandler::pivotRow);
-              if (status>=0) {
-                  problemStatus_=5;
-                  secondaryStatus_=ClpEventHandler::pivotRow;
-                  break;
-              }
-          }
+               int status = eventHandler_->event(ClpEventHandler::pivotRow);
+               if (status >= 0) {
+                    problemStatus_ = 5;
+                    secondaryStatus_ = ClpEventHandler::pivotRow;
+                    break;
+               }
+          }
 #endif
           if (ifValuesPass) {
@@ -2866 +2866 @@
           }
           if (pivotRow_ >= 0) {
-               if (solveType_==2&&(moreSpecialOptions_&512)==0) {
+               if (solveType_ == 2 && (moreSpecialOptions_ & 512) == 0) {
                     // **** Coding for user interface
                     // do ray
@@ -2944 +2944 @@
                          clearAll();
                          pivotRow_ = -1;
-                         if (solveType_==1||(moreSpecialOptions_&512)!=0) {
+                         if (solveType_ == 1 || (moreSpecialOptions_ & 512) != 0) {
                               returnCode = -4;
                               break;
@@ -3005 +3005 @@
                          // do ray
                          primalRay(rowArray_[1]);
-                    } else if (solveType_==2&&(moreSpecialOptions_&512)==0) {
+                    } else if (solveType_ == 2 && (moreSpecialOptions_ & 512) == 0) {
                          // refactorize
                          int lastCleaned = 0;
@@ -3112 +3112 @@
           }
      }
-     if ((solveType_==2&&(moreSpecialOptions_&512)==0)&&
-         (returnCode == -2||returnCode==-3)) {
+     if ((solveType_ == 2 && (moreSpecialOptions_ & 512) == 0) &&
+               (returnCode == -2 || returnCode == -3)) {
           // refactorize here
           int lastCleaned = 0;