From ab0e72f0c049ee3e14c5d1db5757508cf3b35a27 Mon Sep 17 00:00:00 2001 From: John Forrest Date: Fri, 1 Dec 2023 15:22:39 +0000 Subject: [PATCH] change output to show how slow ConflictGraph is --- src/Osi/OsiSolverInterface.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Osi/OsiSolverInterface.cpp b/src/Osi/OsiSolverInterface.cpp index 0e2fceab..1c97885a 100644 --- a/src/Osi/OsiSolverInterface.cpp +++ b/src/Osi/OsiSolverInterface.cpp @@ -3483,15 +3483,15 @@ void OsiSolverInterface::checkCGraph(CoinMessageHandler *msgh) cgraph_ = NULL; } - const double stCG = CoinGetTimeOfDay(); - cgraph_ = new CoinStaticConflictGraph(getNumCols(), getColType(), + double timeCG = CoinCpuTime(); + cgraph_ = new CoinStaticConflictGraph(getNumCols(), getColType(), getColLower(), getColUpper(), - getMatrixByRow(), getRowSense(), + getMatrixByRow(), getRowSense(), getRightHandSide(), getRowRange()); - const double etCG = CoinGetTimeOfDay(); + timeCG = CoinCpuTime()-timeCG; - if (msgh && msgh->logLevel()) - msgh->message(COIN_CGRAPH_INFO, messages()) << etCG-stCG << cgraph_->density()*100.0 << CoinMessageEol; + if (msgh && msgh->logLevel()) + msgh->message(COIN_CGRAPH_INFO, messages()) << timeCG << cgraph_->density()*100.0 << ((timeCG>1.0) ? "!!" : "") << CoinMessageEol; // fixing variables discovered during the construction of conflict graph const std::vector< std::pair< size_t, std::pair< double, double > > > newBounds = cgraph_->updatedBounds();