From e6ac57145f738d6f26708628253a6787f826c800 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 9 Jan 2011 18:26:23 +0000 Subject: [PATCH] * ./mauka: - Bug: In GraphicMaukaEngine::doQuadriPart(), performs a quadri-partition only if there is more than 4*instanceStopCriterions Cells (trans- hierarchically computeds). --- mauka/src/GraphicMaukaEngine.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mauka/src/GraphicMaukaEngine.cpp b/mauka/src/GraphicMaukaEngine.cpp index dbec056c..f014f362 100644 --- a/mauka/src/GraphicMaukaEngine.cpp +++ b/mauka/src/GraphicMaukaEngine.cpp @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ namespace Mauka { using Hurricane::ColorScale; using Hurricane::ControllerWidget; using CRL::Catalog; + using CRL::getInstancesCount; using CRL::AllianceFramework; using Nimbus::NimbusEngine; using Metis::MetisEngine; @@ -173,6 +175,9 @@ namespace Mauka { MetisEngine* metis = MetisEngine::get ( cell ); if ( metis == NULL ) { metis = MetisEngine ::create ( cell ); + if ( getInstancesCount(cell) < metis->getNumberOfInstancesStopCriterion()*4 ) + return; + if ( cmess1.enabled() ) metis->getConfiguration()->print( cell ); } @@ -215,8 +220,9 @@ namespace Mauka { void GraphicMaukaEngine::place () { - if ( MetisEngine::isHMetisCapable() ) doQuadriPart (); - else { + if ( MetisEngine::isHMetisCapable() ) { + doQuadriPart (); + } else { cerr << Warning("Mauka has not been compiled againts hMETIS.\n" " Quadri-partition step is disabled, simulated annealing may be *very* long." ) << endl; }