synchro with modifications from the cvs root
This commit is contained in:
parent
4222306aa1
commit
5cf6b33727
|
@ -17,8 +17,8 @@
|
||||||
// Macro Method : "MAXLONG(a,b), MINLONG(a,b)"
|
// Macro Method : "MAXLONG(a,b), MINLONG(a,b)"
|
||||||
// Comparaison Method Macro For Calculate Rectangles.
|
// Comparaison Method Macro For Calculate Rectangles.
|
||||||
|
|
||||||
# define MAXLONG(a,b) (a>b?a:b)
|
#define MAXLONG(a,b) (a>b?a:b)
|
||||||
# define MINLONG(a,b) (a>b?b:a)
|
#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.
|
// This Method Macro is For Geting The Value in RdsUnit of a DRM Rule.
|
||||||
// To Use This Macro, you must predefine Pointeur dtraccess.
|
// To Use This Macro, you must predefine Pointeur dtraccess.
|
||||||
|
|
||||||
# define GET_RULE(s) \
|
#define GET_RULE(s) \
|
||||||
dtraccess->GetSingleRdsRuleByLabel(string(s))
|
dtraccess->GetSingleRdsRuleByLabel(string(s))
|
||||||
|
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
|
|
||||||
// To Use This Macro, you must Predefine Pointeur dtraccess.
|
// 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)
|
dtraccess->GetSingleRdsRuleByLabel(prefix, type, suffix)
|
||||||
|
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@
|
||||||
|
|
||||||
// To Use This Macro, you must Predefine Pointeur dtraccess.
|
// 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)
|
dtraccess->GetSingleLayerByLabel(prefix, type, suffix)
|
||||||
|
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
|
|
||||||
// This Method Macro must be used in Membre Function Calculate.
|
// 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)); \
|
_mapString2Box[string(s)] = Box(GetUnit(x), GetUnit(y), GetUnit(x+dx), GetUnit(y+dy)); \
|
||||||
xmin = MINLONG(xmin, GetUnit(x)); \
|
xmin = MINLONG(xmin, GetUnit(x)); \
|
||||||
ymin = MINLONG(ymin, GetUnit(y));
|
ymin = MINLONG(ymin, GetUnit(y));
|
||||||
|
@ -96,7 +96,7 @@
|
||||||
// This Method Macro must be used in member function of Class GenTrans.
|
// This Method Macro must be used in member function of Class GenTrans.
|
||||||
//
|
//
|
||||||
|
|
||||||
# define GET_BOX(s) \
|
#define GET_BOX(s) \
|
||||||
_mapString2Box[s]
|
_mapString2Box[s]
|
||||||
|
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@
|
||||||
// tmp_xcenter, tmp_ycenter, rw_cont, rd_cont.
|
// 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) \
|
if(underbox.getHeight()<rw_cont) \
|
||||||
nbcontact = 0; \
|
nbcontact = 0; \
|
||||||
|
|
|
@ -75,6 +75,3 @@ string GetString(const H::GenericDtrAccess&);
|
||||||
|
|
||||||
|
|
||||||
#endif // HURRICANE_GENERICDTRACCESS
|
#endif // HURRICANE_GENERICDTRACCESS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -20,11 +20,11 @@ namespace Hurricane {
|
||||||
// Utilitarians
|
// 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&)".
|
// Function : "ConvertRealToRdsUnit(const double&)".
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
// Authors-Tag
|
// 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
|
// 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.
|
} // End of Hurricane namespace.
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
// Authors-Tag
|
// 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
|
// x-----------------------------------------------------------------x
|
||||||
// | |
|
// | |
|
||||||
|
@ -99,6 +99,8 @@ namespace Hurricane {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Net* GetDeepNet(HyperNet& hyperNet);
|
||||||
|
|
||||||
|
|
||||||
} // End of Hurricane namespace.
|
} // End of Hurricane namespace.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue