tla-ts 0.0.10-dev.09e53c2a6 → 0.0.10-dev.11307be75

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (214) hide show
  1. package/dist/compile.cjs +3 -3
  2. package/dist/compile.js +1 -1
  3. package/dist/deciders.cjs +36 -36
  4. package/dist/deciders.js +54 -54
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.d.cts +2 -1
  7. package/dist/index.d.ts +2 -1
  8. package/dist/index.js +1 -1
  9. package/dist/parallel-worker.cjs +1 -1
  10. package/dist/parallel-worker.js +1 -1
  11. package/dist/prove-worker.cjs +1 -1
  12. package/dist/prove-worker.js +1 -1
  13. package/dist/prove.cjs +43 -43
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +33 -35
  16. package/dist/run.js +44 -46
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +43 -43
  20. package/dist/transfer.js +38 -38
  21. package/dist/worker.cjs +6 -6
  22. package/dist/worker.js +6 -6
  23. package/package.json +1 -1
  24. package/src/ast.ts +1 -0
  25. package/src/bags.ts +46 -28
  26. package/src/check-trace.ts +2 -16
  27. package/src/check.ts +152 -64
  28. package/src/cli/runtime-invariants.ts +20 -56
  29. package/src/cli/tlc-arguments.ts +2 -2
  30. package/src/cli/tlc-output.ts +1 -2
  31. package/src/cli/tlc.ts +13 -8
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +9 -5
  34. package/src/dependencies.ts +49 -9
  35. package/src/dfid.ts +9 -2
  36. package/src/environment.ts +57 -33
  37. package/src/errors.ts +7 -0
  38. package/src/evaluate.ts +92 -32
  39. package/src/exit-codes.ts +4 -2
  40. package/src/instances.ts +5 -5
  41. package/src/java-overrides.ts +2 -2
  42. package/src/levels.ts +138 -90
  43. package/src/liveness-checker.ts +43 -4
  44. package/src/liveness.ts +1 -1
  45. package/src/obligations/index.ts +1 -1
  46. package/src/obligations/normalize.ts +1 -4
  47. package/src/obligations/printer.ts +5 -5
  48. package/src/parallel-worker.ts +8 -2
  49. package/src/parallel.ts +5 -0
  50. package/src/parser.ts +106 -144
  51. package/src/prover/isabelle/isar/attrib.ts +4 -4
  52. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  53. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  54. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  55. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  56. package/src/prover/isabelle/pure/term.ts +3 -3
  57. package/src/prover/prep/md5.ts +26 -29
  58. package/src/prover/smt/rewrite.ts +2 -7
  59. package/src/prover/smt/simplify.ts +1 -1
  60. package/src/prover/smt/solver/asserted-formulas.ts +66 -1
  61. package/src/prover/smt/solver/ast-lt.ts +1 -1
  62. package/src/prover/smt/solver/ast.ts +58 -11
  63. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  64. package/src/prover/smt/solver/bound-simplifier.ts +2 -3
  65. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  66. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  67. package/src/prover/smt/solver/card2bv.ts +3 -5
  68. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +2 -3
  69. package/src/prover/smt/solver/context.ts +24 -3
  70. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  71. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  72. package/src/prover/smt/solver/dependent-expr-state.ts +9 -4
  73. package/src/prover/smt/solver/diff-neq.ts +1 -2
  74. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  75. package/src/prover/smt/solver/elim-uncnstr.ts +4 -7
  76. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  77. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  78. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  79. package/src/prover/smt/solver/euf/egraph.ts +4 -10
  80. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  81. package/src/prover/smt/solver/euf/mam.ts +1 -5
  82. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  83. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  84. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  85. package/src/prover/smt/solver/factor.ts +36 -14
  86. package/src/prover/smt/solver/fd-solver.ts +2 -0
  87. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  88. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  89. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  90. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  91. package/src/prover/smt/solver/goal.ts +6 -3
  92. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  93. package/src/prover/smt/solver/hashtable.ts +4 -0
  94. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  95. package/src/prover/smt/solver/lp/containers.ts +7 -1
  96. package/src/prover/smt/solver/lp/cross-nested.ts +1 -3
  97. package/src/prover/smt/solver/lp/lp-settings.ts +1 -1
  98. package/src/prover/smt/solver/lp/nex-creator.ts +3 -2
  99. package/src/prover/smt/solver/lp/nex.ts +2 -1
  100. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  101. package/src/prover/smt/solver/lp/nla-grobner.ts +158 -80
  102. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  103. package/src/prover/smt/solver/lp/pdd-interval.ts +6 -2
  104. package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -20
  105. package/src/prover/smt/solver/lp/pdd-solver.ts +72 -39
  106. package/src/prover/smt/solver/lp/pdd.ts +725 -290
  107. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  108. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  109. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  110. package/src/prover/smt/solver/model-generator.ts +3 -1
  111. package/src/prover/smt/solver/mpf.ts +2 -4
  112. package/src/prover/smt/solver/mus.ts +2 -3
  113. package/src/prover/smt/solver/muz/dl-context.ts +10 -4
  114. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  115. package/src/prover/smt/solver/muz/dl-rule.ts +2 -2
  116. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  117. package/src/prover/smt/solver/muz/horn-tactic.ts +1 -1
  118. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  119. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  120. package/src/prover/smt/solver/nlqsat.ts +1 -1
  121. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  122. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  123. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  124. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  125. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  126. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  127. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  128. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  129. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  130. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  131. package/src/prover/smt/solver/nnf.ts +6 -2
  132. package/src/prover/smt/solver/opt-context.ts +9 -3
  133. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  134. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  135. package/src/prover/smt/solver/opt-solver.ts +6 -3
  136. package/src/prover/smt/solver/optsmt.ts +1 -1
  137. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  138. package/src/prover/smt/solver/poly-rewriter.ts +74 -18
  139. package/src/prover/smt/solver/probes.ts +88 -23
  140. package/src/prover/smt/solver/proto-model.ts +4 -6
  141. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  142. package/src/prover/smt/solver/qe-lite.ts +2 -2
  143. package/src/prover/smt/solver/qe.ts +3 -2
  144. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  145. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  146. package/src/prover/smt/solver/rlimit.ts +4 -0
  147. package/src/prover/smt/solver/sat/config.ts +1 -1
  148. package/src/prover/smt/solver/sat/inc-sat-solver.ts +26 -1
  149. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  150. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  151. package/src/prover/smt/solver/sat/sat-tactic.ts +4 -3
  152. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  153. package/src/prover/smt/solver/sat/solver.ts +25 -47
  154. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  155. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  156. package/src/prover/smt/solver/seq-derive.ts +4 -7
  157. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  158. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  159. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  160. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  161. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  162. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  163. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  164. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  165. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  166. package/src/prover/smt/solver/smt-kernel.ts +9 -3
  167. package/src/prover/smt/solver/smt-setup.ts +68 -6
  168. package/src/prover/smt/solver/smtlib-parser.ts +558 -220
  169. package/src/prover/smt/solver/smtlib-script.ts +495 -153
  170. package/src/prover/smt/solver/solve-eqs.ts +13 -21
  171. package/src/prover/smt/solver/tactic.ts +219 -130
  172. package/src/prover/smt/solver/theory-bv.ts +2 -2
  173. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -1
  174. package/src/prover/smt/solver/theory-lra-internalize.ts +1 -0
  175. package/src/prover/smt/solver/theory-lra-propagate.ts +6 -4
  176. package/src/prover/smt/solver/theory-lra.ts +0 -1
  177. package/src/prover/smt/solver/theory-pb.ts +24 -7
  178. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  179. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  180. package/src/prover/tlapm/cache.ts +8 -8
  181. package/src/prover/zenon/equality-rules.ts +24 -0
  182. package/src/prover/zenon/expr.ts +21 -0
  183. package/src/prover/zenon/index-table.ts +7 -2
  184. package/src/prover/zenon/isar-case.ts +1 -1
  185. package/src/prover/zenon/isar.ts +2 -2
  186. package/src/prover/zenon/phrase.ts +1 -1
  187. package/src/prover/zenon/rules.ts +2 -1
  188. package/src/resolve.ts +779 -225
  189. package/src/runtime.ts +3 -1
  190. package/src/sany/builtins.ts +10 -10
  191. package/src/sany/generation.ts +2 -13
  192. package/src/sany/generator-definitions.ts +3 -1
  193. package/src/sany/generator-expressions.ts +36 -30
  194. package/src/sany/generator-proofs.ts +5 -3
  195. package/src/sany/generator.ts +2 -1
  196. package/src/sany/lexer.ts +3 -3
  197. package/src/sany/modules.ts +4 -2
  198. package/src/sany/nodes.ts +1 -1
  199. package/src/sany/selectors.ts +11 -6
  200. package/src/sany/xml.ts +2 -3
  201. package/src/search.ts +51 -22
  202. package/src/spec-description.ts +2 -2
  203. package/src/subexpressions.ts +337 -102
  204. package/src/successors.ts +1 -0
  205. package/src/symmetry.ts +1 -1
  206. package/src/tlc/jar-data.ts +10 -0
  207. package/src/tlc/messages.ts +3 -3
  208. package/src/tlc/order.ts +14 -3
  209. package/src/tlc/tlc-operators.ts +3 -1
  210. package/src/tlc/tlcext-operators.ts +18 -5
  211. package/src/tlc/trace-spec.ts +5 -5
  212. package/src/typed-tier.ts +29 -23
  213. package/src/typescript/types.ts +2 -2
  214. package/src/values.ts +46 -27
@@ -1,4 +1,5 @@
1
1
  import { mkJoin } from "./dependency";
2
+ import type { Pdd } from "./pdd";
2
3
  import { type Equation, type PddSolver, SetUpdate, SOLVED, TO_SIMPLIFY } from "./pdd-solver";
3
4
  import { shrink } from "../array";
4
5
 
@@ -17,9 +18,12 @@ export class PddSimplifier {
17
18
  }
18
19
 
19
20
  private simplifyLinearStep(isBinary: boolean) {
20
- const linear = this.solver.toSimplify.filter((equation) =>
21
- isBinary ? equation.poly.isBinary() : equation.poly.isLinear(),
22
- );
21
+ const linear: Equation[] = [];
22
+ for (const equation of this.solver.toSimplify) {
23
+ const poly = equation.poly.copy();
24
+ if (isBinary ? poly.isBinary() : poly.isLinear()) linear.push(equation);
25
+ poly.release();
26
+ }
23
27
  if (linear.length === 0) return false;
24
28
  return this.simplifyLinear(linear);
25
29
  }
@@ -40,8 +44,10 @@ export class PddSimplifier {
40
44
  for (let index = 0, length = uses.length; index < length; index++) {
41
45
  const target = uses[index];
42
46
  if (source === target || solver.isTrivial(target)) continue;
43
- if (!source.poly.isBinary() && !target.poly.isLinear()) {
47
+ const targetPoly = target.poly.copy();
48
+ if (!source.poly.isBinary() && !targetPoly.isLinear()) {
44
49
  isAllReduced = false;
50
+ targetPoly.release();
45
51
  continue;
46
52
  }
47
53
  this.removeFromUse(target, useList, variable);
@@ -57,6 +63,7 @@ export class PddSimplifier {
57
63
  solver.pushEquation(TO_SIMPLIFY, target);
58
64
  }
59
65
  this.addToUse(target, useList);
66
+ targetPoly.release();
60
67
  }
61
68
  if (isAllReduced) linear[kept++] = source;
62
69
  }
@@ -67,7 +74,7 @@ export class PddSimplifier {
67
74
  solver.pushEquation(SOLVED, source);
68
75
  }
69
76
  }
70
- for (const equation of trivial) solver.popEquation(equation);
77
+ for (const equation of trivial) solver.delEquation(equation);
71
78
  return kept > 0 || hasConflict;
72
79
  }
73
80
 
@@ -78,32 +85,55 @@ export class PddSimplifier {
78
85
  const update = new SetUpdate(solver.toSimplify);
79
86
  for (; update.i < update.size; update.i++) {
80
87
  const first = update.get();
81
- const poly = first.poly;
82
- const second = los.get(poly.lo().root) ?? first;
83
- if (second === first) los.set(poly.lo().root, first);
84
- if (
85
- second !== first &&
86
- (poly.hi().isVal() || second.poly.hi().isVal()) &&
87
- !poly.lo().isVal()
88
- ) {
89
- first.poly = poly.sub(second.poly);
88
+ const poly = first.poly.copy();
89
+ const lo = poly.lo();
90
+ const second = los.get(lo.root) ?? first;
91
+ if (second === first) los.set(lo.root, first);
92
+ lo.release();
93
+ const secondPoly = second.poly.copy();
94
+ if (second !== first && this.isCcReducible(poly, secondPoly)) {
95
+ const difference = poly.sub(second.poly);
96
+ first.poly.assign(difference);
97
+ difference.release();
90
98
  first.dep = mkJoin(first.dep, second.dep);
91
99
  isReduced = true;
92
- if (solver.isTrivial(first) || solver.checkConflict(first)) continue;
100
+ const isTrivial = solver.isTrivial(first);
101
+ if (isTrivial) solver.retire(first);
102
+ if (isTrivial || solver.checkConflict(first)) {
103
+ secondPoly.release();
104
+ poly.release();
105
+ continue;
106
+ }
93
107
  }
94
108
  update.nextj();
109
+ secondPoly.release();
110
+ poly.release();
95
111
  }
96
112
  update.finish();
97
113
  return isReduced;
98
114
  }
99
115
 
116
+ private isCcReducible(poly: Pdd, secondPoly: Pdd) {
117
+ const hi = poly.hi();
118
+ const secondHi = hi.isVal() ? null : secondPoly.hi();
119
+ const lo = secondHi === null || secondHi.isVal() ? poly.lo() : null;
120
+ const isReducible = lo !== null && !lo.isVal();
121
+ lo?.release();
122
+ secondHi?.release();
123
+ hi.release();
124
+ return isReducible;
125
+ }
126
+
100
127
  private simplifyLeafStep() {
101
128
  const solver = this.solver;
102
129
  const useList = this.getUseList();
103
130
  for (let index = 0; index < solver.toSimplify.length; index++) {
104
131
  const source = solver.toSimplify[index];
105
- const poly = source.poly;
106
- if (poly.isVal() || !poly.hi().isVal()) continue;
132
+ const poly = source.poly.copy();
133
+ if (poly.isVal() || !this.isHiVal(poly)) {
134
+ poly.release();
135
+ continue;
136
+ }
107
137
  const leaves = useList[poly.var()].filter(
108
138
  (target) => target !== source && target.poly.varIsLeaf(poly.var()),
109
139
  );
@@ -112,16 +142,18 @@ export class PddSimplifier {
112
142
  const isLeadingTermChanged = solver.simplifyUsing(target, source);
113
143
  this.addToUse(target, useList);
114
144
  if (solver.isTrivial(target)) {
115
- solver.popEquation(target);
145
+ solver.delEquation(target);
116
146
  } else if (target.poly.isVal()) {
117
147
  solver.popEquation(target);
118
148
  solver.setConflict(target);
149
+ poly.release();
119
150
  return true;
120
151
  } else if (isLeadingTermChanged) {
121
152
  solver.popEquation(target);
122
153
  solver.pushEquation(TO_SIMPLIFY, target);
123
154
  }
124
155
  }
156
+ poly.release();
125
157
  }
126
158
  return false;
127
159
  }
@@ -133,18 +165,26 @@ export class PddSimplifier {
133
165
  let hasSolved = false;
134
166
  for (; update.i < update.size; update.i++) {
135
167
  const equation = update.get();
136
- const poly = equation.poly;
137
- if (!poly.isVal() && poly.hi().isVal() && useList[poly.var()].length === 1) {
168
+ const poly = equation.poly.copy();
169
+ if (!poly.isVal() && this.isHiVal(poly) && useList[poly.var()].length === 1) {
138
170
  solver.pushEquation(SOLVED, equation);
139
171
  hasSolved = true;
140
172
  } else {
141
173
  update.nextj();
142
174
  }
175
+ poly.release();
143
176
  }
144
177
  update.finish();
145
178
  return hasSolved;
146
179
  }
147
180
 
181
+ private isHiVal(poly: Pdd) {
182
+ const hi = poly.hi();
183
+ const isVal = hi.isVal();
184
+ hi.release();
185
+ return isVal;
186
+ }
187
+
148
188
  private addToUse(equation: Equation, useList: Equation[][]) {
149
189
  for (const variable of equation.poly.freeVars()) {
150
190
  while (useList.length <= variable) useList.push([]);
@@ -47,11 +47,14 @@ class PddSolverStats {
47
47
  export class Equation {
48
48
  state = TO_SIMPLIFY;
49
49
  idx = 0;
50
+ readonly poly: Pdd;
50
51
 
51
52
  constructor(
52
- public poly: Pdd,
53
+ poly: Pdd,
53
54
  public dep: Dependency,
54
- ) {}
55
+ ) {
56
+ this.poly = poly.copy();
57
+ }
55
58
  }
56
59
 
57
60
  export class SetUpdate {
@@ -111,6 +114,10 @@ export class PddSolver {
111
114
  }
112
115
 
113
116
  reset() {
117
+ for (const equation of this.solved) equation.poly.release();
118
+ for (const equation of this.toSimplify) equation.poly.release();
119
+ for (const equation of this.processed) equation.poly.release();
120
+ for (const subst of this.substs) subst.poly.release();
114
121
  this.substs = [];
115
122
  this.solved = [];
116
123
  this.processed = [];
@@ -132,19 +139,20 @@ export class PddSolver {
132
139
  }
133
140
 
134
141
  simplify(poly: Pdd, dep: Dependency) {
135
- let result = poly;
136
142
  let resultDep = dep;
137
143
  for (const subst of this.substs) {
138
- const substituted = result.substPdd(subst.variable, subst.poly);
139
- if (substituted.equals(result)) continue;
140
- result = substituted;
141
- resultDep = mkJoin(resultDep, subst.dep);
144
+ const substituted = poly.substPdd(subst.variable, subst.poly);
145
+ if (!substituted.equals(poly)) {
146
+ poly.assign(substituted);
147
+ resultDep = mkJoin(resultDep, subst.dep);
148
+ }
149
+ substituted.release();
142
150
  }
143
- return { poly: result, dep: resultDep };
151
+ return resultDep;
144
152
  }
145
153
 
146
154
  addSubst(variable: number, poly: Pdd, dep: Dependency) {
147
- this.substs.push({ variable, poly, dep });
155
+ this.substs.push({ variable, poly: poly.copy(), dep });
148
156
  if (this.var2level.length > 0) {
149
157
  this.levelp1 = Math.max(
150
158
  this.var2level[variable] + 1,
@@ -153,14 +161,9 @@ export class PddSolver {
153
161
  }
154
162
  const simplifier = (target: Equation) => {
155
163
  const substituted = target.poly.substPdd(variable, poly);
156
- if (substituted.equals(target.poly)) return null;
157
- if (this.isTooComplex(substituted)) {
158
- this.isTooComplexFound = true;
159
- return null;
160
- }
161
- const isLeadingTermChanged = substituted.differentLeadingTerm(target.poly);
162
- target.poly = substituted;
163
- target.dep = mkJoin(target.dep, dep);
164
+ const isLeadingTermChanged = this.simplifyTo(target, substituted, true);
165
+ if (isLeadingTermChanged !== null) target.dep = mkJoin(target.dep, dep);
166
+ substituted.release();
164
167
  return isLeadingTermChanged;
165
168
  };
166
169
  if (!this.isDone()) this.simplifySetUsing(this.processed, simplifier);
@@ -191,6 +194,7 @@ export class PddSolver {
191
194
  this.simplifyUsingAll(equation, this.processed);
192
195
  if (this.isTrivial(equation)) {
193
196
  pending = null;
197
+ this.retire(equation);
194
198
  return true;
195
199
  }
196
200
  if (this.checkConflict(equation)) {
@@ -205,7 +209,9 @@ export class PddSolver {
205
209
  if (this.isDone()) return false;
206
210
  if (!this.isTooComplexFound) {
207
211
  pending = null;
208
- this.pushEquation(equation.poly.degree() === 1 ? SOLVED : PROCESSED, equation);
212
+ const poly = equation.poly.copy();
213
+ this.pushEquation(poly.degree() === 1 ? SOLVED : PROCESSED, equation);
214
+ poly.release();
209
215
  }
210
216
  return true;
211
217
  } finally {
@@ -239,13 +245,12 @@ export class PddSolver {
239
245
  }
240
246
 
241
247
  private superpose(first: Equation, second: Equation) {
242
- const poly = this.manager.trySpoly(first.poly, second.poly);
243
- if (poly === null || poly.isZero()) return;
244
- if (this.isTooComplex(poly)) {
245
- this.isTooComplexFound = true;
246
- return;
248
+ const poly = this.manager.zero();
249
+ if (this.manager.trySpoly(first.poly, second.poly, poly) && !poly.isZero()) {
250
+ if (this.isTooComplex(poly)) this.isTooComplexFound = true;
251
+ else this.add(poly, mkJoin(first.dep, second.dep));
247
252
  }
248
- this.add(poly, mkJoin(first.dep, second.dep));
253
+ poly.release();
249
254
  }
250
255
 
251
256
  private simplifyUsingAll(equation: Equation, set: Equation[]) {
@@ -257,9 +262,14 @@ export class PddSolver {
257
262
  if (this.isCanceled() || equation.poly.isVal()) break;
258
263
  }
259
264
  } while (isSimplified && !equation.poly.isVal());
260
- if (equation.poly.isUnary() && equation.poly.hi().val().isNegative()) {
261
- equation.poly = equation.poly.neg();
262
- }
265
+ if (!equation.poly.isUnary()) return;
266
+ const hi = equation.poly.hi();
267
+ const isNegative = hi.val().isNegative();
268
+ hi.release();
269
+ if (!isNegative) return;
270
+ const negated = equation.poly.neg();
271
+ equation.poly.assign(negated);
272
+ negated.release();
263
273
  }
264
274
 
265
275
  private simplifySetUsingEquation(set: Equation[], source: Equation) {
@@ -271,7 +281,10 @@ export class PddSolver {
271
281
  for (; update.i < update.size; update.i++) {
272
282
  const target = set[update.i];
273
283
  const isLeadingTermChanged = this.isDone() ? null : simplifier(target);
274
- if (isLeadingTermChanged !== null && this.isTrivial(target)) continue;
284
+ if (isLeadingTermChanged !== null && this.isTrivial(target)) {
285
+ this.retire(target);
286
+ continue;
287
+ }
275
288
  if (isLeadingTermChanged !== null && this.checkConflict(target)) continue;
276
289
  if (isLeadingTermChanged === true) {
277
290
  if (set === this.toSimplify) update.nextj();
@@ -289,28 +302,39 @@ export class PddSolver {
289
302
  private trySimplifyUsing(target: Equation, source: Equation) {
290
303
  if (source === target) return null;
291
304
  this.stats.simplified++;
292
- const reduced = target.poly.reduce(source.poly);
293
- if (reduced.equals(target.poly)) return null;
294
- if (this.isTooComplex(reduced)) {
305
+ const sourcePoly = source.poly.copy();
306
+ const reduced = target.poly.reduce(sourcePoly);
307
+ const isLeadingTermChanged = this.simplifyTo(target, reduced, target.state === PROCESSED);
308
+ if (isLeadingTermChanged !== null) target.dep = mkJoin(target.dep, source.dep);
309
+ reduced.release();
310
+ sourcePoly.release();
311
+ return isLeadingTermChanged;
312
+ }
313
+
314
+ private simplifyTo(target: Equation, poly: Pdd, isLeadingTermTracked: boolean) {
315
+ if (poly.equals(target.poly)) return null;
316
+ if (this.isTooComplex(poly)) {
295
317
  this.isTooComplexFound = true;
296
318
  return null;
297
319
  }
298
- const isLeadingTermChanged =
299
- target.state === PROCESSED && reduced.differentLeadingTerm(target.poly);
300
- target.poly = reduced;
301
- target.dep = mkJoin(target.dep, source.dep);
320
+ const isLeadingTermChanged = isLeadingTermTracked && poly.differentLeadingTerm(target.poly);
321
+ target.poly.assign(poly);
302
322
  return isLeadingTermChanged;
303
323
  }
304
324
 
305
325
  simplifyUsing(target: Equation, source: Equation) {
306
326
  if (source === target) return false;
307
327
  this.stats.simplified++;
308
- const reduced = target.poly.reduce(source.poly);
328
+ const sourcePoly = source.poly.copy();
329
+ const reduced = target.poly.reduce(sourcePoly);
309
330
  const isLeadingTermChanged =
310
331
  target.state === PROCESSED && reduced.differentLeadingTerm(target.poly);
311
- if (reduced.equals(target.poly)) return isLeadingTermChanged;
312
- target.poly = reduced;
313
- target.dep = mkJoin(target.dep, source.dep);
332
+ if (!reduced.equals(target.poly)) {
333
+ target.poly.assign(reduced);
334
+ target.dep = mkJoin(target.dep, source.dep);
335
+ }
336
+ reduced.release();
337
+ sourcePoly.release();
314
338
  return isLeadingTermChanged;
315
339
  }
316
340
 
@@ -358,6 +382,15 @@ export class PddSolver {
358
382
  return state === TO_SIMPLIFY ? this.toSimplify : this.solved;
359
383
  }
360
384
 
385
+ delEquation(equation: Equation) {
386
+ this.popEquation(equation);
387
+ this.retire(equation);
388
+ }
389
+
390
+ retire(equation: Equation) {
391
+ equation.poly.release();
392
+ }
393
+
361
394
  popEquation(equation: Equation) {
362
395
  const set = this.getQueue(equation.state);
363
396
  const last = set[set.length - 1];