Changeset 1903

Timestamp:

Jan 3, 2013 5:49:30 PM (8 years ago)

Author:

stefan

Message:

code from John to check that fillBasis works correctly (need to be enabled via define)

File:

• trunk/Clp/src/ClpFactorization.cpp (modified) (3 diffs)

trunk/Clp/src/ClpFactorization.cpp

@@ -1528 +1528 @@
                numberElements += matrix->countBasis(pivotTemp + numberRowBasic,
                                                     numberColumnBasic);
+#ifndef NDEBUG
+//#define CHECK_CLEAN_BASIS
+#ifdef CHECK_CLEAN_BASIS
+               int saveNumberElements = numberElements;
+#endif
+#endif
                // Not needed for dense
                numberElements = 3 * numberBasic + 3 * numberElements + 20000;
@@ -1545 +1551 @@
                indexRowU = coinFactorizationB_->indices();
                startColumnU = coinFactorizationB_->starts();
+#ifdef CHECK_CLEAN_BASIS
+               for (int i=0;i<saveNumberElements;i++) {
+                 elementU[i]=0.0;
+                 indexRowU[i]=-1;
+               }
+               for (int i=0;i<numberRows;i++)
+                 startColumnU[i]=-1;
+#endif
 #ifndef COIN_FAST_CODE
                double slackValue;
@@ -1585 +1599 @@
                else
                     numberElements = 0;
+#ifdef CHECK_CLEAN_BASIS
+               assert (!startColumnU[0]);
+               int lastStart=0;
+               for (int i=0;i<numberRows;i++) {
+                 assert (startColumnU[i+1]>lastStart);
+                 lastStart=startColumnU[i+1];
+               }
+               assert (lastStart==saveNumberElements);
+               for (int i=0;i<saveNumberElements;i++) {
+                 assert(elementU[i]);
+                 assert(indexRowU[i]>=0&&indexRowU[i]<numberRows);
+               }
+#endif
                coinFactorizationB_->preProcess ( );
                coinFactorizationB_->factor (  );