luke
/
netgen
mirror of https://github.com/RTimothyEdwards/netgen.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added sorting of the output lines for items which match both name and 

contents (previously wasn't done), and also added sorting for items with
non-matching names which have only one item in the group for each circuit
(so they must be matching in some sense).  This makes the output a bit
more readable without re-enabling the compute-intensive sorting method
for non-matching entries.
This commit is contained in:
Tim Edwards 2021-12-07 15:34:45 -05:00
parent cfdc60104b
commit 964bb0e91a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.210
1.5.211

9
base/netcmp.c
View File

@ -1367,8 +1367,8 @@ void SortUnmatchedLists(nlists1, nlists2, n1max, n2max)
nlists2[n1] = temp;
HashPtrInstall(nlists2[n1]->name, (void *)((long)n1 + 1), &n2hash);
HashPtrInstall(nlists2[n2]->name, (void *)((long)n2 + 1), &n2hash);
SortFanoutLists(nlists1[n1], nlists2[n1]);
}
SortFanoutLists(nlists1[n1], nlists2[n1]);
}
}
@ -1423,8 +1423,13 @@ void SortUnmatchedLists(nlists1, nlists2, n1max, n2max)
nlists1[n2] = temp;
HashPtrInstall(nlists1[n1]->name, (void *)((long)n1 + 1), &n1hash);
HashPtrInstall(nlists1[n2]->name, (void *)((long)n2 + 1), &n1hash);
SortFanoutLists(nlists2[n2], nlists1[n2]);
}
SortFanoutLists(nlists2[n2], nlists1[n2]);
}
else if ((n1max == 1) && (n2max == 1)) {
/* Names didn't match but there's only one entry on each side, */
/* so do a sort anyway. */
SortFanoutLists(nlists2[n2], nlists1[n2]);
}
}
/* For all nets that didn't match by name, match by content */