realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert #07a86873c (accidental debug code)

Browse Source
This commit is contained in:
Tomasz Wlostowski 2025-05-12 15:25:10 +02:00
parent 1907580b82
commit 96cd5ea8c1
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
pcbnew/connectivity/topo_match.cpp
View File

@ -37,10 +37,9 @@
#include <refdes_utils.h>
#include <wx/string.h>
#include <wx/log.h>
#include <core/profile.h>
#include "topo_match.h"
#include <valgrind/callgrind.h>
static const wxString traceTopoMatch = wxT( "TOPO_MATCH" );
@ -95,17 +94,24 @@ bool PIN::IsIsomorphic( const PIN& b ) const
for( auto& cref : m_conns )
{
bool found = false;
for( int i = 0; i < m_conns.size(); i++ )
{
if( b.m_conns[i]->IsTopologicallySimilar( *cref ) )
{
found = true;
matches[nref] = true;
break;
}
}
if (!found)
nref++;
}
for( int i = 0; i < m_conns.size(); i++ )
{
if( !matches[i] )
{
return false;
}
}
return true;
@ -198,7 +204,6 @@ CONNECTION_GRAPH::findMatchingComponents( CONNECTION_GRAPH* aRefGraph, COMPONENT
const BACKTRACK_STAGE& partialMatches )
{
std::vector<COMPONENT*> matches;
PROF_TIMER cnt("findm");
for( auto cmpTarget : m_components )
{
// already matched to sth? move on.
@ -215,31 +220,21 @@ CONNECTION_GRAPH::findMatchingComponents( CONNECTION_GRAPH* aRefGraph, COMPONENT
if( aRef->MatchesWith( cmpTarget ) )
{
// then a net integrity check (expensive because of poor optimization)
//if( checkIfPadNetsMatch( partialMatches, aRefGraph, aRef, cmpTarget ) )
if( checkIfPadNetsMatch( partialMatches, aRefGraph, aRef, cmpTarget ) )
{
wxLogTrace( traceTopoMatch, wxT("match!\n") );
matches.push_back( cmpTarget );
}
//else
//{
// wxLogTrace( traceTopoMatch, wxT("Reject [net topo mismatch]\n") );
//}
else
{
wxLogTrace( traceTopoMatch, wxT("Reject [net topo mismatch]\n") );
}
}
else
{
wxLogTrace( traceTopoMatch, wxT("reject\n") );
}
}
cnt.Show();
for( auto i = 1; i < matches.size(); i++ )
{
if( matches[i]->m_value == aRef->m_value )
{
std::swap(matches[0], matches[i]);
break;
}
}
auto padSimilarity=[]( COMPONENT*a, COMPONENT*b ) -> double
{
@ -258,7 +253,7 @@ CONNECTION_GRAPH::findMatchingComponents( CONNECTION_GRAPH* aRefGraph, COMPONENT
};
std::stable_sort(matches.begin(), matches.end(), [&] ( COMPONENT*a, COMPONENT*b ) -> int
std::sort(matches.begin(), matches.end(), [&] ( COMPONENT*a, COMPONENT*b ) -> int
{
return padSimilarity( aRef,a ) > padSimilarity( aRef, b );
}
@ -324,7 +319,6 @@ void CONNECTION_GRAPH::BuildConnectivity()
*/
}
#define DBG(...) printf("%s", wxString::Format(__VA_ARGS__).c_str().AsChar() )
CONNECTION_GRAPH::STATUS CONNECTION_GRAPH::FindIsomorphism( CONNECTION_GRAPH* aTarget,
COMPONENT_MATCHES& aResult )
@ -370,20 +364,18 @@ CONNECTION_GRAPH::STATUS CONNECTION_GRAPH::FindIsomorphism( CONNECTION_GRAPH* aT
if( current.m_currentMatch < 0 )
{
CALLGRIND_START_INSTRUMENTATION;
current.m_matches = aTarget->findMatchingComponents( this, current.m_ref, current );
CALLGRIND_STOP_INSTRUMENTATION;
current.m_currentMatch = 0;
}
DBG( wxT( "stk: Current '%s' stack %d cm %d/%d locked %d/%d\n" ),
wxLogTrace( traceTopoMatch, wxT( "stk: Current '%s' stack %d cm %d/%d locked %d/%d\n" ),
current.m_ref->m_reference, (int) stack.size(), current.m_currentMatch,
(int) current.m_matches.size(), (int) current.m_locked.size(),
(int) m_components.size() );
if ( current.m_matches.empty() )
{
DBG( wxT( "stk: No matches at all, going up [level=%d]\n" ),
wxLogTrace( traceTopoMatch, wxT( "stk: No matches at all, going up [level=%d]\n" ),
(int) stack.size() );
stack.pop_back();
continue;
@ -391,7 +383,7 @@ CALLGRIND_STOP_INSTRUMENTATION;
if( current.m_currentMatch >= 0 && current.m_currentMatch >= current.m_matches.size() )
{
DBG( wxT( "stk: No more matches, going up [level=%d]\n" ),
wxLogTrace( traceTopoMatch, wxT( "stk: No more matches, going up [level=%d]\n" ),
(int) stack.size() );
stack.pop_back();
continue;
@ -399,13 +391,13 @@ CALLGRIND_STOP_INSTRUMENTATION;
auto& match = current.m_matches[current.m_currentMatch];
DBG( wxT( "stk: candidate '%s', match list : ( " ),
wxLogTrace( traceTopoMatch, wxT( "stk: candidate '%s', match list : ( " ),
current.m_matches[current.m_currentMatch]->m_reference, current.m_refIndex );
for( auto m : current.m_matches )
DBG( wxT( "%s " ), m->GetParent()->GetReferenceAsString() );
wxLogTrace( traceTopoMatch, wxT( "%s " ), m->GetParent()->GetReferenceAsString() );
DBG( wxT( "\n" ) );
wxLogTrace( traceTopoMatch, wxT( "\n" ) );
current.m_currentMatch++;
current.m_locked[match] = current.m_ref;
@ -555,12 +547,9 @@ int main()
#endif
COMPONENT::COMPONENT( const wxString& aRef,
const wxString& aValue,
FOOTPRINT* aParentFp,
COMPONENT::COMPONENT( const wxString& aRef, FOOTPRINT* aParentFp,
std::optional<VECTOR2I> aRaOffset ) :
m_reference( aRef ),
m_value( aValue ),
m_parentFootprint( aParentFp ), m_raOffset( aRaOffset )
{
m_prefix = UTIL::GetRefDesPrefix( aRef );
@ -610,7 +599,7 @@ bool COMPONENT::MatchesWith( COMPONENT* b )
void CONNECTION_GRAPH::AddFootprint( FOOTPRINT* aFp, const VECTOR2I& aOffset )
{
auto cmp = new COMPONENT( aFp->GetReference(), aFp->GetValue(), aFp );
auto cmp = new COMPONENT( aFp->GetReference(), aFp );
for( auto pad : aFp->Pads() )
{

3
pcbnew/connectivity/topo_match.h
View File

@ -48,7 +48,7 @@ class COMPONENT
friend class CONNECTION_GRAPH;
public:
COMPONENT( const wxString& aRef, const wxString& aValue, FOOTPRINT* aParentFp, std::optional<VECTOR2I> aRaOffset = std::optional<VECTOR2I>() );
COMPONENT( const wxString& aRef, FOOTPRINT* aParentFp, std::optional<VECTOR2I> aRaOffset = std::optional<VECTOR2I>() );
~COMPONENT();
bool IsSameKind( const COMPONENT& b ) const;
@ -68,7 +68,6 @@ private:
std::optional<VECTOR2I> m_raOffset;
wxString m_reference;
wxString m_prefix;
wxString m_value;
FOOTPRINT* m_parentFootprint = nullptr;
std::vector<PIN*> m_pins;
};