jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ./mauka: 

- Bug: In GraphicMaukaEngine::doQuadriPart(), performs a quadri-partition
        only if there is more than 4*instanceStopCriterions Cells (trans-
        hierarchically computeds).
This commit is contained in:
Jean-Paul Chaput 2011-01-09 18:26:23 +00:00
parent eb96663040
commit e6ac57145f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mauka/src/GraphicMaukaEngine.cpp
View File

@ -43,6 +43,7 @@
#include <hurricane/viewer/CellViewer.h> #include <hurricane/viewer/CellViewer.h>
#include <hurricane/viewer/ControllerWidget.h> #include <hurricane/viewer/ControllerWidget.h>
#include <crlcore/Utilities.h> #include <crlcore/Utilities.h>
#include <crlcore/ToolBox.h>
#include <crlcore/AllianceFramework.h> #include <crlcore/AllianceFramework.h>
#include <nimbus/NimbusEngine.h> #include <nimbus/NimbusEngine.h>
#include <metis/MetisEngine.h> #include <metis/MetisEngine.h>
@ -65,6 +66,7 @@ namespace Mauka {
using Hurricane::ColorScale; using Hurricane::ColorScale;
using Hurricane::ControllerWidget; using Hurricane::ControllerWidget;
using CRL::Catalog; using CRL::Catalog;
using CRL::getInstancesCount;
using CRL::AllianceFramework; using CRL::AllianceFramework;
using Nimbus::NimbusEngine; using Nimbus::NimbusEngine;
using Metis::MetisEngine; using Metis::MetisEngine;
@ -173,6 +175,9 @@ namespace Mauka {
MetisEngine* metis = MetisEngine::get ( cell ); MetisEngine* metis = MetisEngine::get ( cell );
if ( metis == NULL ) { if ( metis == NULL ) {
metis = MetisEngine ::create ( cell ); metis = MetisEngine ::create ( cell );
if ( getInstancesCount(cell) < metis->getNumberOfInstancesStopCriterion()*4 )
return;
if ( cmess1.enabled() ) if ( cmess1.enabled() )
metis->getConfiguration()->print( cell ); metis->getConfiguration()->print( cell );
} }
@ -215,8 +220,9 @@ namespace Mauka {
void GraphicMaukaEngine::place () void GraphicMaukaEngine::place ()
{ {
if ( MetisEngine::isHMetisCapable() ) doQuadriPart (); if ( MetisEngine::isHMetisCapable() ) {
else { doQuadriPart ();
} else {
cerr << Warning("Mauka has not been compiled againts hMETIS.\n" cerr << Warning("Mauka has not been compiled againts hMETIS.\n"
" Quadri-partition step is disabled, simulated annealing may be *very* long." ) << endl; " Quadri-partition step is disabled, simulated annealing may be *very* long." ) << endl;
} }