haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

router: improve locality of post-shove optimization 

Fixes: #4359
This commit is contained in:
Tomasz Wlostowski 2021-02-23 22:52:33 +01:00
parent e1d4bb777c
commit 9bdfc13155
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pcbnew/router/pns_shove.cpp
View File

@ -61,7 +61,14 @@ void SHOVE::replaceLine( LINE& aOld, LINE& aNew )
OPT_BOX2I changed_area = ChangedArea( aOld, aNew ); OPT_BOX2I changed_area = ChangedArea( aOld, aNew );
if( changed_area ) if( changed_area )
{
if( Dbg() )
{
Dbg()->AddBox( *changed_area, 3, "shove-changed-area" );
}
m_affectedArea = m_affectedArea ? m_affectedArea->Merge( *changed_area ) : *changed_area; m_affectedArea = m_affectedArea ? m_affectedArea->Merge( *changed_area ) : *changed_area;
}
m_currentNode->Replace( aOld, aNew ); m_currentNode->Replace( aOld, aNew );
} }
@ -588,14 +595,6 @@ SHOVE::SHOVE_STATUS SHOVE::onCollidingSolid( LINE& aCurrent, ITEM* aObstacle )
std::set<ITEM*> cluster = topo.AssembleCluster( aObstacle, aCurrent.Layers().Start() ); std::set<ITEM*> cluster = topo.AssembleCluster( aObstacle, aCurrent.Layers().Start() );
#if 0
m_logger.NewGroup( "on-colliding-solid-cluster", m_iter );
for( ITEM* item : cluster )
{
m_logger.Log( item, 0, "cluster-entry" );
}
#endif
walkaround.SetSolidsOnly( false ); walkaround.SetSolidsOnly( false );
walkaround.RestrictToSet( true, cluster ); walkaround.RestrictToSet( true, cluster );
walkaround.SetIterationLimit( 16 ); // fixme: make configurable walkaround.SetIterationLimit( 16 ); // fixme: make configurable
@ -670,12 +669,13 @@ SHOVE::SHOVE_STATUS SHOVE::onCollidingSolid( LINE& aCurrent, ITEM* aObstacle )
replaceLine( aCurrent, walkaroundLine ); replaceLine( aCurrent, walkaroundLine );
walkaroundLine.SetRank( nextRank ); walkaroundLine.SetRank( nextRank );
#if 0 if( Dbg() )
m_logger.NewGroup( "on-colliding-solid", m_iter ); {
m_logger.Log( aObstacle, 0, "obstacle-solid" ); Dbg()->BeginGroup( "on-colliding-solid" );
m_logger.Log( &aCurrent, 1, "current-line" ); Dbg()->AddLine( aCurrent.CLine(), 1, 10000, "current-line" );
m_logger.Log( &walkaroundLine, 3, "walk-line" ); Dbg()->AddLine( walkaroundLine.CLine(), 3, 10000, "walk-line" );
#endif Dbg()->EndGroup();
}
popLineStack(); popLineStack();
@ -1595,20 +1595,20 @@ void SHOVE::runOptimizer( NODE* aNode )
maxWidth = std::max( line.Width(), maxWidth ); maxWidth = std::max( line.Width(), maxWidth );
if( area ) if( area )
area->Inflate( 10 * maxWidth ); {
area->Inflate( maxWidth );
area = area->Intersect( VisibleViewArea() );
}
switch( effort ) switch( effort )
{ {
case OE_LOW: case OE_LOW:
optFlags = OPTIMIZER::MERGE_OBTUSE; optFlags |= OPTIMIZER::MERGE_OBTUSE;
n_passes = 1; n_passes = 1;
break; break;
case OE_MEDIUM: case OE_MEDIUM:
optFlags = OPTIMIZER::MERGE_SEGMENTS; optFlags |= OPTIMIZER::MERGE_SEGMENTS;
if( area )
optimizer.SetRestrictArea( *area );
n_passes = 2; n_passes = 2;
break; break;
@ -1622,6 +1622,17 @@ void SHOVE::runOptimizer( NODE* aNode )
break; break;
} }
if( area )
{
if( Dbg() )
{
Dbg()->AddBox( *area, 1, "opt-area" );
}
optFlags |= OPTIMIZER::RESTRICT_AREA;
optimizer.SetRestrictArea( *area, false );
}
if( Settings().SmartPads() ) if( Settings().SmartPads() )
optFlags |= OPTIMIZER::SMART_PADS; optFlags |= OPTIMIZER::SMART_PADS;