tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.63a6693bd

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 (172) hide show
  1. package/dist/compile.cjs +6 -6
  2. package/dist/compile.js +10 -10
  3. package/dist/deciders.cjs +29 -29
  4. package/dist/deciders.js +40 -40
  5. package/dist/index.cjs +1 -1
  6. package/dist/index.js +1 -1
  7. package/dist/parallel-worker.cjs +1 -1
  8. package/dist/parallel-worker.js +1 -1
  9. package/dist/prove-worker.cjs +1 -1
  10. package/dist/prove-worker.js +1 -1
  11. package/dist/prove.cjs +54 -54
  12. package/dist/prove.js +52 -52
  13. package/dist/run.cjs +42 -42
  14. package/dist/run.js +44 -44
  15. package/dist/tlapm.cjs +2 -2
  16. package/dist/tlapm.js +2 -2
  17. package/dist/transfer.cjs +39 -39
  18. package/dist/transfer.js +41 -41
  19. package/dist/worker.cjs +4 -4
  20. package/dist/worker.js +4 -4
  21. package/package.json +1 -1
  22. package/src/ast.ts +44 -39
  23. package/src/builtins.ts +4 -13
  24. package/src/check-failure.ts +116 -0
  25. package/src/check-trace.ts +282 -0
  26. package/src/check.ts +152 -518
  27. package/src/cli/options.ts +6 -31
  28. package/src/cli/shared.ts +1 -1
  29. package/src/cli/tlapm.ts +14 -13
  30. package/src/cli/tlc-arguments.ts +222 -210
  31. package/src/cli/tlc-output.ts +687 -0
  32. package/src/cli/tlc-usage.ts +1 -1
  33. package/src/cli/tlc.ts +34 -701
  34. package/src/cli/xml-exporter.ts +23 -33
  35. package/src/codegen.ts +5 -10
  36. package/src/coverage.ts +3 -10
  37. package/src/dependencies.ts +8 -13
  38. package/src/dfid.ts +16 -16
  39. package/src/environment-config.ts +315 -0
  40. package/src/environment.ts +45 -333
  41. package/src/errors.ts +3 -2
  42. package/src/evaluate.ts +5 -4
  43. package/src/fingerprints.ts +65 -1
  44. package/src/instances.ts +47 -10
  45. package/src/java-hash.ts +7 -0
  46. package/src/json.ts +4 -7
  47. package/src/levels.ts +39 -42
  48. package/src/liveness-checker.ts +24 -37
  49. package/src/liveness.ts +47 -54
  50. package/src/obligations/action.ts +4 -11
  51. package/src/obligations/anonymize.ts +4 -2
  52. package/src/obligations/expression.ts +18 -2
  53. package/src/obligations/generate.ts +45 -38
  54. package/src/obligations/index.ts +2 -2
  55. package/src/obligations/module.ts +27 -38
  56. package/src/obligations/normalize.ts +2 -1
  57. package/src/obligations/simplify.ts +39 -44
  58. package/src/obligations/source.ts +47 -57
  59. package/src/obligations/temporal.ts +5 -5
  60. package/src/parallel-worker.ts +10 -30
  61. package/src/parallel.ts +22 -45
  62. package/src/parser.ts +19 -34
  63. package/src/prover/decide-pool.ts +3 -3
  64. package/src/prover/deciders.ts +3 -3
  65. package/src/prover/isabelle/encode.ts +1 -1
  66. package/src/prover/isabelle/isar/inner-syntax.ts +9 -4
  67. package/src/prover/isabelle/isar/method.ts +14 -25
  68. package/src/prover/isabelle/isar/theory.ts +11 -10
  69. package/src/prover/isabelle/isar/type-check.ts +6 -6
  70. package/src/prover/isabelle/provers/blast/blast.ts +7 -63
  71. package/src/prover/isabelle/provers/hypsubst.ts +17 -26
  72. package/src/prover/isabelle/pure/bicompose.ts +9 -25
  73. package/src/prover/isabelle/pure/conv.ts +2 -8
  74. package/src/prover/isabelle/pure/drule.ts +9 -2
  75. package/src/prover/isabelle/pure/logic.ts +1 -1
  76. package/src/prover/isabelle/pure/raw-simplifier.ts +4 -13
  77. package/src/prover/isabelle/pure/rewriter.ts +5 -9
  78. package/src/prover/isabelle/pure/table.ts +2 -1
  79. package/src/prover/isabelle/pure/tactical.ts +42 -35
  80. package/src/prover/isabelle/pure/thm.ts +14 -11
  81. package/src/prover/isabelle/tla/classical-setup.ts +17 -14
  82. package/src/prover/isabelle/tla/context.ts +7 -2
  83. package/src/prover/isabelle/tla/logic.ts +10 -21
  84. package/src/prover/isabelle/tla/simpdata.ts +1 -10
  85. package/src/prover/prep/action.ts +11 -19
  86. package/src/prover/prep/fingerprint.ts +2 -5
  87. package/src/prover/prep/methods.ts +24 -3
  88. package/src/prover/prove.ts +87 -64
  89. package/src/prover/smt/context.ts +1 -2
  90. package/src/prover/smt/data.ts +418 -406
  91. package/src/prover/smt/encode.ts +30 -18
  92. package/src/prover/smt/rewrite.ts +657 -626
  93. package/src/prover/smt/solver/ast.ts +0 -22
  94. package/src/prover/smt/solver/auf-solver.ts +2 -5
  95. package/src/prover/smt/solver/context.ts +3 -3
  96. package/src/prover/smt/solver/e-matching.ts +1 -1
  97. package/src/prover/smt/solver/expr-safe-replace.ts +1 -1
  98. package/src/prover/smt/solver/internalizer.ts +1 -2
  99. package/src/prover/smt/solver/lp/dioph-eq.ts +1 -8
  100. package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -1
  101. package/src/prover/smt/solver/lp/nla-core.ts +2 -6
  102. package/src/prover/smt/solver/mam-compiler.ts +4 -2
  103. package/src/prover/smt/solver/model-checker.ts +1 -1
  104. package/src/prover/smt/solver/model-finder.ts +12 -17
  105. package/src/prover/smt/solver/model-macro-solver.ts +11 -19
  106. package/src/prover/smt/solver/nlsat/algebraic.ts +9 -9
  107. package/src/prover/smt/solver/nlsat/atoms.ts +20 -4
  108. package/src/prover/smt/solver/nlsat/explain.ts +7 -22
  109. package/src/prover/smt/solver/nlsat/levelwise.ts +1 -6
  110. package/src/prover/smt/solver/nlsat/polynomial.ts +12 -3
  111. package/src/prover/smt/solver/nlsat/solver.ts +12 -24
  112. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -1
  113. package/src/prover/smt/solver/proto-model.ts +0 -4
  114. package/src/prover/smt/solver/quantifier-analyzer.ts +10 -10
  115. package/src/prover/smt/solver/quantifier-manager.ts +1 -5
  116. package/src/prover/smt/solver/smtlib-parser.ts +78 -94
  117. package/src/prover/smt/solver/theory-lra-bounds.ts +1 -2
  118. package/src/prover/smt/solver/theory-lra-internalize.ts +5 -16
  119. package/src/prover/tlapm/cache.ts +28 -18
  120. package/src/prover/tlapm/tlapm.ts +15 -9
  121. package/src/prover/verdict.ts +7 -0
  122. package/src/prover/zenon/check/check.ts +1 -2
  123. package/src/prover/zenon/check/records.ts +1 -1
  124. package/src/prover/zenon/check/relations.ts +2 -1
  125. package/src/prover/zenon/check/rewrites.ts +2 -15
  126. package/src/prover/zenon/check/sets.ts +40 -58
  127. package/src/prover/zenon/check/terms.ts +1 -2
  128. package/src/prover/zenon/eqrel.ts +2 -0
  129. package/src/prover/zenon/expr.ts +7 -0
  130. package/src/prover/zenon/index-table.ts +9 -19
  131. package/src/prover/zenon/isar.ts +35 -35
  132. package/src/prover/zenon/llproof.ts +2 -11
  133. package/src/prover/zenon/mltoll.ts +12 -28
  134. package/src/prover/zenon/parse.ts +3 -6
  135. package/src/prover/zenon/search.ts +4 -14
  136. package/src/prover/zenon/tla/functions.ts +2 -2
  137. package/src/prover/zenon/tla/llproof.ts +9 -11
  138. package/src/prover/zenon/tla/records.ts +1 -6
  139. package/src/prover/zenon/tla/sets.ts +15 -14
  140. package/src/prover/zenon/tla/tla.ts +7 -6
  141. package/src/resolve.ts +55 -72
  142. package/src/sany/generation.ts +394 -0
  143. package/src/sany/generator-def-entries.ts +210 -0
  144. package/src/sany/generator-definitions.ts +686 -0
  145. package/src/sany/generator-expressions.ts +1100 -0
  146. package/src/sany/generator-proofs.ts +662 -0
  147. package/src/sany/generator.ts +155 -2625
  148. package/src/sany/lexer.ts +17 -16
  149. package/src/sany/nodes.ts +6 -13
  150. package/src/sany/report.ts +3 -6
  151. package/src/sany/selectors.ts +35 -38
  152. package/src/sany/xml.ts +23 -55
  153. package/src/search.ts +65 -27
  154. package/src/simulate.ts +157 -133
  155. package/src/spec-description.ts +33 -48
  156. package/src/standard-modules.ts +16 -32
  157. package/src/state-graph.ts +2 -7
  158. package/src/substitution-levels.ts +5 -4
  159. package/src/successors.ts +5 -7
  160. package/src/tlc/messages.ts +20 -15
  161. package/src/tlc/order.ts +2 -9
  162. package/src/tlc/random.ts +4 -4
  163. package/src/tlc/replay.ts +8 -15
  164. package/src/tlc/tlc-operators.ts +2 -3
  165. package/src/tlc/trace-spec.ts +25 -45
  166. package/src/typescript/actions.ts +2 -4
  167. package/src/typescript/collections.ts +34 -20
  168. package/src/typescript/compile.ts +1 -3
  169. package/src/typescript/formula.ts +5 -3
  170. package/src/typescript/model.ts +4 -5
  171. package/src/typescript/steps.ts +20 -18
  172. package/src/values.ts +63 -158
@@ -1148,26 +1148,4 @@ export class AstManager {
1148
1148
  if (args.length === 1) return args[0];
1149
1149
  return this.mkApp(OP_AND, args, SORT_BOOL);
1150
1150
  }
1151
-
1152
- getDeclName(expr: number) {
1153
- return getSymbolName(this.funcDecls[this.decls[expr]].name);
1154
- }
1155
-
1156
- toString(expr: number): string {
1157
- const kind = this.kinds[expr];
1158
- if (kind === KIND_VAR) return `(:var ${this.values[expr]})`;
1159
- if (kind === KIND_QUANTIFIER) {
1160
- const data = this.getQuantifier(expr);
1161
- return `(${data.isForall ? "forall" : "exists"} (${data.sorts.length}) ${this.toString(data.body)})`;
1162
- }
1163
- if (this.getOp(expr) === OP_NUM) {
1164
- const value = this.getRationalValue(expr);
1165
- if (this.sorts[expr] === SORT_INT) return String(value.num);
1166
- return value.isInt() ? `${value.num}.0` : `(/ ${value.num}.0 ${value.den}.0)`;
1167
- }
1168
- const name = this.getDeclName(expr);
1169
- return this.getNumArgs(expr) === 0
1170
- ? name
1171
- : `(${name} ${this.mapArgs(expr, (innerArg) => this.toString(innerArg)).join(" ")})`;
1172
- }
1173
1151
  }
@@ -35,11 +35,8 @@ export class InstantiationSet {
35
35
  for (const entry of this.elems) this.manager.decRef(entry[0]);
36
36
  }
37
37
 
38
- getInv(value: number, model: ProtoModel) {
39
- const term = this.inv.get(value);
40
- if (term !== undefined) return term;
41
- for (const entry of this.inv) if (model.areEqual(entry[0], value)) return entry[1];
42
- return undefined;
38
+ getInv(value: number) {
39
+ return this.inv.get(value);
43
40
  }
44
41
 
45
42
  getGeneration(term: number) {
@@ -109,7 +109,7 @@ export class Context extends Internalizer {
109
109
  private modelState: ModelState = { kind: "none" };
110
110
 
111
111
  constructor(manager: AstManager, params: SmtParams) {
112
- super(manager, params.relevancyLevel > 0, params.relevancyLevel > 0);
112
+ super(manager, params.relevancyLevel > 0);
113
113
  this.qmanager = new DefaultQuantifierManager(this, params.isMbqi);
114
114
  }
115
115
 
@@ -1071,7 +1071,7 @@ export class Context extends Internalizer {
1071
1071
  this.lastSearchFailure !== FAILURE_THEORY ||
1072
1072
  status === L_FALSE ||
1073
1073
  this.isInconsistent() ||
1074
- !qmanager.hasQuantifiers() ||
1074
+ qmanager.quantifiers.length === 0 ||
1075
1075
  !qmanager.isModelBased()
1076
1076
  )
1077
1077
  return status;
@@ -1083,7 +1083,7 @@ export class Context extends Internalizer {
1083
1083
  isForcedRestart = true;
1084
1084
  }
1085
1085
  if (status === L_FALSE) return L_FALSE;
1086
- if (status === L_TRUE && !qmanager.hasQuantifiers()) return L_TRUE;
1086
+ if (status === L_TRUE && qmanager.quantifiers.length === 0) return L_TRUE;
1087
1087
  if (status === L_TRUE) {
1088
1088
  const generated = this.mkProtoModel();
1089
1089
  const result = qmanager.isModelBased()
@@ -74,7 +74,7 @@ export class Mam implements LabelHasher {
74
74
  private context: Context,
75
75
  onMatch: OnMatch,
76
76
  ) {
77
- this.compiler = new Compiler(context.manager, context, this);
77
+ this.compiler = new Compiler(context, this);
78
78
  this.interpreter = new Interpreter(context, onMatch);
79
79
  }
80
80
 
@@ -150,7 +150,7 @@ export class ExprSafeReplace {
150
150
  shifter.release();
151
151
  replace.release();
152
152
  }
153
- const result = manager.mkQuantifier({ ...data, body, patterns: [...patterns.items] });
153
+ const result = manager.mkQuantifier({ ...data, body, patterns: patterns.items });
154
154
  this.refs.push(result);
155
155
  this.cache.set(quantifier, result);
156
156
  todo.pop();
@@ -150,7 +150,6 @@ export abstract class Internalizer {
150
150
  constructor(
151
151
  readonly manager: AstManager,
152
152
  isRelevancyEnabled: boolean,
153
- isDelayingNewCaseSplits: boolean,
154
153
  ) {
155
154
  this.rewriter = new Rewriter(manager, KERNEL_REWRITER_OPTIONS);
156
155
  this.relevancy = new RelevancyPropagator(
@@ -170,7 +169,7 @@ export abstract class Internalizer {
170
169
  getNumBoolVars: () => this.numBoolVars,
171
170
  isUnassigned: (boolVar) => this.assignment[mkLiteral(boolVar)] === L_UNDEF,
172
171
  },
173
- isDelayingNewCaseSplits,
172
+ isRelevancyEnabled,
174
173
  );
175
174
  this.mkBoolVar(manager.trueExpr);
176
175
  this.assignment[0] = L_TRUE;
@@ -278,10 +278,7 @@ export class DiophantineSolver {
278
278
  return;
279
279
  }
280
280
  explanation.pushDependency(
281
- this.explainFixedInMetaTerm(
282
- this.getRowMonomials(this.lMatrix, this.conflictRow),
283
- this.conflictGcd,
284
- ),
281
+ this.explainFixedInMetaTerm(this.lMatrix.rows[this.conflictRow], this.conflictGcd),
285
282
  );
286
283
  }
287
284
 
@@ -801,10 +798,6 @@ export class DiophantineSolver {
801
798
  return this.getCoeffInERow(row, column).isPositive() ? 1 : -1;
802
799
  }
803
800
 
804
- private getRowMonomials(matrix: StaticMatrix, row: number): Monomial[] {
805
- return matrix.rows[row].map((cell) => ({ coeff: cell.coeff, column: cell.column }));
806
- }
807
-
808
801
  private tightenTermsWithS(): DioMove {
809
802
  const solver = this.solver;
810
803
  const sortedTerms: number[] = [];
@@ -87,7 +87,7 @@ export const makeHnfCut = (lia: IntSolver): LiaMove => {
87
87
  const deps = isFullRank
88
88
  ? tightTerms.map((tight) => tight.dep)
89
89
  : basisRows.map((row) => tightTerms[row].dep);
90
- const hermite = getHermiteNormalForm(matrix, determinant, () => settings.isCanceled());
90
+ const hermite = getHermiteNormalForm(matrix, determinant, settings.isCanceled);
91
91
  if (hermite === undefined) return { kind: "undef" };
92
92
  const rightSides = isFullRank
93
93
  ? tightTerms.map((tight) => tight.rightSide)
@@ -174,10 +174,6 @@ export class NlaCore {
174
174
  };
175
175
  }
176
176
 
177
- private get settings() {
178
- return this.lra.settings;
179
- }
180
-
181
177
  get stats() {
182
178
  return this.lra.settings.stats;
183
179
  }
@@ -552,11 +548,11 @@ export class NlaCore {
552
548
  }
553
549
 
554
550
  random() {
555
- return this.settings.getRandomNext();
551
+ return this.lra.settings.getRandomNext();
556
552
  }
557
553
 
558
554
  isCanceled() {
559
- return this.settings.isCanceled();
555
+ return this.lra.settings.isCanceled();
560
556
  }
561
557
 
562
558
  checkBoundedDivisions() {
@@ -151,6 +151,7 @@ const mkInit = (numArgs: number) => {
151
151
  };
152
152
 
153
153
  export class Compiler {
154
+ private manager: AstManager;
154
155
  private registers: number[] = [];
155
156
  private todo: number[] = [];
156
157
  private aux: number[] = [];
@@ -177,10 +178,11 @@ export class Compiler {
177
178
  private seq: Instruction[] = [];
178
179
 
179
180
  constructor(
180
- private manager: AstManager,
181
181
  private context: Context,
182
182
  private hasher: LabelHasher,
183
- ) {}
183
+ ) {
184
+ this.manager = context.manager;
185
+ }
184
186
 
185
187
  private getRegister(reg: number) {
186
188
  return this.registers[reg] ?? -1;
@@ -182,7 +182,7 @@ export class ModelChecker {
182
182
  const sk = sks[numDecls - index - 1];
183
183
  let skValue = cex.getSomeConstInterp(manager.decls[sk]);
184
184
  if (isUsingInv) {
185
- const inv = this.modelFinder.getInv(quantifier, index, skValue, cex);
185
+ const inv = this.modelFinder.getInv(quantifier, index, skValue);
186
186
  if (inv === null) return false;
187
187
  maxGeneration = Math.max(maxGeneration, inv.generation);
188
188
  skValue = inv.term;
@@ -6,11 +6,12 @@ import { solveMacros } from "./model-macro-solver";
6
6
  import type { ProtoModel } from "./proto-model";
7
7
  import { Rewriter, TACTIC_REWRITER_OPTIONS } from "./rewriter";
8
8
  import { AufSolver } from "./auf-solver";
9
- import { MBQI_FORCE_TEMPLATE, QuantifierAnalyzer, QuantifierInfo } from "./quantifier-analyzer";
9
+ import { QuantifierAnalyzer, QuantifierInfo } from "./quantifier-analyzer";
10
10
  import { RefVector } from "./ref-vector";
11
11
  import { shrink } from "./array";
12
12
 
13
13
  export class ModelFinder {
14
+ private manager: AstManager;
14
15
  private q2info = new Map<number, QuantifierInfo>();
15
16
  private quantifiers: number[] = [];
16
17
  private scopes: number[] = [];
@@ -20,13 +21,11 @@ export class ModelFinder {
20
21
  readonly aufSolver: AufSolver;
21
22
  private newConstraints: number[] = [];
22
23
 
23
- constructor(
24
- private manager: AstManager,
25
- private context: Context,
26
- ) {
27
- this.rewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
28
- this.macroRewriter = new Rewriter(manager, TACTIC_REWRITER_OPTIONS);
29
- this.aufSolver = new AufSolver(manager, this.rewriter);
24
+ constructor(private context: Context) {
25
+ this.manager = context.manager;
26
+ this.rewriter = new Rewriter(this.manager, TACTIC_REWRITER_OPTIONS);
27
+ this.macroRewriter = new Rewriter(this.manager, TACTIC_REWRITER_OPTIONS);
28
+ this.aufSolver = new AufSolver(this.manager, this.rewriter);
30
29
  }
31
30
 
32
31
  getQuantifierInfo(quantifier: number) {
@@ -34,7 +33,7 @@ export class ModelFinder {
34
33
  }
35
34
 
36
35
  registerQuantifier(quantifier: number) {
37
- const info = new QuantifierInfo(this.manager, this.context, quantifier, this.macroRewriter);
36
+ const info = new QuantifierInfo(this.context, quantifier, this.macroRewriter);
38
37
  this.q2info.set(quantifier, info);
39
38
  this.quantifiers.push(quantifier);
40
39
  new QuantifierAnalyzer(this.manager, this.rewriter, info).analyze();
@@ -65,12 +64,8 @@ export class ModelFinder {
65
64
  );
66
65
  if (quantifiers.length === 0) return;
67
66
  for (const quantifier of quantifiers) this.getQuantifierInfo(quantifier).resetTheOne();
68
- const residue = solveMacros(
69
- this.manager,
70
- model,
71
- quantifiers,
72
- (quantifier) => this.getQuantifierInfo(quantifier),
73
- MBQI_FORCE_TEMPLATE,
67
+ const residue = solveMacros(this.manager, model, quantifiers, (quantifier) =>
68
+ this.getQuantifierInfo(quantifier),
74
69
  );
75
70
  const solver = this.aufSolver;
76
71
  solver.reset();
@@ -97,10 +92,10 @@ export class ModelFinder {
97
92
  );
98
93
  }
99
94
 
100
- getInv(quantifier: number, index: number, value: number, model: ProtoModel) {
95
+ getInv(quantifier: number, index: number, value: number) {
101
96
  const set = this.getUvarInstSet(quantifier, index);
102
97
  if (set === null) return null;
103
- const term = set.getInv(value, model);
98
+ const term = set.getInv(value);
104
99
  if (term !== undefined && this.aufSolver.isDefaultRepresentative(term))
105
100
  return { term: value, generation: 0 };
106
101
  return term === undefined ? null : { term, generation: set.getGeneration(term) };
@@ -538,12 +538,9 @@ const collectNgFuncDecls = (manager: AstManager, expr: number) => {
538
538
  if (visited.has(current)) return;
539
539
  visited.add(current);
540
540
  const kind = manager.kinds[current];
541
- if (kind === KIND_VAR) return;
542
- if (kind === KIND_QUANTIFIER) return;
543
- for (let index = 0; index < manager.getNumArgs(current); index++) {
544
- const arg = manager.getArg(current, index);
545
- visit(arg);
546
- }
541
+ if (kind === KIND_VAR || kind === KIND_QUANTIFIER) return;
542
+ for (let index = 0; index < manager.getNumArgs(current); index++)
543
+ visit(manager.getArg(current, index));
547
544
  if (
548
545
  manager.getNumArgs(current) > 0 &&
549
546
  !manager.isGround(current) &&
@@ -555,15 +552,11 @@ const collectNgFuncDecls = (manager: AstManager, expr: number) => {
555
552
  return decls;
556
553
  };
557
554
 
558
- const nonAufMacroSolver =
559
- (
560
- manager: AstManager,
561
- model: ProtoModel,
562
- getInfo: GetInfo,
563
- dependencies: Map<number, Set<number>>,
564
- forceTemplate: number,
565
- ): Process =>
566
- (qs, newQs, residue) => {
555
+ const MBQI_FORCE_TEMPLATE = 10;
556
+
557
+ const nonAufMacroSolver = (manager: AstManager, model: ProtoModel, getInfo: GetInfo): Process => {
558
+ const dependencies = new Map<number, Set<number>>();
559
+ return (qs, newQs, residue) => {
567
560
  const addMacro = (decl: number, elseExpr: number) => {
568
561
  if (dependencies.has(decl)) return false;
569
562
  dependencies.set(decl, collectNgFuncDecls(manager, elseExpr));
@@ -603,7 +596,7 @@ const nonAufMacroSolver =
603
596
  const info = getInfo(quantifier);
604
597
  for (const macro of info.condMacros) {
605
598
  if (macro.isHint) continue;
606
- if (isUnconditional(macro) && (!info.isAuf || macro.weight >= forceTemplate)) {
599
+ if (isUnconditional(macro) && (!info.isAuf || macro.weight >= MBQI_FORCE_TEMPLATE)) {
607
600
  fullMacros.set(macro.decl, { macro, quantifier });
608
601
  condMacros.delete(macro.decl);
609
602
  } else if (!fullMacros.has(macro.decl) && !info.isAuf) condMacros.add(macro.decl);
@@ -650,22 +643,21 @@ const nonAufMacroSolver =
650
643
  }
651
644
  return removed.size > 0;
652
645
  };
646
+ };
653
647
 
654
648
  export const solveMacros = (
655
649
  manager: AstManager,
656
650
  model: ProtoModel,
657
651
  qs: number[],
658
652
  getInfo: GetInfo,
659
- forceTemplate: number,
660
653
  ) => {
661
654
  const residue: number[] = [];
662
655
  const afterSimple = runMacroSolver(qs, residue, simpleMacroSolver(manager, model, getInfo));
663
656
  const afterHint = runMacroSolver(afterSimple, residue, hintMacroSolver(manager, model, getInfo));
664
- const dependencies = new Map<number, Set<number>>();
665
657
  const afterNonAuf = runMacroSolver(
666
658
  afterHint,
667
659
  residue,
668
- nonAufMacroSolver(manager, model, getInfo, dependencies, forceTemplate),
660
+ nonAufMacroSolver(manager, model, getInfo),
669
661
  );
670
662
  return [...afterNonAuf, ...residue];
671
663
  };
@@ -81,6 +81,14 @@ interface SignedRoots {
81
81
  const getMinBq = (first: Mpbq, second: Mpbq) => (second.compare(first) < 0 ? second : first);
82
82
  const getMaxBq = (first: Mpbq, second: Mpbq) => (second.compare(first) > 0 ? second : first);
83
83
 
84
+ const getIntervalPower = (base: BqInterval, exponent: number): BqInterval => {
85
+ const lower = base.lower.power(exponent);
86
+ const upper = base.upper.power(exponent);
87
+ if (exponent % 2 === 1 || !base.lower.isNeg) return { lower, upper };
88
+ if (base.upper.isNeg) return { lower: upper, upper: lower };
89
+ return { lower: Mpbq.zero, upper: getMaxBq(lower, upper) };
90
+ };
91
+
84
92
  const INTERVAL_OPS: ValueOps<BqInterval> = {
85
93
  fromInteger: (value) => ({ lower: Mpbq.of(value), upper: Mpbq.of(value) }),
86
94
  add: (first, second) => ({
@@ -96,15 +104,7 @@ const INTERVAL_OPS: ValueOps<BqInterval> = {
96
104
  ];
97
105
  return { lower: products.reduce(getMinBq), upper: products.reduce(getMaxBq) };
98
106
  },
99
- power: (base, exponent) => getIntervalPower(base, exponent),
100
- };
101
-
102
- const getIntervalPower = (base: BqInterval, exponent: number): BqInterval => {
103
- const lower = base.lower.power(exponent);
104
- const upper = base.upper.power(exponent);
105
- if (exponent % 2 === 1 || !base.lower.isNeg) return { lower, upper };
106
- if (base.upper.isNeg) return { lower: upper, upper: lower };
107
- return { lower: Mpbq.zero, upper: getMaxBq(lower, upper) };
107
+ power: getIntervalPower,
108
108
  };
109
109
 
110
110
  const containsZero = (interval: BqInterval) => interval.lower.isNeg && interval.upper.isPos;
@@ -6,7 +6,14 @@ import {
6
6
  type PolynomialCache,
7
7
  type PolynomialManager,
8
8
  } from "./polynomial";
9
- import type { Atom, IneqAtom, IneqKind, RootAtom, RootKind } from "./types";
9
+ import {
10
+ type Atom,
11
+ type IneqAtom,
12
+ type IneqKind,
13
+ type RootAtom,
14
+ type RootKind,
15
+ isIneqAtom,
16
+ } from "./types";
10
17
 
11
18
  export const TRUE_BOOL_VAR = 0;
12
19
  export const TRUE_LITERAL = 0;
@@ -48,7 +55,7 @@ export class AtomTable {
48
55
  }
49
56
 
50
57
  getDegree(atom: Atom) {
51
- if (!("polynomials" in atom)) return this.pm.degree(atom.polynomial, atom.maxVar);
58
+ if (!isIneqAtom(atom)) return this.pm.degree(atom.polynomial, atom.maxVar);
52
59
  let max = 0;
53
60
  for (const polynomial of atom.polynomials)
54
61
  max = Math.max(max, this.pm.degree(polynomial, atom.maxVar));
@@ -58,7 +65,7 @@ export class AtomTable {
58
65
  reinitCache() {
59
66
  for (const atom of this.atoms) {
60
67
  if (atom === null) continue;
61
- if ("polynomials" in atom) {
68
+ if (isIneqAtom(atom)) {
62
69
  let max = 0;
63
70
  for (const polynomial of atom.polynomials) {
64
71
  this.cache.mkUnique(polynomial);
@@ -80,6 +87,15 @@ export class AtomTable {
80
87
  return this.getAtom(literal)?.maxVar ?? NULL_VAR;
81
88
  }
82
89
 
90
+ getMaxVarOfLiterals(literals: readonly number[]) {
91
+ let result = NULL_VAR;
92
+ for (const literal of literals) {
93
+ const atom = this.getAtom(literal);
94
+ if (atom !== null && (result === NULL_VAR || atom.maxVar > result)) result = atom.maxVar;
95
+ }
96
+ return result;
97
+ }
98
+
83
99
  incRef(literal: number) {
84
100
  const boolVar = literal >> 1;
85
101
  if (this.atoms[boolVar] === null || this.atoms[boolVar] === undefined) return;
@@ -91,7 +107,7 @@ export class AtomTable {
91
107
  const atom = this.atoms[boolVar];
92
108
  if (atom === null || atom === undefined) return;
93
109
  if (--this.refCounts[boolVar] > 0) return;
94
- if ("polynomials" in atom) this.ineqAtoms.delete(this.getIneqKey(atom));
110
+ if (isIneqAtom(atom)) this.ineqAtoms.delete(this.getIneqKey(atom));
95
111
  else {
96
112
  this.rootAtoms.delete(this.rootKeys.get(boolVar)!);
97
113
  this.rootKeys.delete(boolVar);
@@ -105,24 +105,6 @@ export class Explain {
105
105
  });
106
106
  }
107
107
 
108
- private getMaxVarOfPolys(polynomials: readonly Polynomial[]) {
109
- let result = NULL_VAR;
110
- for (const polynomial of polynomials) {
111
- const variable = this.pm.maxVar(polynomial);
112
- if (result === NULL_VAR || variable > result) result = variable;
113
- }
114
- return result;
115
- }
116
-
117
- private getMaxVarOfLiterals(literals: readonly number[]) {
118
- let result = NULL_VAR;
119
- for (const literal of literals) {
120
- const atom = this.context.atoms.getAtom(literal);
121
- if (atom !== null && (result === NULL_VAR || atom.maxVar > result)) result = atom.maxVar;
122
- }
123
- return result;
124
- }
125
-
126
108
  private addAssumption(kind: IneqKind, polynomial: Polynomial, isNeg = false) {
127
109
  const boolVar = this.context.atoms.mkIneqAtom(kind, [polynomial], [false]);
128
110
  this.addLiteral(2 * boolVar + (isNeg ? 0 : 1));
@@ -508,7 +490,7 @@ export class Explain {
508
490
  private explainCore(literals: readonly number[]) {
509
491
  if (literals.length === 0) return;
510
492
  const polynomials = [...this.collectPolys(literals), ...this.lowerStagePolys];
511
- const maxVar = this.getMaxVarOfPolys(polynomials);
493
+ const maxVar = this.pm.getMaxVarOfPolys(polynomials);
512
494
  this.project(this.elimVanishingAll(polynomials), maxVar);
513
495
  }
514
496
 
@@ -517,7 +499,7 @@ export class Explain {
517
499
  const core = this.core;
518
500
  core.reset();
519
501
  for (const literal of literals) core.push(literal);
520
- const max = this.getMaxVarOfLiterals(literals);
502
+ const max = this.context.atoms.getMaxVarOfLiterals(literals);
521
503
  this.normalizeCore(core, max);
522
504
  this.simplifyCore(core, max);
523
505
  this.explainCore(core.literals);
@@ -525,7 +507,10 @@ export class Explain {
525
507
  }
526
508
 
527
509
  computeConflictExplanation(literals: readonly number[], result: ScopedLiterals) {
528
- if (this.getMaxVarOfLiterals(literals) === 0 && this.context.sample[0] === undefined) {
510
+ if (
511
+ this.context.atoms.getMaxVarOfLiterals(literals) === 0 &&
512
+ this.context.sample[0] === undefined
513
+ ) {
529
514
  result.reset();
530
515
  return;
531
516
  }
@@ -555,7 +540,7 @@ export class Explain {
555
540
  const polynomials = this.collectPolys(literals);
556
541
  try {
557
542
  if (polynomials.length > 0)
558
- this.addCellLiterals(polynomials, this.getMaxVarOfPolys(polynomials) + 1, true);
543
+ this.addCellLiterals(polynomials, this.pm.getMaxVarOfPolys(polynomials) + 1, true);
559
544
  } finally {
560
545
  this.resetResult();
561
546
  }
@@ -71,12 +71,7 @@ export class TodoSet {
71
71
  }
72
72
 
73
73
  getMaxVar() {
74
- let result = NULL_VAR;
75
- for (const polynomial of this.polynomials) {
76
- const variable = this.pm.maxVar(polynomial);
77
- if (result === NULL_VAR || variable > result) result = variable;
78
- }
79
- return result;
74
+ return this.pm.getMaxVarOfPolys(this.polynomials);
80
75
  }
81
76
 
82
77
  extractMaxPolys(out: Polynomial[]) {
@@ -7,7 +7,7 @@ import {
7
7
  DEFAULT_FACTOR_PARAMS,
8
8
  factorSquareFree,
9
9
  getExactSquareRoot,
10
- type UpolynomialFactors,
10
+ mkFactors,
11
11
  } from "./upolynomial-factorization";
12
12
 
13
13
  export const NULL_VAR = -1;
@@ -462,6 +462,15 @@ export class PolynomialManager {
462
462
  return polynomial.size === 0 ? NULL_VAR : polynomial.ms[0].maxVar;
463
463
  }
464
464
 
465
+ getMaxVarOfPolys(polynomials: readonly Polynomial[]) {
466
+ let result = NULL_VAR;
467
+ for (const polynomial of polynomials) {
468
+ const variable = this.maxVar(polynomial);
469
+ if (result === NULL_VAR || variable > result) result = variable;
470
+ }
471
+ return result;
472
+ }
473
+
465
474
  degree(polynomial: Polynomial, variable: number) {
466
475
  let result = 0;
467
476
  for (const monomial of polynomial.ms) result = Math.max(result, monomial.degreeOf(variable));
@@ -910,7 +919,7 @@ export class PolynomialManager {
910
919
 
911
920
  private factorSqfPpUniv(polynomial: Polynomial, k: number, result: Factors) {
912
921
  const variable = this.maxVar(polynomial);
913
- const fs: UpolynomialFactors = { constant: 1n, factors: [], degrees: [] };
922
+ const fs = mkFactors();
914
923
  factorSquareFree(this.um, this.toCoeffs(polynomial), fs, 1, DEFAULT_FACTOR_PARAMS);
915
924
  if (fs.factors.length === 1 && fs.degrees[0] === 1) {
916
925
  this.pushFactor(result, polynomial, k);
@@ -1226,7 +1235,7 @@ export class PolynomialManager {
1226
1235
  if (!this.isUnivariate(univariate)) continue;
1227
1236
  if (this.degree(univariate, mainVar) !== degMain) continue;
1228
1237
  if (!this.isSquareFreeIn(univariate, mainVar)) continue;
1229
- const univariateFs: UpolynomialFactors = { constant: 1n, factors: [], degrees: [] };
1238
+ const univariateFs = mkFactors();
1230
1239
  factorSquareFree(
1231
1240
  this.um,
1232
1241
  this.um.getPrimitive(this.toCoeffs(univariate)),
@@ -139,17 +139,8 @@ export class NlsatSolver {
139
139
  return linearize([this.lemmaAssumptions]);
140
140
  }
141
141
 
142
- private getMaxVar(clause: Clause) {
143
- let result = NULL_VAR;
144
- for (const literal of clause.literals) {
145
- const atom = this.atoms.getAtom(literal);
146
- if (atom !== null && (result === NULL_VAR || atom.maxVar > result)) result = atom.maxVar;
147
- }
148
- return result;
149
- }
150
-
151
142
  private getClauseDegree(clause: Clause) {
152
- if (this.getMaxVar(clause) === NULL_VAR) return 0;
143
+ if (this.atoms.getMaxVarOfLiterals(clause.literals) === NULL_VAR) return 0;
153
144
  let max = 0;
154
145
  for (const literal of clause.literals) {
155
146
  const atom = this.atoms.getAtom(literal);
@@ -191,13 +182,13 @@ export class NlsatSolver {
191
182
  }
192
183
 
193
184
  private addClauseToWatches(clause: Clause) {
194
- const variable = this.getMaxVar(clause);
185
+ const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
195
186
  if (variable !== NULL_VAR) this.watches[variable].push(clause);
196
187
  else this.bwatches[Math.max(...clause.literals.map((literal) => literal >> 1))].push(clause);
197
188
  }
198
189
 
199
190
  private delClause(clause: Clause) {
200
- const variable = this.getMaxVar(clause);
191
+ const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
201
192
  const watches =
202
193
  variable !== NULL_VAR
203
194
  ? this.watches[variable]
@@ -720,12 +711,7 @@ export class NlsatSolver {
720
711
  this.resetMarks();
721
712
  const literals = this.lemma.literals;
722
713
  if (!isDecision) {
723
- let maxVar = NULL_VAR;
724
- for (const literal of literals) {
725
- const variable = this.atoms.getMaxVar(literal);
726
- if (variable !== NULL_VAR && (maxVar === NULL_VAR || variable > maxVar)) maxVar = variable;
727
- }
728
- this.undoUntilStage(maxVar);
714
+ this.undoUntilStage(this.atoms.getMaxVarOfLiterals(literals));
729
715
  return this.mkClause(literals, true, this.lemmaAssumptions);
730
716
  }
731
717
  if (literals.every((literal) => this.atoms.getAtom(literal) === null)) {
@@ -750,11 +736,14 @@ export class NlsatSolver {
750
736
  return level === -1 ? this.scopeLevel - 1 : level;
751
737
  }
752
738
 
739
+ private isRootLiteral(literal: number) {
740
+ const atom = this.atoms.getAtom(literal);
741
+ return atom !== null && !isIneqAtom(atom);
742
+ }
743
+
753
744
  private canReorder() {
754
745
  return [...this.learned, ...this.clauses].every((clause) =>
755
- clause.literals.every(
756
- (literal) => this.atoms.getAtom(literal)?.kind.startsWith("ROOT") !== true,
757
- ),
746
+ clause.literals.every((literal) => !this.isRootLiteral(literal)),
758
747
  );
759
748
  }
760
749
 
@@ -803,8 +792,7 @@ export class NlsatSolver {
803
792
  private reorder(permutation: readonly number[]) {
804
793
  let kept = 0;
805
794
  for (const clause of this.learned) {
806
- if (clause.literals.some((literal) => this.atoms.getAtom(literal)?.kind.startsWith("ROOT")))
807
- this.delClause(clause);
795
+ if (clause.literals.some((literal) => this.isRootLiteral(literal))) this.delClause(clause);
808
796
  else this.learned[kept++] = clause;
809
797
  }
810
798
  this.learned.length = kept;
@@ -844,7 +832,7 @@ export class NlsatSolver {
844
832
 
845
833
  private reattachArithClauses(clauses: readonly Clause[]) {
846
834
  for (const clause of clauses) {
847
- const variable = this.getMaxVar(clause);
835
+ const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
848
836
  if (variable !== NULL_VAR) this.watches[variable].push(clause);
849
837
  }
850
838
  }
@@ -23,7 +23,7 @@ export interface UpolynomialFactors {
23
23
  degrees: number[];
24
24
  }
25
25
 
26
- const mkFactors = (): UpolynomialFactors => ({ constant: 1n, factors: [], degrees: [] });
26
+ export const mkFactors = (): UpolynomialFactors => ({ constant: 1n, factors: [], degrees: [] });
27
27
 
28
28
  const getTotalFactors = (fs: UpolynomialFactors) =>
29
29
  fs.degrees.reduce((total, degree) => total + degree, 0);
@@ -499,8 +499,4 @@ export class ProtoModel {
499
499
  getSomeConstInterp(decl: number) {
500
500
  return this.constInterps.get(decl) ?? this.getSomeValue(this.manager.funcDecls[decl].range);
501
501
  }
502
-
503
- areEqual(first: number, second: number) {
504
- return first === second;
505
- }
506
502
  }