From 5cf6b33727b4c4490a125d080e2d3deb6a41f5ce Mon Sep 17 00:00:00 2001
From: The Coriolis Project <alliance-users@asim.lip6.fr>
Date: Thu, 6 Mar 2008 17:56:58 +0000
Subject: [PATCH] synchro with modifications from the cvs root

---
 hurricane/src/analogic/GenTrans.h         | 16 ++++++++--------
 hurricane/src/analogic/GenericDtrAccess.h |  3 ---
 hurricane/src/analogic/RdsUnit.h          |  6 +++---
 hurricane/src/hurricane/DeepNet.cpp       | 18 +++++++++++++++++-
 hurricane/src/hurricane/DeepNet.h         |  4 +++-
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/hurricane/src/analogic/GenTrans.h b/hurricane/src/analogic/GenTrans.h
index 7c4d8fa8..6104c5a8 100644
--- a/hurricane/src/analogic/GenTrans.h
+++ b/hurricane/src/analogic/GenTrans.h
@@ -17,8 +17,8 @@
 // Macro Method  :  "MAXLONG(a,b), MINLONG(a,b)" 
 // Comparaison Method Macro For Calculate Rectangles.
 
-#  define   MAXLONG(a,b) (a>b?a:b) 
-#  define   MINLONG(a,b) (a>b?b:a) 
+#define   MAXLONG(a,b) (a>b?a:b) 
+#define   MINLONG(a,b) (a>b?b:a) 
 
 
 // --------------------------------------------------------------------
@@ -26,7 +26,7 @@
 // This Method Macro is For Geting The Value in RdsUnit of a DRM Rule.  
 // To Use This Macro, you must predefine Pointeur dtraccess. 
 
-#  define   GET_RULE(s)  \
+#define   GET_RULE(s)  \
    dtraccess->GetSingleRdsRuleByLabel(string(s))
 
 
@@ -43,7 +43,7 @@
 
 // To Use This Macro, you must Predefine Pointeur dtraccess. 
 
-#  define GET_RULE_BYNP(prefix, type, suffix) \
+#define GET_RULE_BYNP(prefix, type, suffix) \
    dtraccess->GetSingleRdsRuleByLabel(prefix, type, suffix)
 
 
@@ -61,7 +61,7 @@
 
 // To Use This Macro, you must Predefine Pointeur dtraccess. 
 
-#  define GET_LAYER_BYNP(prefix, type, suffix) \
+#define GET_LAYER_BYNP(prefix, type, suffix) \
    dtraccess->GetSingleLayerByLabel(prefix, type, suffix)
 
 
@@ -79,7 +79,7 @@
 
 // This Method Macro must be used in Membre Function Calculate.
 
-#  define   SAVE_RECTANGLE(s, x, y, dx, dy) \
+#define   SAVE_RECTANGLE(s, x, y, dx, dy) \
    _mapString2Box[string(s)] = Box(GetUnit(x), GetUnit(y), GetUnit(x+dx), GetUnit(y+dy)); \
    xmin = MINLONG(xmin, GetUnit(x)); \
    ymin = MINLONG(ymin, GetUnit(y));
@@ -96,7 +96,7 @@
 // This Method Macro must be used in member function of Class GenTrans.
 // 
 
-#  define GET_BOX(s) \
+#define GET_BOX(s) \
    _mapString2Box[s]
 
 
@@ -115,7 +115,7 @@
 // tmp_xcenter, tmp_ycenter, rw_cont, rd_cont.
 //
 
-#  define CREATE_CONTACT_MATRIX_UNDER(underbox, nbcolumn, layer, net) \
+#define CREATE_CONTACT_MATRIX_UNDER(underbox, nbcolumn, layer, net) \
                                                                       \
         if(underbox.getHeight()<rw_cont)   \
            nbcontact = 0; \
diff --git a/hurricane/src/analogic/GenericDtrAccess.h b/hurricane/src/analogic/GenericDtrAccess.h
index 33ddc368..c9922055 100644
--- a/hurricane/src/analogic/GenericDtrAccess.h
+++ b/hurricane/src/analogic/GenericDtrAccess.h
@@ -75,6 +75,3 @@ string GetString(const H::GenericDtrAccess&);
 
 
 #endif // HURRICANE_GENERICDTRACCESS
-
-
-
diff --git a/hurricane/src/analogic/RdsUnit.h b/hurricane/src/analogic/RdsUnit.h
index f5d83ff1..b1186110 100644
--- a/hurricane/src/analogic/RdsUnit.h
+++ b/hurricane/src/analogic/RdsUnit.h
@@ -20,11 +20,11 @@ namespace Hurricane {
 // Utilitarians 
 // ****************************************************************************************************
 
-const long& GetRdsUnit();
+extern const long& GetRdsUnit();
 
-const long& GetRdsPhysicalGrid();
+extern const long& GetRdsPhysicalGrid();
 
-const long& GetRdsLambda();  
+extern const long& GetRdsLambda();  
 
 //  ------------------------------------------------------------------------
 //  Function : "ConvertRealToRdsUnit(const double&)".
diff --git a/hurricane/src/hurricane/DeepNet.cpp b/hurricane/src/hurricane/DeepNet.cpp
index e573fad3..b57f554b 100644
--- a/hurricane/src/hurricane/DeepNet.cpp
+++ b/hurricane/src/hurricane/DeepNet.cpp
@@ -31,7 +31,7 @@
 // Authors-Tag
 // ===================================================================
 //
-// $Id: DeepNet.cpp,v 1.3 2007/06/27 21:13:25 jpc Exp $
+// $Id: DeepNet.cpp,v 1.4 2008/02/15 12:26:38 dosfin Exp $
 //
 // x-----------------------------------------------------------------x
 // |                                                                 |
@@ -172,4 +172,20 @@ size_t  DeepNet::_CreateRoutingPads ( bool buildRings )
 }
 
 
+// -------------------------------------------------------------------
+// 
+
+Net* GetDeepNet(HyperNet& hypernet)
+// ********************************
+{
+    Occurrence  rootNetOccurrence = GetHyperNetRootNetOccurrence ( hypernet.GetNetOccurrence() );
+
+  //if (  rootNetOccurrence.GetMasterCell()->IsFlattenLeaf() ) return NULL;
+  //if (  rootNetOccurrence.GetPath().IsEmpty() )              return NULL;
+
+    return  rootNetOccurrence.GetOwnerCell()->GetNet(rootNetOccurrence.GetName());
+
+}
+
+
 } // End of Hurricane namespace.
diff --git a/hurricane/src/hurricane/DeepNet.h b/hurricane/src/hurricane/DeepNet.h
index 8a3c5bb0..994534b2 100644
--- a/hurricane/src/hurricane/DeepNet.h
+++ b/hurricane/src/hurricane/DeepNet.h
@@ -31,7 +31,7 @@
 // Authors-Tag
 // ===================================================================
 //
-// $Id: DeepNet.h,v 1.3 2007/06/27 21:13:25 jpc Exp $
+// $Id: DeepNet.h,v 1.4 2008/02/15 12:26:38 dosfin Exp $
 //
 // x-----------------------------------------------------------------x
 // |                                                                 |
@@ -99,6 +99,8 @@ namespace Hurricane {
 
 };
 
+Net* GetDeepNet(HyperNet& hyperNet);
+
 
 } // End of Hurricane namespace.