tla-ts 0.0.10-dev.c92e6a4ea → 0.0.10-dev.d166e0ae9

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 (235) 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 +13 -3
  7. package/dist/index.d.ts +13 -3
  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 +68 -68
  14. package/dist/prove.js +78 -78
  15. package/dist/run.cjs +42 -42
  16. package/dist/run.js +44 -44
  17. package/dist/tlapm.cjs +1 -1
  18. package/dist/tlapm.js +2 -2
  19. package/dist/transfer.cjs +45 -43
  20. package/dist/transfer.js +45 -43
  21. package/dist/worker.cjs +7 -7
  22. package/dist/worker.js +7 -7
  23. package/package.json +1 -1
  24. package/src/ast.ts +11 -1
  25. package/src/bags.ts +50 -29
  26. package/src/builtins.ts +4 -3
  27. package/src/check-failure.ts +9 -6
  28. package/src/check-trace.ts +116 -64
  29. package/src/check.ts +356 -173
  30. package/src/cli/tlc-output.ts +1 -0
  31. package/src/cli/tlc.ts +4 -3
  32. package/src/cli/xml-exporter.ts +1 -1
  33. package/src/codegen.ts +34 -13
  34. package/src/coverage.ts +3 -0
  35. package/src/dependencies.ts +61 -13
  36. package/src/dfid.ts +22 -10
  37. package/src/environment.ts +71 -35
  38. package/src/errors.ts +7 -0
  39. package/src/evaluate.ts +149 -54
  40. package/src/exit-codes.ts +29 -15
  41. package/src/instances.ts +16 -6
  42. package/src/java-hash.ts +14 -0
  43. package/src/java-overrides.ts +2 -2
  44. package/src/levels.ts +186 -97
  45. package/src/liveness-checker.ts +131 -83
  46. package/src/liveness.ts +52 -11
  47. package/src/obligations/index.ts +1 -1
  48. package/src/obligations/normalize.ts +1 -4
  49. package/src/obligations/printer.ts +5 -5
  50. package/src/obligations/source.ts +2 -0
  51. package/src/parser.ts +115 -145
  52. package/src/prover/isabelle/isar/attrib.ts +4 -4
  53. package/src/prover/isabelle/isar/rule-cases.ts +8 -6
  54. package/src/prover/isabelle/provers/clasimp.ts +1 -1
  55. package/src/prover/isabelle/provers/hypsubst.ts +2 -2
  56. package/src/prover/isabelle/pure/rewriter.ts +3 -3
  57. package/src/prover/isabelle/pure/term.ts +3 -3
  58. package/src/prover/prep/md5.ts +26 -29
  59. package/src/prover/smt/rewrite.ts +2 -7
  60. package/src/prover/smt/simplify.ts +1 -1
  61. package/src/prover/smt/solver/arith-rewriter.ts +11 -3
  62. package/src/prover/smt/solver/array-rewriter.ts +12 -2
  63. package/src/prover/smt/solver/asserted-formulas.ts +169 -58
  64. package/src/prover/smt/solver/ast-lt.ts +1 -1
  65. package/src/prover/smt/solver/ast.ts +63 -14
  66. package/src/prover/smt/solver/auf-solver.ts +23 -12
  67. package/src/prover/smt/solver/bit-blast-tactic.ts +26 -0
  68. package/src/prover/smt/solver/blast-term-ite.ts +47 -0
  69. package/src/prover/smt/solver/bound-simplifier.ts +11 -13
  70. package/src/prover/smt/solver/bv-decl-plugin.ts +13 -10
  71. package/src/prover/smt/solver/bv-rewriter.ts +1 -1
  72. package/src/prover/smt/solver/card2bv.ts +35 -18
  73. package/src/prover/smt/solver/cofactor-elim-term-ite.ts +39 -24
  74. package/src/prover/smt/solver/context.ts +67 -13
  75. package/src/prover/smt/solver/ctx-simplify.ts +1 -2
  76. package/src/prover/smt/solver/datatype-decl-plugin.ts +15 -7
  77. package/src/prover/smt/solver/dependent-expr-state.ts +26 -15
  78. package/src/prover/smt/solver/diff-neq.ts +1 -2
  79. package/src/prover/smt/solver/dt2bv-tactic.ts +36 -20
  80. package/src/prover/smt/solver/elim-bounds.ts +89 -0
  81. package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
  82. package/src/prover/smt/solver/elim-uncnstr.ts +5 -8
  83. package/src/prover/smt/solver/euf/arith-internalize.ts +1 -1
  84. package/src/prover/smt/solver/euf/array-internalize.ts +1 -1
  85. package/src/prover/smt/solver/euf/bv-internalize.ts +1 -1
  86. package/src/prover/smt/solver/euf/egraph.ts +4 -11
  87. package/src/prover/smt/solver/euf/euf-solver.ts +1 -2
  88. package/src/prover/smt/solver/euf/mam.ts +1 -5
  89. package/src/prover/smt/solver/euf/q-ematch.ts +1 -2
  90. package/src/prover/smt/solver/euf/th-solver.ts +0 -7
  91. package/src/prover/smt/solver/expr2polynomial.ts +204 -79
  92. package/src/prover/smt/solver/factor.ts +36 -14
  93. package/src/prover/smt/solver/fd-solver.ts +148 -39
  94. package/src/prover/smt/solver/fix-dl-var.ts +1 -2
  95. package/src/prover/smt/solver/fpa-rewriter.ts +1 -2
  96. package/src/prover/smt/solver/fpa2bv-converter.ts +3 -1
  97. package/src/prover/smt/solver/fpa2bv-rewriter.ts +1 -0
  98. package/src/prover/smt/solver/goal.ts +6 -3
  99. package/src/prover/smt/solver/goal2nlsat.ts +57 -30
  100. package/src/prover/smt/solver/hashtable.ts +4 -0
  101. package/src/prover/smt/solver/internalizer.ts +1 -1
  102. package/src/prover/smt/solver/logic-tactics.ts +9 -2
  103. package/src/prover/smt/solver/lp/lp-settings.ts +5 -1
  104. package/src/prover/smt/solver/lp/nla-core.ts +1 -1
  105. package/src/prover/smt/solver/lp/nla-grobner.ts +2 -2
  106. package/src/prover/smt/solver/lp/nra-solver.ts +45 -39
  107. package/src/prover/smt/solver/lp/pdd.ts +2 -3
  108. package/src/prover/smt/solver/lp/union-find.ts +1 -1
  109. package/src/prover/smt/solver/mam-compiler.ts +1 -1
  110. package/src/prover/smt/solver/maxcore.ts +2 -1
  111. package/src/prover/smt/solver/maxsmt-base.ts +1 -0
  112. package/src/prover/smt/solver/model-based-opt.ts +1 -1
  113. package/src/prover/smt/solver/model-checker.ts +1 -1
  114. package/src/prover/smt/solver/model-evaluator.ts +2 -0
  115. package/src/prover/smt/solver/model-generator.ts +85 -43
  116. package/src/prover/smt/solver/mpf.ts +2 -4
  117. package/src/prover/smt/solver/mus.ts +2 -3
  118. package/src/prover/smt/solver/muz/dl-context.ts +22 -44
  119. package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +1 -1
  120. package/src/prover/smt/solver/muz/dl-mk-slice.ts +3 -3
  121. package/src/prover/smt/solver/muz/dl-rule.ts +8 -9
  122. package/src/prover/smt/solver/muz/hnf.ts +2 -2
  123. package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +1 -1
  124. package/src/prover/smt/solver/muz/horn-tactic.ts +15 -2
  125. package/src/prover/smt/solver/muz/rule-properties.ts +22 -0
  126. package/src/prover/smt/solver/muz/spacer-context.ts +2 -4
  127. package/src/prover/smt/solver/muz/spacer-pdr.ts +1 -0
  128. package/src/prover/smt/solver/muz/spacer-prop-solver.ts +1 -1
  129. package/src/prover/smt/solver/nlqsat.ts +1 -1
  130. package/src/prover/smt/solver/nlsat/algebraic.ts +196 -92
  131. package/src/prover/smt/solver/nlsat/atoms.ts +52 -33
  132. package/src/prover/smt/solver/nlsat/explain.ts +375 -217
  133. package/src/prover/smt/solver/nlsat/levelwise.ts +460 -240
  134. package/src/prover/smt/solver/nlsat/polynomial.ts +2366 -681
  135. package/src/prover/smt/solver/nlsat/solver.ts +74 -64
  136. package/src/prover/smt/solver/nlsat/transcendentals.ts +41 -17
  137. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +8 -4
  138. package/src/prover/smt/solver/nlsat/upolynomial.ts +41 -18
  139. package/src/prover/smt/solver/nlsat-tactic.ts +1 -1
  140. package/src/prover/smt/solver/nnf.ts +6 -2
  141. package/src/prover/smt/solver/opt-context.ts +21 -7
  142. package/src/prover/smt/solver/opt-nlsat.ts +29 -18
  143. package/src/prover/smt/solver/opt-pareto.ts +19 -0
  144. package/src/prover/smt/solver/opt-preprocess.ts +1 -1
  145. package/src/prover/smt/solver/opt-solver.ts +10 -6
  146. package/src/prover/smt/solver/optsmt.ts +1 -1
  147. package/src/prover/smt/solver/parallel-tactic.ts +1 -1
  148. package/src/prover/smt/solver/pb-rewriter.ts +1 -4
  149. package/src/prover/smt/solver/poly-rewriter.ts +75 -18
  150. package/src/prover/smt/solver/probes.ts +88 -23
  151. package/src/prover/smt/solver/proto-model.ts +8 -8
  152. package/src/prover/smt/solver/push-app-ite.ts +37 -0
  153. package/src/prover/smt/solver/qe-arith-plugin.ts +2 -4
  154. package/src/prover/smt/solver/qe-lite.ts +2 -2
  155. package/src/prover/smt/solver/qe.ts +3 -2
  156. package/src/prover/smt/solver/qsat.ts +23 -8
  157. package/src/prover/smt/solver/quantifier-manager.ts +14 -9
  158. package/src/prover/smt/solver/recfun-decl-plugin.ts +2 -1
  159. package/src/prover/smt/solver/rewriter-tpl.ts +7 -6
  160. package/src/prover/smt/solver/rewriter.ts +31 -25
  161. package/src/prover/smt/solver/rlimit.ts +4 -0
  162. package/src/prover/smt/solver/sat/config.ts +1 -1
  163. package/src/prover/smt/solver/sat/goal2sat.ts +0 -1
  164. package/src/prover/smt/solver/sat/inc-sat-solver.ts +81 -28
  165. package/src/prover/smt/solver/sat/model-converter.ts +1 -1
  166. package/src/prover/smt/solver/sat/pb-solver.ts +1 -1
  167. package/src/prover/smt/solver/sat/sat-tactic.ts +17 -7
  168. package/src/prover/smt/solver/sat/sat2goal.ts +10 -7
  169. package/src/prover/smt/solver/sat/simplifier.ts +1 -1
  170. package/src/prover/smt/solver/sat/solver.ts +25 -47
  171. package/src/prover/smt/solver/seq-axioms.ts +20 -35
  172. package/src/prover/smt/solver/seq-decl-plugin.ts +1 -1
  173. package/src/prover/smt/solver/seq-derive.ts +2 -2
  174. package/src/prover/smt/solver/seq-eq-solver.ts +2 -2
  175. package/src/prover/smt/solver/seq-monadic.ts +7 -5
  176. package/src/prover/smt/solver/seq-re-rewriter.ts +2 -1
  177. package/src/prover/smt/solver/seq-re-util.ts +1 -1
  178. package/src/prover/smt/solver/seq-regex-bisim.ts +1 -1
  179. package/src/prover/smt/solver/seq-regex-live.ts +2 -2
  180. package/src/prover/smt/solver/seq-rewriter.ts +31 -29
  181. package/src/prover/smt/solver/seq-skolem.ts +0 -23
  182. package/src/prover/smt/solver/seq-view-witness.ts +4 -4
  183. package/src/prover/smt/solver/smt-consequences.ts +1 -1
  184. package/src/prover/smt/solver/smt-kernel.ts +48 -7
  185. package/src/prover/smt/solver/smt-setup.ts +96 -10
  186. package/src/prover/smt/solver/smtlib-parser.ts +589 -224
  187. package/src/prover/smt/solver/smtlib-script.ts +674 -195
  188. package/src/prover/smt/solver/solve-eqs.ts +36 -37
  189. package/src/prover/smt/solver/solver.ts +18 -3
  190. package/src/prover/smt/solver/tactic.ts +332 -189
  191. package/src/prover/smt/solver/theory-bv.ts +13 -3
  192. package/src/prover/smt/solver/theory-fpa.ts +1 -1
  193. package/src/prover/smt/solver/theory-lra-final-check.ts +1 -0
  194. package/src/prover/smt/solver/theory-lra-internalize.ts +2 -0
  195. package/src/prover/smt/solver/theory-lra-propagate.ts +11 -3
  196. package/src/prover/smt/solver/theory-lra.ts +1 -1
  197. package/src/prover/smt/solver/theory-pb.ts +24 -7
  198. package/src/prover/smt/solver/theory-seq-solve.ts +1 -1
  199. package/src/prover/smt/solver/theory-seq-state.ts +2 -21
  200. package/src/prover/smt/solver/tseitin-cnf.ts +1 -0
  201. package/src/prover/tlapm/cache.ts +8 -8
  202. package/src/prover/zenon/index-table.ts +5 -2
  203. package/src/prover/zenon/isar-case.ts +1 -1
  204. package/src/prover/zenon/isar.ts +2 -2
  205. package/src/prover/zenon/phrase.ts +1 -1
  206. package/src/resolve.ts +1071 -251
  207. package/src/runtime.ts +5 -1
  208. package/src/sany/builtins.ts +10 -10
  209. package/src/sany/generation.ts +2 -13
  210. package/src/sany/generator-definitions.ts +3 -1
  211. package/src/sany/generator-expressions.ts +38 -30
  212. package/src/sany/generator-proofs.ts +6 -3
  213. package/src/sany/generator.ts +2 -1
  214. package/src/sany/lexer.ts +3 -3
  215. package/src/sany/modules.ts +4 -2
  216. package/src/sany/nodes.ts +1 -1
  217. package/src/sany/selectors.ts +11 -6
  218. package/src/sany/xml.ts +2 -3
  219. package/src/search.ts +197 -117
  220. package/src/simulate.ts +165 -102
  221. package/src/spec-description.ts +8 -6
  222. package/src/standard-modules.ts +56 -22
  223. package/src/subexpressions.ts +518 -123
  224. package/src/successors.ts +10 -3
  225. package/src/symmetry.ts +2 -1
  226. package/src/tlc/jar-data.ts +10 -0
  227. package/src/tlc/messages.ts +3 -3
  228. package/src/tlc/random.ts +2 -1
  229. package/src/tlc/replay.ts +27 -14
  230. package/src/tlc/tlc-operators.ts +10 -8
  231. package/src/tlc/tlcext-operators.ts +26 -10
  232. package/src/tlc/trace-spec.ts +9 -22
  233. package/src/typed-tier.ts +44 -27
  234. package/src/typescript/types.ts +2 -2
  235. package/src/values.ts +135 -78
@@ -403,8 +403,7 @@ const mkIsInfOfInt = (
403
403
  ? mkCompare(OP_LE, -threshold)
404
404
  : manager.falseExpr;
405
405
  }
406
- // Deviation from Z3: Z3 gives up from an exponent width of 34. From 31, MAX_FINITE is a numeral of
407
- // 2^30 bits, more than a BigInt holds, so those widths give up too.
406
+ // Deviation from Z3: it runs out of memory from an exponent width of 31, so this gives up as Z3 does from 34.
408
407
  if (ebits > 30) return -1;
409
408
  const maxFinite = mpfToRational(mkMaxValue(ebits, sbits, false)).num;
410
409
  const halfUlp = 1n << BigInt(maxExp - sbits);
@@ -1,6 +1,6 @@
1
1
  // A statement that discards its result builds a term that upstream builds and never uses, so the
2
2
  // terms after it get the ids Z3 gives them.
3
- import { SmtUnsupportedError } from "../../../errors";
3
+ import { SmtCanceledError, SmtUnsupportedError } from "../../../errors";
4
4
  import {
5
5
  type AstManager,
6
6
  OP_BADD,
@@ -1440,6 +1440,8 @@ export class Fpa2BvConverter {
1440
1440
  const manager = this.manager;
1441
1441
  const ebits = manager.getEbits(sort);
1442
1442
  const sbits = manager.getSbits(sort);
1443
+ // Deviation from Z3: it runs out of memory from an exponent width of 31, where this gives up as at a resource limit.
1444
+ if (ebits > 30) throw new SmtCanceledError();
1443
1445
  const x =
1444
1446
  manager.sorts[input] === SORT_INT ? manager.mkApp(OP_TO_REAL, [input], SORT_REAL) : input;
1445
1447
  const real = (op: number, ...args: number[]) => manager.mkApp(op, args, SORT_REAL);
@@ -214,6 +214,7 @@ export class Fpa2BvRewriter extends RewriterTpl {
214
214
  isSwapped ? args[1] : args[2],
215
215
  );
216
216
  }
217
+ // Deviation from Z3: mk_sub hands mk_add a rounding mode under bv2rm, so fpa2bv fails on fp.sub.
217
218
  case OP_FPA_SUB:
218
219
  return converter.mkSub(sort, getRm(), args[1], args[2]);
219
220
  case OP_FPA_NEG:
@@ -20,7 +20,6 @@ export const joinDependencies = (
20
20
  ? first
21
21
  : { value: -1, children: [first, second] };
22
22
 
23
- // Breadth first and once per node, so a value that two leaves hold is listed twice.
24
23
  export const getDependencyValues = (dependency: Dependency | undefined) => {
25
24
  if (dependency === undefined) return [];
26
25
  const todo = [dependency];
@@ -35,7 +34,7 @@ export const getDependencyValues = (dependency: Dependency | undefined) => {
35
34
  todo.push(child);
36
35
  }
37
36
  }
38
- return values;
37
+ return [...new Set(values)];
39
38
  };
40
39
 
41
40
  interface Polarized {
@@ -43,7 +42,7 @@ interface Polarized {
43
42
  isPositive: boolean;
44
43
  }
45
44
 
46
- export const PRECISE = 0;
45
+ const PRECISE = 0;
47
46
  export const UNDER = 1;
48
47
  export const OVER = 2;
49
48
  const UNDER_OVER = 3;
@@ -81,7 +80,10 @@ export class Goal {
81
80
  converters: (HiddenDecl | Definitions | ModelConversion)[] = [];
82
81
  model: ProtoModel | undefined;
83
82
  isProofsEnabled = false;
83
+ isModelsEnabled = true;
84
84
  isCoresEnabled = false;
85
+ // As in Z3, it isn't copied with the goal.
86
+ reasonUnknown = "";
85
87
 
86
88
  constructor(readonly manager: AstManager) {
87
89
  this.forms = new RefVector(manager);
@@ -103,6 +105,7 @@ export class Goal {
103
105
  this.precision = getPrecisionUnion(source.precision, this.precision);
104
106
  this.converters = source.converters;
105
107
  this.isProofsEnabled = source.isProofsEnabled;
108
+ this.isModelsEnabled = source.isModelsEnabled;
106
109
  this.isCoresEnabled = source.isCoresEnabled;
107
110
  }
108
111
 
@@ -22,9 +22,10 @@ import {
22
22
  SORT_INT,
23
23
  SORT_REAL,
24
24
  } from "./ast";
25
- import { toPolynomial } from "./expr2polynomial";
25
+ import { Expr2Polynomial } from "./expr2polynomial";
26
26
  import { getLcm } from "./rational";
27
27
  import { flipKind } from "./nlsat/atoms";
28
+ import { Factors, type Polynomial, PolynomialRef } from "./nlsat/polynomial";
28
29
  import type { NlsatSolver } from "./nlsat/solver";
29
30
  import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
30
31
  import type { IneqKind } from "./nlsat/types";
@@ -39,38 +40,54 @@ export const goal2nlsat = (
39
40
  isFactoring = true,
40
41
  ) => {
41
42
  const pm = solver.pm;
43
+ const expr2poly = new Expr2Polynomial(manager, pm, t2x, (isInt) => solver.mkVar(isInt));
42
44
 
43
- const mkVar = (term: number) => {
44
- let variable = t2x.get(term);
45
- if (variable === undefined) {
46
- variable = solver.mkVar(manager.sorts[term] === SORT_INT);
47
- t2x.set(term, variable);
48
- }
49
- return variable;
45
+ const factorAtom = (polynomial: Polynomial, kind: IneqKind) => {
46
+ const factors = new Factors(pm);
47
+ pm.factor(polynomial, factors);
48
+ const literal = solver.mkIneqLiteral(
49
+ factors.constant < 0n ? flipKind(kind) : kind,
50
+ factors.factors,
51
+ factors.degrees.map((degree) => degree % 2 === 0),
52
+ );
53
+ factors.reset();
54
+ return literal;
50
55
  };
51
56
 
52
- const processIneq = (atom: number, kind: IneqKind) => {
53
- const lhs = toPolynomial(manager, pm, manager.getArg(atom, 0), mkVar);
54
- const rhs = toPolynomial(manager, pm, manager.getArg(atom, 1), mkVar);
55
- const lcm = getLcm(lhs.denominator, rhs.denominator);
56
- const polynomial = pm.addmul(
57
- lcm / lhs.denominator,
58
- lhs.polynomial,
59
- -(lcm / rhs.denominator),
60
- rhs.polynomial,
61
- );
57
+ const processIneqPolynomial = (p: PolynomialRef, kind: IneqKind) => {
58
+ const polynomial = p.get();
62
59
  if (pm.isConst(polynomial)) {
63
60
  const sign = pm.isZero(polynomial) ? 0 : polynomial.as[0] > 0n ? 1 : -1;
64
61
  const isTrue = kind === "EQ" ? sign === 0 : kind === "LT" ? sign < 0 : sign > 0;
65
62
  return isTrue ? 0 : 1;
66
63
  }
67
- if (!isFactoring) return solver.mkIneqLiteral(kind, [polynomial], [false]);
68
- const factors = pm.factor(polynomial);
69
- return solver.mkIneqLiteral(
70
- factors.constant < 0n ? flipKind(kind) : kind,
71
- factors.factors,
72
- factors.degrees.map((degree) => degree % 2 === 0),
64
+ return isFactoring
65
+ ? factorAtom(polynomial, kind)
66
+ : solver.mkIneqLiteral(kind, [polynomial], [false]);
67
+ };
68
+
69
+ const processIneq = (atom: number, kind: IneqKind) => {
70
+ const first = new PolynomialRef(pm);
71
+ const second = new PolynomialRef(pm);
72
+ const p = new PolynomialRef(pm);
73
+ const firstDenominator = expr2poly.toPolynomial(manager.getArg(atom, 0), first);
74
+ const secondDenominator = expr2poly.toPolynomial(manager.getArg(atom, 1), second);
75
+ const lcm = getLcm(firstDenominator, secondDenominator);
76
+ p.set(
77
+ pm.addmulTerms(
78
+ lcm / firstDenominator,
79
+ pm.unit,
80
+ first.get(),
81
+ -(lcm / secondDenominator),
82
+ pm.unit,
83
+ second.get(),
84
+ ),
73
85
  );
86
+ const literal = processIneqPolynomial(p, kind);
87
+ p.reset();
88
+ second.reset();
89
+ first.reset();
90
+ return literal;
74
91
  };
75
92
 
76
93
  const processBoolVar = (atom: number) => {
@@ -129,20 +146,29 @@ export const goal2nlsat = (
129
146
  // The polynomial conversion treats a transcendental application, argument included, as one
130
147
  // variable, so its argument gets a variable here, through an equation unless it is one already.
131
148
  const mkArgVar = (term: number) => {
132
- const result = toPolynomial(manager, pm, term, mkVar);
133
- const polynomial = result.polynomial;
149
+ const p = new PolynomialRef(pm);
150
+ const denominator = expr2poly.toPolynomial(term, p);
151
+ const polynomial = p.get();
134
152
  const monomial = polynomial.ms[0];
135
153
  if (
136
- result.denominator === 1n &&
154
+ denominator === 1n &&
137
155
  polynomial.ms.length === 1 &&
138
156
  polynomial.as[0] === 1n &&
139
157
  monomial.size === 1 &&
140
158
  monomial.degrees[0] === 1
141
- )
159
+ ) {
160
+ p.reset();
142
161
  return monomial.vars[0];
162
+ }
143
163
  const variable = solver.mkVar(false);
144
- const equation = pm.addmul(result.denominator, pm.mkVar(variable), -1n, polynomial);
145
- solver.mkExternalClause([solver.mkIneqLiteral("EQ", [equation], [false])], null);
164
+ const vp = new PolynomialRef(pm);
165
+ const equation = new PolynomialRef(pm);
166
+ vp.set(pm.mkVar(variable));
167
+ equation.set(pm.addmulTerms(denominator, pm.unit, vp.get(), -1n, pm.unit, polynomial));
168
+ solver.mkExternalClause([solver.mkIneqLiteral("EQ", [equation.get()], [false])], null);
169
+ equation.reset();
170
+ vp.reset();
171
+ p.reset();
146
172
  return variable;
147
173
  };
148
174
 
@@ -174,6 +200,7 @@ export const goal2nlsat = (
174
200
  }
175
201
  }
176
202
  if (piVar !== undefined) solver.transcendentals.addPi(piVar);
203
+ expr2poly.release();
177
204
  };
178
205
 
179
206
  const hasTermIte = (manager: AstManager, form: number) => {
@@ -163,6 +163,10 @@ export class ObjHashtable {
163
163
  this.map.delete(key);
164
164
  }
165
165
 
166
+ clear() {
167
+ this.map.clear();
168
+ }
169
+
166
170
  [Symbol.iterator]() {
167
171
  return this.map.keys();
168
172
  }
@@ -172,7 +172,7 @@ export abstract class Internalizer {
172
172
  falseEnode: Enode;
173
173
  protected generation = 0;
174
174
  protected cachedGeneration = new Map<number, number>();
175
- private randomSeed = 0;
175
+ protected randomSeed = 0;
176
176
  isSearching = false;
177
177
  config = DEFAULT_CONFIG;
178
178
 
@@ -81,8 +81,8 @@ const getQfnraSolver = (solver: QfnraSolver) =>
81
81
  `${solver.simpleCheck})`,
82
82
  ...(solver.heuristic === undefined ? [] : [`(try-for ${QFNRA_NLSAT} ${solver.heuristic})`]),
83
83
  ...solver.orders.map(
84
- ([strategy, limit]) =>
85
- `(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${strategy}) ${limit})`,
84
+ (order) =>
85
+ `(try-for (using-params ${QFNRA_NLSAT} :variable_ordering_strategy ${order[0]}) ${order[1]})`,
86
86
  ),
87
87
  `(using-params smt :use_ls true :ls_time ${solver.ls})`,
88
88
  `(and-then (try-for (using-params smt :arith.greatest_error_pivot true) ${solver.smt}) ` +
@@ -256,6 +256,12 @@ export const QFUFBV_ACKR_PREAMBLE =
256
256
  ":pull_cheap_ite true :push_ite_bv false :local_ctx true :local_ctx_limit 10000000 " +
257
257
  ":ite_extra_rules true :mul2concat true :flat_and_or false))";
258
258
 
259
+ const QFUFBV =
260
+ "(using-params (and-then (and-then (using-params simplify :flat_and_or false) (using-params " +
261
+ "propagate-values :flat_and_or false) solve-eqs elim-uncnstr (if-no-proofs (if-no-unsat-cores " +
262
+ "reduce-args)) (if-no-proofs (if-no-unsat-cores reduce-bv-size)) max-bv-sharing (if-no-proofs " +
263
+ "(if-no-unsat-cores ackermannize_bv))) (if is-qfbv qfbv smt)) :elim_and true :blast_distinct true)";
264
+
259
265
  const QFAUFLIA =
260
266
  "(and-then (using-params (and-then simplify propagate-values solve-eqs elim-uncnstr simplify) " +
261
267
  ":elim_and true :som true :sort_store true) (using-params smt :array.simplify false))";
@@ -302,6 +308,7 @@ export const LOGIC_TACTICS: ReadonlyMap<string, string> = new Map([
302
308
  ["bv", UFBV],
303
309
  ["qfbv", QFBV],
304
310
  ["qfaufbv", QFAUFBV],
311
+ ["qfufbv", QFUFBV],
305
312
  ["qfauflia", QFAUFLIA],
306
313
  ["qfuf", QFUF],
307
314
  ["qffp", QFFP],
@@ -54,7 +54,7 @@ export class LpSettings {
54
54
  nraCalls: 0,
55
55
  };
56
56
  readonly maxRowLengthForBoundPropagation = 300;
57
- readonly isPropagatingEqs = true;
57
+ isPropagatingEqs = true;
58
58
  readonly intFindCubePeriod = 4;
59
59
  readonly lcubeFlips = 16;
60
60
  readonly hnfCutPeriod = 4;
@@ -70,6 +70,10 @@ export class LpSettings {
70
70
 
71
71
  constructor(readonly isCanceled: () => boolean) {}
72
72
 
73
+ setRandomSeed(seed: number) {
74
+ this.random = new RandomGen(seed);
75
+ }
76
+
73
77
  getRandomNext(bound?: number) {
74
78
  const value = this.random.next();
75
79
  return bound === undefined ? value : value % bound;
@@ -795,7 +795,7 @@ export class NlaCore {
795
795
  this.limit.popChild(this.nraLimit);
796
796
  stats.nraCalls++;
797
797
  }
798
- if (result === L_UNDEF && !hasNoEffect()) result = L_FALSE;
798
+ if (result === L_UNDEF && !hasNoEffect() && this.limit.inc()) result = L_FALSE;
799
799
  stats.nlaLemmas += this.lemmas.length;
800
800
  return result;
801
801
  }
@@ -919,12 +919,12 @@ export class Grobner {
919
919
  private setLevel2var() {
920
920
  const core = this.core;
921
921
  const count = core.lra.getColumnCount();
922
- const weights = Array.from({ length: count }, (_, lpVar) => core.getVarWeight(lpVar));
922
+ const weights = Array.from({ length: count }, (_value, lpVar) => core.getVarWeight(lpVar));
923
923
  for (let lpVar = 0; lpVar < count; lpVar++) {
924
924
  if (!core.isMonicVar(lpVar) || !core.toRefine.has(lpVar)) continue;
925
925
  for (const factor of core.emons.get(lpVar).vars) weights[factor] += 6;
926
926
  }
927
- const level2var = Array.from({ length: count }, (_, lpVar) => lpVar).sort(
927
+ const level2var = Array.from({ length: count }, (_value, lpVar) => lpVar).sort(
928
928
  (first, second) => weights[first] - weights[second] || first - second,
929
929
  );
930
930
  this.manager.reset(level2var);
@@ -1,9 +1,9 @@
1
- import { NlsatUnsupportedError, SmtCanceledError, SmtInvariantError } from "../../../../errors";
1
+ import { SmtCanceledError, SmtInvariantError } from "../../../../errors";
2
2
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
3
3
  import { Rational, getLcm } from "../rational";
4
4
  import { Anum } from "../nlsat/algebraic";
5
5
  import { NlsatSolver } from "../nlsat/solver";
6
- import type { Polynomial } from "../nlsat/polynomial";
6
+ import { type Polynomial, PolynomialRef, PolynomialRefVector } from "../nlsat/polynomial";
7
7
  import { isIneqAtom } from "../nlsat/types";
8
8
  import {
9
9
  KIND_EQ,
@@ -92,13 +92,15 @@ const isDyadicArtifact = (lra: LarSolver, constraint: LarConstraint) =>
92
92
  getConstraintCoeffs(lra, constraint).some((entry) => hasLargeDyadicDenominator(entry[1])));
93
93
 
94
94
  export class NraSolver {
95
- private solver = new NlsatSolver();
95
+ private solver: NlsatSolver;
96
96
  private values: Anum[] = [];
97
97
  private lp2nl = new Map<number, number>();
98
98
  private literal2constraint = new Map<number, number>();
99
99
  private vars2mon = new Map<string, number>();
100
100
 
101
- constructor(private core: NlaCore) {}
101
+ constructor(private core: NlaCore) {
102
+ this.solver = new NlsatSolver(core.nraLimit);
103
+ }
102
104
 
103
105
  get am() {
104
106
  return this.solver.am;
@@ -115,53 +117,48 @@ export class NraSolver {
115
117
  const lra = core.lra;
116
118
  const solver = this.solver;
117
119
  const pm = solver.pm;
118
- const definitions: (Polynomial | null)[] = [];
120
+ const definitions = new PolynomialRefVector(pm);
119
121
  const denominators: bigint[] = [];
122
+ const p = new PolynomialRef(pm);
123
+ const constant = new PolynomialRef(pm);
124
+ const product = new PolynomialRef(pm);
120
125
  for (let lpVar = 0; lpVar < lra.columns.length; lpVar++) {
121
126
  if (!isIncluded(lpVar)) {
122
- definitions.push(null);
127
+ definitions.push(pm.zero);
123
128
  denominators.push(0n);
124
129
  continue;
125
130
  }
126
131
  const variable = solver.mkVar(lra.isInt(lpVar));
127
132
  this.lp2nl.set(lpVar, variable);
133
+ let denominator = 1n;
128
134
  if (core.emons.isMonicVar(lpVar)) {
129
- let definition: Polynomial | null = null;
130
- let denominator = 1n;
131
- for (const factor of core.emons.get(lpVar).vars) {
135
+ for (const [index, factor] of core.emons.get(lpVar).vars.entries()) {
132
136
  denominator = denominators[factor] * denominator;
133
- definition =
134
- definition === null ? definitions[factor] : pm.mul(definition, definitions[factor]!);
137
+ p.set(index === 0 ? definitions.get(factor) : pm.mul(p.get(), definitions.get(factor)));
135
138
  }
136
- definitions.push(definition ?? pm.mkVar(variable));
137
- denominators.push(denominator);
138
- continue;
139
- }
140
- if (lra.hasTerm(lpVar)) {
139
+ } else if (lra.hasTerm(lpVar)) {
141
140
  const term = [...lra.getTerm(lpVar).coeffs];
142
- const denominator = term.reduce(
143
- (result, entry) => getLcm(entry[1].div(Rational.of(denominators[entry[0]])).den, result),
144
- 1n,
145
- );
146
- let definition: Polynomial | null = null;
147
- for (const entry of term) {
141
+ for (const entry of term)
142
+ denominator = getLcm(entry[1].div(Rational.of(denominators[entry[0]])).den, denominator);
143
+ for (const [index, entry] of term.entries()) {
148
144
  const coeff = entry[1].mul(Rational.of(denominator, denominators[entry[0]]));
149
- const scaled = pm.mul(pm.mkConst(coeff.num), definitions[entry[0]]!);
150
- definition = definition === null ? scaled : pm.add(definition, scaled);
145
+ constant.set(pm.mkConst(coeff.num));
146
+ product.set(pm.mul(constant.get(), definitions.get(entry[0])));
147
+ p.set(index === 0 ? product.get() : pm.add(p.get(), product.get()));
148
+ product.reset();
149
+ constant.reset();
151
150
  }
152
- definitions.push(definition ?? pm.zero);
153
- denominators.push(denominator);
154
- continue;
155
- }
156
- definitions.push(pm.mkVar(variable));
157
- denominators.push(1n);
151
+ } else p.set(pm.mkVar(variable));
152
+ definitions.push(p.getOrNull() ?? pm.zero);
153
+ denominators.push(denominator);
154
+ p.reset();
158
155
  }
159
156
  return { definitions, denominators };
160
157
  }
161
158
 
162
159
  private addConstraint(
163
160
  constraintIndex: number,
164
- definitions: readonly (Polynomial | null)[],
161
+ definitions: PolynomialRefVector,
165
162
  denominators: readonly bigint[],
166
163
  ) {
167
164
  const lra = this.core.lra;
@@ -174,23 +171,32 @@ export class NraSolver {
174
171
  (result, entry) => getLcm(result, entry[1].div(Rational.of(denominators[entry[0]])).den),
175
172
  rhs.den,
176
173
  );
177
- let polynomial = pm.mkConst(-(rhs.num * denominator) / rhs.den);
174
+ const p = new PolynomialRef(pm);
175
+ const poly = new PolynomialRef(pm);
176
+ const constant = new PolynomialRef(pm);
177
+ p.set(pm.mkConst(-(rhs.num * denominator) / rhs.den));
178
178
  for (const entry of coeffs) {
179
179
  const coeff = entry[1].mul(Rational.of(denominator, denominators[entry[0]]));
180
- polynomial = pm.add(polynomial, pm.mul(definitions[entry[0]]!, pm.mkConst(coeff.num)));
180
+ poly.set(definitions.get(entry[0]));
181
+ constant.set(pm.mkConst(coeff.num));
182
+ poly.set(pm.mul(poly.get(), constant.get()));
183
+ constant.reset();
184
+ p.set(pm.add(p.get(), poly.get()));
185
+ poly.reset();
181
186
  }
182
187
  const kind = constraint.kind;
183
188
  const literal =
184
189
  kind === KIND_LE
185
- ? solver.mkIneqLiteral("GT", [polynomial], [false]) ^ 1
190
+ ? solver.mkIneqLiteral("GT", [p.get()], [false]) ^ 1
186
191
  : kind === KIND_GE
187
- ? solver.mkIneqLiteral("LT", [polynomial], [false]) ^ 1
192
+ ? solver.mkIneqLiteral("LT", [p.get()], [false]) ^ 1
188
193
  : solver.mkIneqLiteral(
189
194
  kind === KIND_LT ? "LT" : kind === KIND_GT ? "GT" : "EQ",
190
- [polynomial],
195
+ [p.get()],
191
196
  [false],
192
197
  );
193
198
  solver.mkExternalClause([literal], constraintIndex);
199
+ p.reset();
194
200
  return literal;
195
201
  }
196
202
 
@@ -234,6 +240,7 @@ export class NraSolver {
234
240
  }
235
241
  this.addConstraint(constraintIndex, definitions.definitions, definitions.denominators);
236
242
  }
243
+ definitions.definitions.reset();
237
244
  this.registerTranscendentals();
238
245
  const result = this.solver.check();
239
246
  if (result === L_TRUE) {
@@ -344,6 +351,7 @@ export class NraSolver {
344
351
  );
345
352
  this.literal2constraint.set(literal, constraintIndex);
346
353
  }
354
+ definitions.definitions.reset();
347
355
  this.registerTranscendentals();
348
356
  }
349
357
 
@@ -356,7 +364,7 @@ export class NraSolver {
356
364
  for (let index = 0; index < polynomial.size; index++) {
357
365
  const monomial = polynomial.ms[index];
358
366
  const coeff = Rational.of(polynomial.as[index]);
359
- // A linear cell leaves every new lemma polynomial linear, so like Z3 this ignores degrees.
367
+ // Like Z3, this drops degrees: only an axiom's ¬best can be nonlinear, and ¬cell is valid alone.
360
368
  if (monomial.size === 0) bound = bound.sub(coeff);
361
369
  else if (monomial.size === 1) term.addMonomial(coeff, nl2lp[monomial.vars[0]]);
362
370
  else {
@@ -377,8 +385,6 @@ export class NraSolver {
377
385
  try {
378
386
  return this.checkAssignmentCore();
379
387
  } catch (error) {
380
- // Deviation from Z3: a linear cell around an irrational section answers unknown, where Z3 exits.
381
- if (error instanceof NlsatUnsupportedError) return L_UNDEF;
382
388
  if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
383
389
  throw error;
384
390
  }
@@ -76,7 +76,7 @@ export class PddManager {
76
76
  private freezeValue = Rational.zero;
77
77
 
78
78
  constructor(numVars: number) {
79
- this.initNodes(Array.from({ length: numVars }, (_, index) => index));
79
+ this.initNodes(Array.from({ length: numVars }, (_value, index) => index));
80
80
  }
81
81
 
82
82
  reset(level2var: number[]) {
@@ -309,8 +309,7 @@ export class PddManager {
309
309
  if (this.level(this.firstLeading(q)) > this.level(p)) return p;
310
310
  break;
311
311
  }
312
- // Z3's op_entry equality compares the cached first operand with the new second one, so
313
- // only an operation on two equal operands finds its cached result.
312
+ // Z3's op_entry equality compares the cached first operand with the new second one, so only equal operands hit.
314
313
  // Deviation from Z3: on a hash collision Z3 returns that result for unequal operands too.
315
314
  const isCached = p === q;
316
315
  if (isCached) {
@@ -20,7 +20,7 @@ export class TrailStack {
20
20
  }
21
21
  }
22
22
 
23
- export interface UnionFindTrail {
23
+ interface UnionFindTrail {
24
24
  push(undo: () => void): void;
25
25
  }
26
26
 
@@ -72,7 +72,7 @@ export interface MamEnode<E> {
72
72
  }
73
73
 
74
74
  // The context that undoes a compiler's updates of shared code trees.
75
- export interface CompilerContext {
75
+ interface CompilerContext {
76
76
  readonly manager: AstManager;
77
77
  pushTrail(undo: () => void): void;
78
78
  }
@@ -274,10 +274,11 @@ export class Maxcore extends MaxsmtSolverBase {
274
274
  const upper = this.getCost(model);
275
275
  if (upper.compare(this.upper) > 0) return;
276
276
  if (!this.context.verifyModel(this.index, model, upper)) return;
277
+ const numAssertions = this.solver.getNumAssertions();
277
278
  this.model = model;
278
279
  this.context.modelUpdated(model);
279
280
  for (const soft of this.soft) soft.value = this.isTrueIn(model, soft.expr) ? L_TRUE : L_UNDEF;
280
- this.upper = upper;
281
+ if (numAssertions === this.solver.getNumAssertions()) this.upper = upper;
281
282
  }
282
283
 
283
284
  private removeSoft(core: readonly number[]) {
@@ -10,6 +10,7 @@ export interface MaxsatSolver {
10
10
  checkSat(assumptions: readonly number[]): number;
11
11
  getModel(): ProtoModel | null;
12
12
  getUnsatCore(): readonly number[];
13
+ getNumAssertions(): number;
13
14
  findMutexes(vars: readonly number[]): { status: number; mutexes: number[][] };
14
15
  }
15
16
 
@@ -28,7 +28,7 @@ export const DEF_ADD = 0;
28
28
  export const DEF_MUL = 1;
29
29
  export const DEF_DIV = 2;
30
30
  export const DEF_CONST = 3;
31
- export const DEF_VAR = 4;
31
+ const DEF_VAR = 4;
32
32
 
33
33
  interface AddDef {
34
34
  readonly kind: typeof DEF_ADD;
@@ -55,7 +55,7 @@ class AuxContext {
55
55
  const context = this.context;
56
56
  context.popToBaseLevel();
57
57
  const result = context.checkResearching(this.asserted, []);
58
- return result === L_TRUE ? context.getModel() : result === L_FALSE ? "unsat" : "unknown";
58
+ return result === L_TRUE ? context.getSatModel() : result === L_FALSE ? "unsat" : "unknown";
59
59
  }
60
60
  }
61
61
 
@@ -64,6 +64,8 @@ export class ModelEvaluator extends RewriterTpl {
64
64
  this.rewriter = new Rewriter(manager, {
65
65
  ...TACTIC_REWRITER_OPTIONS,
66
66
  bv: { ...DEFAULT_BV_OPTIONS, isHiDiv0: manager.isHiDiv0, isMkbv2num: true },
67
+ isExpandingSelects: true,
68
+ isKeepingDistinct: true,
67
69
  });
68
70
  this.rewriter.releaseResult = () => this.setLastResult(-1);
69
71
  }