Fixed a bad assumption; PropertyOptimize allows devices with

different additive properties (like transistor width) to combine;
this is totally wrong and may have been left over from code written
before the routine was split into simple combinations (add similar
devices) and agressive combinations (e.g., add widths together).
This commit is contained in:
Tim Edwards 2021-05-24 10:05:10 -04:00
parent 759d63cea9
commit 2ac2a3b6f8
2 changed files with 1 additions and 17 deletions

View File

@ -1 +1 @@
1.5.177
1.5.178

View File

@ -4851,22 +4851,6 @@ int PropertyOptimize(struct objlist *ob, struct nlist *tp, int run, int series,
}
}
// Additive properties do not need to be matched, since
// they can be combined. Critical properties must be
// matched. Properties with no merge behavior must match.
ctype = clist[p][i];
if (!(ctype & MERGE_S_CRIT)) {
if ((series == TRUE) && (ctype & (MERGE_S_ADD | MERGE_S_PAR))) {
pmatch++;
continue;
}
if ((series == FALSE) && (ctype & (MERGE_P_ADD | MERGE_P_PAR))) {
pmatch++;
continue;
}
}
switch(vl->type) {
case PROP_DOUBLE:
case PROP_VALUE: