error in clique strengthening if might be infeasible

Author: jjhforrest

src/CoinCliqueList.cpp

@@ -128,7 +128,7 @@ size_t CoinCliqueList::nNodeOccurrences(size_t idxNode) const
 }
 
 #ifdef DEBUGCG
-void CoinCliqueList::validateClique(const CoinConflictGraph *cgraph, const size_t *idxs, const size_t size) {
+bool CoinCliqueList::validateClique(const CoinConflictGraph *cgraph, const size_t *idxs, const size_t size) {
     if (size == 0) {
         fprintf(stderr, "Empty clique!\n");
         abort();
@@ -143,9 +143,10 @@ void CoinCliqueList::validateClique(const CoinConflictGraph *cgraph, const size_
         for (size_t j = i + 1; j < size; j++) {
             if ((!cgraph->conflicting(idxs[i], idxs[j])) || (idxs[i] == idxs[j])) {
                 fprintf(stderr, "ERROR: Nodes %ld and %ld are not in conflict.\n", idxs[i], idxs[j]);
-                abort();
+                return false;// may be infeasible abort();
             }
         }
     }
+    return true;
 }
 #endif

src/CoinCliqueList.hpp

@@ -115,12 +115,13 @@ class COINUTILSLIB_EXPORT CoinCliqueList
 #ifdef DEBUGCG
     /**
      * Validate a clique according to a conflict graph.
+     * returns false if bad in some way
      *
      * @param cgraph conflict graph
      * @param idxs indexes of the clique
      * @param size size of the clique
      **/
-    static void validateClique(const CoinConflictGraph *cgraph, const size_t *idxs, const size_t size);
+    static bool validateClique(const CoinConflictGraph *cgraph, const size_t *idxs, const size_t size);
 #endif
 
 private:

src/CoinCliqueSet.cpp

@@ -73,11 +73,11 @@ bool CoinCliqueSet::insertIfNotDuplicate(size_t size, const size_t *els) {
 }
 
 size_t CoinCliqueSet::vectorHashCode(const std::vector<size_t> &els) {
+
+    size_t size = els.size();
 #ifdef DEBUGCG
     assert(size > 0);
 #endif
-
-    size_t size = els.size();
     size_t code = (size * sequence_[0]);
     code += (els[0] * sequence_[1]);
 

src/CoinDynamicConflictGraph.cpp

@@ -199,9 +199,11 @@ CoinDynamicConflictGraph::CoinDynamicConflictGraph (
     if ( twoLargest[0] + twoLargest[1] <= rhs && (rowSense!='E' && rowSense!='R') )
       continue;
 
+    if(rhs < 0.0)
+      continue; // might be infeasible
 #ifdef DEBUGCG
     assert(nz == length[idxRow]);
-    assert(rhs >= 0.0);
+    //assert(rhs >= 0.0);
 #endif
 
     //explicit clique