Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards
2021-10-29 03:00:32 -04:00
3 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
1.5.206 1.5.207
+2 -1
View File
@@ -1582,7 +1582,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
} }
} }
else { else {
match = 0; // cell exists in one circuit but not the other, so flatten it.
// match = 0;
break; break;
} }
} }
+1
View File
@@ -2194,6 +2194,7 @@ _netcmp_compare(ClientData clientData,
CreateTwoLists(name1, fnum1, name2, fnum2, dolist); CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
while (PrematchLists(name1, fnum1, name2, fnum2) > 0) { while (PrematchLists(name1, fnum1, name2, fnum2) > 0) {
Fprintf(stdout, "Making another compare attempt.\n"); Fprintf(stdout, "Making another compare attempt.\n");
Printf("Flattened mismatched instances and attempting compare again.\n");
CreateTwoLists(name1, fnum1, name2, fnum2, dolist); CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
} }