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

Update formatting.

This commit is contained in:
Jeff Young 2020-10-26 12:50:12 +00:00
parent 2bee40687f
commit 5fba0973ab
2 changed files with 78 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -218,7 +218,10 @@ void CN_CONNECTIVITY_ALGO::searchConnections()
std::vector<CN_ITEM*> dirtyItems; std::vector<CN_ITEM*> dirtyItems;
std::copy_if( m_itemList.begin(), m_itemList.end(), std::back_inserter( dirtyItems ), std::copy_if( m_itemList.begin(), m_itemList.end(), std::back_inserter( dirtyItems ),
[] ( CN_ITEM* aItem ) { return aItem->Dirty(); } ); [] ( CN_ITEM* aItem )
{
return aItem->Dirty();
} );
if( m_progressReporter ) if( m_progressReporter )
{ {
@ -229,33 +232,36 @@ void CN_CONNECTIVITY_ALGO::searchConnections()
if( m_itemList.IsDirty() ) if( m_itemList.IsDirty() )
{ {
size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(), size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(),
( dirtyItems.size() + 7 ) / 8 ); ( dirtyItems.size() + 7 ) / 8 );
std::atomic<size_t> nextItem( 0 ); std::atomic<size_t> nextItem( 0 );
std::vector<std::future<size_t>> returns( parallelThreadCount ); std::vector<std::future<size_t>> returns( parallelThreadCount );
auto conn_lambda = [&nextItem, &dirtyItems] auto conn_lambda =
( CN_LIST* aItemList, PROGRESS_REPORTER* aReporter) -> size_t [&nextItem, &dirtyItems]( CN_LIST* aItemList,
{ PROGRESS_REPORTER* aReporter) -> size_t
for( size_t i = nextItem++; i < dirtyItems.size(); i = nextItem++ ) {
{ for( size_t i = nextItem++; i < dirtyItems.size(); i = nextItem++ )
CN_VISITOR visitor( dirtyItems[i] ); {
aItemList->FindNearby( dirtyItems[i], visitor ); CN_VISITOR visitor( dirtyItems[i] );
aItemList->FindNearby( dirtyItems[i], visitor );
if( aReporter ) if( aReporter )
aReporter->AdvanceProgress(); aReporter->AdvanceProgress();
} }
return 1; return 1;
}; };
if( parallelThreadCount <= 1 ) if( parallelThreadCount <= 1 )
conn_lambda( &m_itemList, m_progressReporter ); conn_lambda( &m_itemList, m_progressReporter );
else else
{ {
for( size_t ii = 0; ii < parallelThreadCount; ++ii ) for( size_t ii = 0; ii < parallelThreadCount; ++ii )
returns[ii] = std::async( std::launch::async, conn_lambda, {
&m_itemList, m_progressReporter ); returns[ii] = std::async( std::launch::async, conn_lambda, &m_itemList,
m_progressReporter );
}
for( size_t ii = 0; ii < parallelThreadCount; ++ii ) for( size_t ii = 0; ii < parallelThreadCount; ++ii )
{ {
@ -285,10 +291,10 @@ void CN_CONNECTIVITY_ALGO::searchConnections()
const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUSTER_SEARCH_MODE aMode ) const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUSTER_SEARCH_MODE aMode )
{ {
constexpr KICAD_T types[] = constexpr KICAD_T types[] = { PCB_TRACE_T, PCB_ARC_T, PCB_PAD_T, PCB_VIA_T, PCB_ZONE_AREA_T,
{ PCB_TRACE_T, PCB_ARC_T, PCB_PAD_T, PCB_VIA_T, PCB_ZONE_AREA_T, PCB_MODULE_T, EOT }; PCB_MODULE_T, EOT };
constexpr KICAD_T no_zones[] = constexpr KICAD_T no_zones[] = { PCB_TRACE_T, PCB_ARC_T, PCB_PAD_T, PCB_VIA_T,
{ PCB_TRACE_T, PCB_ARC_T, PCB_PAD_T, PCB_VIA_T, PCB_MODULE_T, EOT }; PCB_MODULE_T, EOT };
if( aMode == CSM_PROPAGATE ) if( aMode == CSM_PROPAGATE )
return SearchClusters( aMode, no_zones, -1 ); return SearchClusters( aMode, no_zones, -1 );
@ -298,7 +304,8 @@ const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUST
const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUSTER_SEARCH_MODE aMode, const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUSTER_SEARCH_MODE aMode,
const KICAD_T aTypes[], int aSingleNet ) const KICAD_T aTypes[],
int aSingleNet )
{ {
bool withinAnyNet = ( aMode != CSM_PROPAGATE ); bool withinAnyNet = ( aMode != CSM_PROPAGATE );
@ -310,35 +317,36 @@ const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUST
if( m_itemList.IsDirty() ) if( m_itemList.IsDirty() )
searchConnections(); searchConnections();
auto addToSearchList = [&item_set, withinAnyNet, aSingleNet, aTypes] ( CN_ITEM *aItem ) auto addToSearchList =
{ [&item_set, withinAnyNet, aSingleNet, aTypes]( CN_ITEM *aItem )
if( withinAnyNet && aItem->Net() <= 0 )
return;
if( !aItem->Valid() )
return;
if( aSingleNet >=0 && aItem->Net() != aSingleNet )
return;
bool found = false;
for( int i = 0; aTypes[i] != EOT; i++ )
{
if( aItem->Parent()->Type() == aTypes[i] )
{ {
found = true; if( withinAnyNet && aItem->Net() <= 0 )
break; return;
}
}
if( !found ) if( !aItem->Valid() )
return; return;
aItem->SetVisited( false ); if( aSingleNet >=0 && aItem->Net() != aSingleNet )
return;
item_set.insert( aItem ); bool found = false;
};
for( int i = 0; aTypes[i] != EOT; i++ )
{
if( aItem->Parent()->Type() == aTypes[i] )
{
found = true;
break;
}
}
if( !found )
return;
aItem->SetVisited( false );
item_set.insert( aItem );
};
std::for_each( m_itemList.begin(), m_itemList.end(), addToSearchList ); std::for_each( m_itemList.begin(), m_itemList.end(), addToSearchList );
@ -355,7 +363,7 @@ const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUST
break; break;
root = *it; root = *it;
root->SetVisited ( true ); root->SetVisited( true );
Q.clear(); Q.clear();
Q.push_back( root ); Q.push_back( root );
@ -384,9 +392,11 @@ const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUST
} }
std::sort( clusters.begin(), clusters.end(), []( CN_CLUSTER_PTR a, CN_CLUSTER_PTR b ) { std::sort( clusters.begin(), clusters.end(),
return a->OriginNet() < b->OriginNet(); []( CN_CLUSTER_PTR a, CN_CLUSTER_PTR b )
} ); {
return a->OriginNet() < b->OriginNet();
} );
return clusters; return clusters;
} }
@ -569,18 +579,18 @@ void CN_CONNECTIVITY_ALGO::FindIsolatedCopperIslands( std::vector<CN_ZONE_ISOLAT
m_connClusters = SearchClusters( CSM_CONNECTIVITY_CHECK ); m_connClusters = SearchClusters( CSM_CONNECTIVITY_CHECK );
for( auto& zone : aZones ) for( CN_ZONE_ISOLATED_ISLAND_LIST& zone : aZones )
{ {
for( PCB_LAYER_ID layer : zone.m_zone->GetLayerSet().Seq() ) for( PCB_LAYER_ID layer : zone.m_zone->GetLayerSet().Seq() )
{ {
if( zone.m_zone->GetFilledPolysList( layer ).IsEmpty() ) if( zone.m_zone->GetFilledPolysList( layer ).IsEmpty() )
continue; continue;
for( const auto& cluster : m_connClusters ) for( const CN_CLUSTER_PTR& cluster : m_connClusters )
{ {
if( cluster->Contains( zone.m_zone ) && cluster->IsOrphaned() ) if( cluster->Contains( zone.m_zone ) && cluster->IsOrphaned() )
{ {
for( auto z : *cluster ) for( CN_ITEM* z : *cluster )
{ {
if( z->Parent() == zone.m_zone && z->Layer() == layer ) if( z->Parent() == zone.m_zone && z->Layer() == layer )
{ {

21
pcbnew/connectivity/connectivity_items.cpp
View File

@ -439,8 +439,11 @@ bool CN_CLUSTER::Contains( const CN_ITEM* aItem )
bool CN_CLUSTER::Contains( const BOARD_CONNECTED_ITEM* aItem ) bool CN_CLUSTER::Contains( const BOARD_CONNECTED_ITEM* aItem )
{ {
return std::find_if( m_items.begin(), m_items.end(), [ &aItem ] ( const CN_ITEM* item ) return std::find_if( m_items.begin(), m_items.end(),
{ return item->Valid() && item->Parent() == aItem; } ) != m_items.end(); [ &aItem ] ( const CN_ITEM* item )
{
return item->Valid() && item->Parent() == aItem;
} ) != m_items.end();
} }
@ -448,10 +451,16 @@ void CN_CLUSTER::Dump()
{ {
for( auto item : m_items ) for( auto item : m_items )
{ {
wxLogTrace( "CN", " - item : %p bitem : %p type : %d inet %s\n", item, item->Parent(), wxLogTrace( "CN", " - item : %p bitem : %p type : %d inet %s\n",
item->Parent()->Type(), (const char*) item->Parent()->GetNetname().c_str() ); item,
wxLogTrace( "CN", "- item : %p bitem : %p type : %d inet %s\n", item, item->Parent(), item->Parent(),
item->Parent()->Type(), (const char*) item->Parent()->GetNetname().c_str() ); item->Parent()->Type(),
(const char*) item->Parent()->GetNetname().c_str() );
wxLogTrace( "CN", "- item : %p bitem : %p type : %d inet %s\n",
item,
item->Parent(),
item->Parent()->Type(),
(const char*) item->Parent()->GetNetname().c_str() );
item->Dump(); item->Dump();
} }
} }