From 5d871b1353e0af40817f19241d41bd786631e794 Mon Sep 17 00:00:00 2001
From: Jean-Manuel Caba <alliance-users@asim.lip6.fr>
Date: Wed, 18 Aug 2010 09:32:54 +0000
Subject: [PATCH] better cluster management ...

---
 .../src/ccore/openaccess/OpenAccessDriver.cpp | 54 +++++++++----------
 .../src/ccore/openaccess/testDriver/Makefile  |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/crlcore/src/ccore/openaccess/OpenAccessDriver.cpp b/crlcore/src/ccore/openaccess/OpenAccessDriver.cpp
index 96ac3d17..591c42b2 100644
--- a/crlcore/src/ccore/openaccess/OpenAccessDriver.cpp
+++ b/crlcore/src/ccore/openaccess/OpenAccessDriver.cpp
@@ -1,6 +1,5 @@
-
 // -*-compile-command:"cd ../../../../.. && make"-*-
-// Time-stamp: "2010-08-18 10:32:07" - OpenAccessDriver.cpp
+// Time-stamp: "2010-08-18 11:21:49" - OpenAccessDriver.cpp
 // x-----------------------------------------------------------------x
 // |  This file is part of the hurricaneAMS Software.                |
 // |  Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved         |
@@ -945,35 +944,36 @@ namespace {
             cerr << "transformation of instances" << endl;
             oaCluster* cellCluster = oaCluster::find(topBlock,
                                                      getString(cell->getName()).c_str());
-            if(!cellCluster)
+            if(!cellCluster){//le cluster existe déja donc la conversion est déja faite ...
                 cellCluster = oaCluster::create(topBlock,
                                                 getString(cell->getName()).c_str(),
                                                 oacClusterTypeSuggested);
-            assert(cellCluster);
-            for_each_instance(instance, cell->getInstances()){
-                oaInst* inst = toOAInst(instance,topBlock);
-                inst->addToCluster(cellCluster);
-                end_for;
+                assert(cellCluster);
+                for_each_instance(instance, cell->getInstances()){
+                    oaInst* inst = toOAInst(instance,topBlock);
+                    inst->addToCluster(cellCluster);
+                    end_for;
+                }
+                cerr << "transformation of nets" << endl;
+                for_each_net(net, cell->getNets()){
+                    oaNet* n =toOANet(net,topBlock);
+                    end_for;
+                }
+
+                //get and update boundingBox and set abutment box
+                Box bBox = cell->getBoundingBox();
+                cerr << "Hurricane bounding box" << bBox << " in cell " << cell  << endl;
+                Box aBox = cell->getAbutmentBox();
+                cerr << "Hurricane abutment box" << aBox << " in cell " << cell  << endl;
+
+                // create abutment in oa
+                if(!aBox.isEmpty())
+                    if(!oaSnapBoundary::find(topBlock))
+                        oaSnapBoundary::create(topBlock, toOABox(aBox));
+
+                oaBox boundingBox = toOABox(bBox);
+                topBlock->getBBox(boundingBox);
             }
-            cerr << "transformation of nets" << endl;
-            for_each_net(net, cell->getNets()){
-                oaNet* n =toOANet(net,topBlock);
-                end_for;
-            }
-
-            //get and update boundingBox and set abutment box
-            Box bBox = cell->getBoundingBox();
-            cerr << "Hurricane bounding box" << bBox << " in cell " << cell  << endl;
-            Box aBox = cell->getAbutmentBox();
-            cerr << "Hurricane abutment box" << aBox << " in cell " << cell  << endl;
-
-            // create abutment in oa
-            if(!aBox.isEmpty())
-                if(!oaSnapBoundary::find(topBlock))
-                    oaSnapBoundary::create(topBlock, toOABox(aBox));
-
-            oaBox boundingBox = toOABox(bBox);
-            topBlock->getBBox(boundingBox);
 
             return designCellView;
         }
diff --git a/crlcore/src/ccore/openaccess/testDriver/Makefile b/crlcore/src/ccore/openaccess/testDriver/Makefile
index 7f889ffb..bb012506 100644
--- a/crlcore/src/ccore/openaccess/testDriver/Makefile
+++ b/crlcore/src/ccore/openaccess/testDriver/Makefile
@@ -4,7 +4,7 @@ TESTDIR= ./testOA
 TECHNOFILE= /dsk/l1/misc/caba/coriolis-2.x/Linux.SLSoC5x_64/Release.Shared/install/etc/chams/config.freePDK45.xml
 M=$$(uname -m)
 
-all: compile lefTest run
+all: compile run
 
 lefTest: 
 	cd sxlib2lef && make