diff --git a/katabatic/src/AutoContact.cpp b/katabatic/src/AutoContact.cpp index fd12eeef..c332e1be 100644 --- a/katabatic/src/AutoContact.cpp +++ b/katabatic/src/AutoContact.cpp @@ -2,14 +2,9 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2009, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved // -// =================================================================== -// -// $Id$ -// -// x-----------------------------------------------------------------x -// | | +// +-----------------------------------------------------------------+ // | C O R I O L I S | // | K a t a b a t i c - Routing Toolbox | // | | @@ -17,10 +12,7 @@ // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | // | C++ Module : "./AutoContact.cpp" | -// | *************************************************************** | -// | U p d a t e s | -// | | -// x-----------------------------------------------------------------x +// +-----------------------------------------------------------------+ #include @@ -1364,7 +1356,7 @@ namespace { Box constraint = _contact->getConstraintBox()/*.inflate(DbU::lambda(0.5))*/; if ( !constraint.contains(center) ) - cerr << Bug("%s [%s %s] outside constraint %s." + cbug << Bug("%s [%s %s] outside constraint %s." ,getString(_contact).c_str() ,DbU::getValueString(center.getX()).c_str() ,DbU::getValueString(center.getY()).c_str() diff --git a/katabatic/src/AutoHorizontal.cpp b/katabatic/src/AutoHorizontal.cpp index 1d7951a0..81791805 100644 --- a/katabatic/src/AutoHorizontal.cpp +++ b/katabatic/src/AutoHorizontal.cpp @@ -2,14 +2,9 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved // -// =================================================================== -// -// $Id$ -// -// x-----------------------------------------------------------------x -// | | +// +-----------------------------------------------------------------+ // | C O R I O L I S | // | K a t a b a t i c - Routing Toolbox | // | | @@ -17,10 +12,7 @@ // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | // | C++ Module : "./AutoHorizontal.cpp" | -// | *************************************************************** | -// | U p d a t e s | -// | | -// x-----------------------------------------------------------------x +// +-----------------------------------------------------------------+ #include diff --git a/katabatic/src/AutoSegment.cpp b/katabatic/src/AutoSegment.cpp index d1f4a254..aeb475c2 100644 --- a/katabatic/src/AutoSegment.cpp +++ b/katabatic/src/AutoSegment.cpp @@ -2,14 +2,9 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved // -// =================================================================== -// -// $Id$ -// -// x-----------------------------------------------------------------x -// | | +// +-----------------------------------------------------------------+ // | C O R I O L I S | // | K a t a b a t i c - Routing Toolbox | // | | @@ -17,10 +12,7 @@ // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | // | C++ Module : "./AutoSegment.cpp" | -// | *************************************************************** | -// | U p d a t e s | -// | | -// x-----------------------------------------------------------------x +// +-----------------------------------------------------------------+ #include "hurricane/Warning.h" diff --git a/katabatic/src/GCell.cpp b/katabatic/src/GCell.cpp index abbecdaa..ad99545a 100644 --- a/katabatic/src/GCell.cpp +++ b/katabatic/src/GCell.cpp @@ -2,14 +2,9 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved // -// =================================================================== -// -// $Id$ -// -// x-----------------------------------------------------------------x -// | | +// +-----------------------------------------------------------------+ // | C O R I O L I S | // | K a t a b a t i c - Routing Toolbox | // | | @@ -17,10 +12,7 @@ // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | // | C++ Module : "./GCell.cpp" | -// | *************************************************************** | -// | U p d a t e s | -// | | -// x-----------------------------------------------------------------x +// +-----------------------------------------------------------------+ #include @@ -1010,17 +1002,17 @@ namespace Katabatic { if ( not Session::getDemoMode() and Session::getWarnGCellOverload() ) { for ( size_t i=0 ; i<_depth ; i++ ) { if ( _densities[i] > 1.0 ) { - cerr << Warning("%s @%dx%d overloaded in %s (M2:%.2f M3:%.2f M4:%.2f M5:%.2f)" - ,_getString().c_str() - ,getColumn() - ,getRow() - ,getString(Session::getRoutingGauge()->getRoutingLayer(i)->getName()).c_str() - ,_densities[1] // M2 - ,_densities[2] // M3 - //,_blockages[2] // M4 - ,_densities[3] // M5 - ,_densities[4] // M6 - ) + cinfo << Warning("%s @%dx%d overloaded in %s (M2:%.2f M3:%.2f M4:%.2f M5:%.2f)" + ,_getString().c_str() + ,getColumn() + ,getRow() + ,getString(Session::getRoutingGauge()->getRoutingLayer(i)->getName()).c_str() + ,_densities[1] // M2 + ,_densities[2] // M3 + //,_blockages[2] // M4 + ,_densities[3] // M5 + ,_densities[4] // M6 + ) << endl; } } @@ -1063,12 +1055,12 @@ namespace Katabatic { if ( rpNets.size() < Session::getSaturateRp() ) return; - cerr << Warning("%s has %zd terminals (h:%zd, v:%zd)" - ,getString(this).c_str() - ,rps.size() - ,_hsegments.size() - ,_vsegments.size() - ) << endl; + cinfo << Warning("%s has %zd terminals (h:%zd, v:%zd)" + ,getString(this).c_str() + ,rps.size() + ,_hsegments.size() + ,_vsegments.size() + ) << endl; AutoSegment* segment; while ( (_densities[1] > 0.5) and stepDesaturate(1,globalNets,segment,true) ) { @@ -1354,7 +1346,7 @@ namespace Katabatic { if ( (edgeUpSaturation > threshold) or (edgeRightSaturation > threshold) ) { overload = true; - cerr << Warning("In %s, (over %.2f) ", _getString().c_str(), threshold); + cinfo << Warning("In %s, (over %.2f) ", _getString().c_str(), threshold); ostringstream message; message << setprecision(3); @@ -1367,7 +1359,7 @@ namespace Katabatic { << " " << edgeRightSaturation; } - cerr << message.str() << "." << endl; + cinfo << message.str() << "." << endl; } return overload; @@ -1382,8 +1374,8 @@ namespace Katabatic { void GCell::translate ( const DbU::Unit&, const DbU::Unit& ) { - cerr << Warning("Calling GCell::translate() on %s is likely a bug." - ,_getString().c_str()) << endl; + cinfo << Warning("Calling GCell::translate() on %s is likely a bug." + ,_getString().c_str()) << endl; } @@ -1490,7 +1482,7 @@ namespace Katabatic { DyKeyQueue::~DyKeyQueue () { if ( not _requests.empty() ) { - cerr << Warning("~DyKeyQueue(): Still contains %d requests (and %d elements)." + cbug << Warning("~DyKeyQueue(): Still contains %d requests (and %d elements)." ,_requests.size(),_map.size()) << endl; } } diff --git a/katabatic/src/GCellGrid.cpp b/katabatic/src/GCellGrid.cpp index e22c5d39..18686c18 100644 --- a/katabatic/src/GCellGrid.cpp +++ b/katabatic/src/GCellGrid.cpp @@ -64,7 +64,7 @@ namespace Katabatic { void GCellGrid::_postCreate () { - KnikEngine::KnikEngine* knik; + KnikEngine* knik; knik = KnikEngine::get ( getCell() ); if ( !knik ) throw Error ( missingKnikEngine, "GCellGrid::_postCreate()", getString(getCell()).c_str() ); diff --git a/katabatic/src/KatabaticEngine.cpp b/katabatic/src/KatabaticEngine.cpp index 1c5e95bf..316e97ad 100644 --- a/katabatic/src/KatabaticEngine.cpp +++ b/katabatic/src/KatabaticEngine.cpp @@ -2,14 +2,9 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved // -// =================================================================== -// -// $Id$ -// -// x-----------------------------------------------------------------x -// | | +// +-----------------------------------------------------------------+ // | C O R I O L I S | // | K a t a b a t i c - Routing Toolbox | // | | @@ -17,10 +12,7 @@ // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | // | C++ Module : "./KatabaticEngine.cpp" | -// | *************************************************************** | -// | U p d a t e s | -// | | -// x-----------------------------------------------------------------x +// +-----------------------------------------------------------------+ #include diff --git a/katabatic/src/LoadGrByNet.cpp b/katabatic/src/LoadGrByNet.cpp index 5c6349a7..88cdfcd7 100644 --- a/katabatic/src/LoadGrByNet.cpp +++ b/katabatic/src/LoadGrByNet.cpp @@ -2,14 +2,9 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2011, All Rights Reserved -// -// =================================================================== -// -// $Id$ +// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved // // +-----------------------------------------------------------------+ -// | | // | C O R I O L I S | // | K a t a b a t i c - Routing Toolbox | // | | @@ -17,9 +12,6 @@ // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | // | C++ Module : "./LoadGrByNet.cpp" | -// | *************************************************************** | -// | U p d a t e s | -// | | // +-----------------------------------------------------------------+ @@ -1904,6 +1896,7 @@ namespace { switch ( padInstance->getTransformation().getOrientation() ) { case Transformation::Orientation::ID: // North side. case Transformation::Orientation::YR: // Right side. + case Transformation::Orientation::R3: // Right side (alterate). topRightPad = true; break; case Transformation::Orientation::MY: // South side. @@ -2245,8 +2238,9 @@ namespace { AutoContact* subContact; if ( leftRP == rightRP ) { - _GCell_rp_AutoContacts ( _gcell, leftRP, _southWestContact, _northEastContact, (_south == NULL) && (_north == NULL) ); - //_northEastContact = _southWestContact; + _southWestContact = _GCell_rp_Access ( _gcell, leftRP, (_south == NULL) && (_north == NULL), false ); + _northEastContact = _southWestContact; + //_GCell_rp_AutoContacts ( _gcell, leftRP, _southWestContact, _northEastContact, (_south == NULL) && (_north == NULL) ); } else { ltrace(99) << "Using separate global contacts" << endl; _GCell_rp_AutoContacts ( _gcell, leftRP , _southWestContact, subContact, (_south == NULL) ); diff --git a/katabatic/src/NetOptimals.cpp b/katabatic/src/NetOptimals.cpp index 4446df8a..a32385e4 100644 --- a/katabatic/src/NetOptimals.cpp +++ b/katabatic/src/NetOptimals.cpp @@ -2,14 +2,9 @@ // -*- C++ -*- // // This file is part of the Coriolis Software. -// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved +// Copyright (c) UPMC/LIP6 2008-2012, All Rights Reserved // -// =================================================================== -// -// $Id$ -// -// x-----------------------------------------------------------------x -// | | +// +-----------------------------------------------------------------+ // | C O R I O L I S | // | K a t a b a t i c - Routing Toolbox | // | | @@ -17,10 +12,7 @@ // | E-mail : Jean-Paul.Chaput@asim.lip6.fr | // | =============================================================== | // | C++ Module : "./NetOptimals.cpp" | -// | *************************************************************** | -// | U p d a t e s | -// | | -// x-----------------------------------------------------------------x +// +-----------------------------------------------------------------+ #include