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

Re-applied the modifications of revisions 231 and 232, and updated 

the version to revision 234.
This commit is contained in:
Tim Edwards 2022-09-30 11:47:36 -04:00
parent 12e1ff295f
commit 3aeea9d164
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.229 1.5.234

10
tcltk/netgen.tcl.in
View File

@ -62,16 +62,18 @@ proc netgen::convert_to_json {filename lvs_final} {
puts $fjson " \[" puts $fjson " \["
set cktval [lindex $value 0] set cktval [lindex $value 0]
foreach pin [lrange $cktval 0 end-1] { foreach pin [lrange $cktval 0 end-1] {
puts $fjson " \"$pin\"," set pinstr [string map {"\\" "\\\\"} $pin]
puts $fjson " \"$pinstr\","
} }
set pin [lindex $cktval end] set pin [string map {"\\" "\\\\"} [lindex $cktval end]]
puts $fjson " \"$pin\"" puts $fjson " \"$pin\""
puts $fjson " \], \[" puts $fjson " \], \["
set cktval [lindex $value 1] set cktval [lindex $value 1]
foreach pin [lrange $cktval 0 end-1] { foreach pin [lrange $cktval 0 end-1] {
puts $fjson " \"$pin\"," set pinstr [string map {"\\" "\\\\"} $pin]
puts $fjson " \"$pinstr\","
} }
set pin [lindex $cktval end] set pin [string map {"\\" "\\\\"} [lindex $cktval end]]
puts $fjson " \"$pin\"" puts $fjson " \"$pin\""
puts $fjson " \]" puts $fjson " \]"
if {$kidx == $nkeys} { if {$kidx == $nkeys} {

8
tcltk/tclnetgen.c
View File

@ -2650,6 +2650,14 @@ _netcmp_verify(ClientData clientData,
else else
Fprintf(stdout, "Netlists do not match.\n"); Fprintf(stdout, "Netlists do not match.\n");
} }
else if (automorphisms == -2) {
if (index == EQUIV_IDX)
Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1));
else if (index == UNIQUE_IDX)
Tcl_SetObjResult(interp, Tcl_NewIntObj(-2));
else if (index > 0)
Fprintf(stdout, "Circuits match uniquely with port errors.\n");
}
else { else {
if (automorphisms) { if (automorphisms) {
if (index == EQUIV_IDX) if (index == EQUIV_IDX)