diff --git a/src/CoinAdjacencyVector.cpp b/src/CoinAdjacencyVector.cpp index f572c1c2..acdaba63 100644 --- a/src/CoinAdjacencyVector.cpp +++ b/src/CoinAdjacencyVector.cpp @@ -115,11 +115,14 @@ void CoinAdjacencyVector::sort() bool CoinAdjacencyVector::tryAddElementSortedVector(std::vector &el, size_t newEl) { - std::vector::iterator pos = std::lower_bound(el.begin(), el.end(), newEl); - if (*pos == newEl) - return false; - - el.insert(pos, newEl); + if (el.size()) { + std::vector::iterator pos = std::lower_bound(el.begin(), el.end(), newEl); + if (*pos == newEl) + return false; + el.insert(pos, newEl); + } else { + el.push_back(newEl); + } return true; } diff --git a/src/CoinLpIO.cpp b/src/CoinLpIO.cpp index 6071c32e..49f5b67e 100644 --- a/src/CoinLpIO.cpp +++ b/src/CoinLpIO.cpp @@ -39,7 +39,7 @@ /************************************************************************/ CoinLpIO::CoinLpIO() - : problemName_(CoinStrdup("")) + : problemName_(NULL) , defaultHandler_(true) , numberRows_(0) , numberColumns_(0) @@ -94,7 +94,7 @@ CoinLpIO::CoinLpIO() // Copy constructor //------------------------------------------------------------------- CoinLpIO::CoinLpIO(const CoinLpIO &rhs) - : problemName_(CoinStrdup("")) + : problemName_(NULL) , defaultHandler_(true) , numberRows_(0) , numberColumns_(0) diff --git a/src/CoinStaticConflictGraph.cpp b/src/CoinStaticConflictGraph.cpp index ce0a3d4d..0ce12877 100644 --- a/src/CoinStaticConflictGraph.cpp +++ b/src/CoinStaticConflictGraph.cpp @@ -248,20 +248,18 @@ CoinStaticConflictGraph::CoinStaticConflictGraph( const CoinConflictGraph *cgrap cliques_[i] = std::vector(largeClqs.cliqueElements(i), largeClqs.cliqueElements(i) + largeClqs.cliqueSize(i)); } - // reusing vector - std::vector conf = clqEls; // copying remaining direct conflicts // adding new conflicts when they exist for ( size_t i=0 ; (i conf; for ( size_t j=0 ; ( j < cgraph->nDirectConflicts(idxOrig) ) ; ++j ) { size_t ni = newIdx[ cgraph->directConflicts(idxOrig)[j] ] ; if ( ni == REMOVED ) continue; - conf[sizeConf++] = ni; + conf.push_back(ni); } conflicts_[i] = conf;