tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.28c823e4b

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 (390) hide show
  1. package/README.md +7 -0
  2. package/dist/compile.cjs +3 -3
  3. package/dist/compile.js +3 -3
  4. package/dist/deciders.cjs +28 -28
  5. package/dist/deciders.js +52 -52
  6. package/dist/index.cjs +1 -1
  7. package/dist/index.d.cts +105 -10
  8. package/dist/index.d.ts +105 -10
  9. package/dist/index.js +1 -1
  10. package/dist/parallel-worker.cjs +1 -1
  11. package/dist/parallel-worker.js +1 -1
  12. package/dist/prove-worker.cjs +1 -1
  13. package/dist/prove-worker.js +1 -1
  14. package/dist/prove.cjs +116 -36
  15. package/dist/prove.js +116 -36
  16. package/dist/run.cjs +143 -31
  17. package/dist/run.js +143 -31
  18. package/dist/tlapm.cjs +1 -1
  19. package/dist/tlapm.js +2 -2
  20. package/dist/transfer.cjs +129 -104
  21. package/dist/transfer.js +129 -104
  22. package/dist/worker.cjs +7 -7
  23. package/dist/worker.js +7 -7
  24. package/package.json +1 -1
  25. package/src/ast.ts +4 -23
  26. package/src/bags.ts +99 -102
  27. package/src/builtins.ts +40 -78
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check.ts +564 -366
  30. package/src/cli/options.ts +10 -5
  31. package/src/cli/run.ts +0 -2
  32. package/src/cli/runtime-invariants.ts +136 -0
  33. package/src/cli/shared.ts +18 -11
  34. package/src/cli/tlapm.ts +0 -12
  35. package/src/cli/tlc-arguments.ts +640 -0
  36. package/src/cli/tlc-usage.ts +361 -0
  37. package/src/cli/tlc.ts +525 -216
  38. package/src/cli/typescript.ts +0 -3
  39. package/src/cli/xml-exporter.ts +4 -16
  40. package/src/cli.ts +0 -1
  41. package/src/codegen.ts +191 -64
  42. package/src/config.ts +140 -109
  43. package/src/coverage.ts +837 -0
  44. package/src/dependencies.ts +6 -40
  45. package/src/dfid.ts +618 -0
  46. package/src/environment.ts +237 -119
  47. package/src/errors.ts +56 -56
  48. package/src/evaluate.ts +543 -341
  49. package/src/exit-codes.ts +37 -3
  50. package/src/fingerprints.ts +10 -10
  51. package/src/index.ts +3 -0
  52. package/src/instances.ts +38 -31
  53. package/src/java-overrides.ts +4 -19
  54. package/src/json-reader.ts +455 -0
  55. package/src/json.ts +255 -139
  56. package/src/levels.ts +8 -17
  57. package/src/lexer.ts +80 -100
  58. package/src/liveness-checker.ts +77 -117
  59. package/src/liveness.ts +106 -62
  60. package/src/obligations/action.ts +4 -28
  61. package/src/obligations/anonymize.ts +84 -80
  62. package/src/obligations/equality.ts +1 -1
  63. package/src/obligations/expression.ts +2 -19
  64. package/src/obligations/format.ts +1 -9
  65. package/src/obligations/generate.ts +1 -11
  66. package/src/obligations/index.ts +0 -11
  67. package/src/obligations/levels.ts +4 -8
  68. package/src/obligations/module.ts +1 -15
  69. package/src/obligations/normalize.ts +5 -24
  70. package/src/obligations/operators.ts +1 -2
  71. package/src/obligations/pragma.ts +1 -10
  72. package/src/obligations/printer.ts +47 -46
  73. package/src/obligations/proof.ts +1 -5
  74. package/src/obligations/regroup.ts +1 -4
  75. package/src/obligations/simplify.ts +3 -14
  76. package/src/obligations/source.ts +1 -21
  77. package/src/obligations/subexpression.ts +5 -11
  78. package/src/obligations/substitution.ts +1 -3
  79. package/src/obligations/temporal.ts +8 -14
  80. package/src/obligations/tuples.ts +3 -9
  81. package/src/parallel-worker.ts +24 -33
  82. package/src/parallel.ts +48 -40
  83. package/src/parser.ts +565 -282
  84. package/src/pcal/ast.ts +53 -86
  85. package/src/pcal/parse.ts +144 -219
  86. package/src/pcal/tokenize.ts +91 -131
  87. package/src/pcal/translate.ts +83 -130
  88. package/src/pcal/validate.ts +48 -68
  89. package/src/pretty-print.ts +7 -8
  90. package/src/prover/decide-pool.ts +5 -10
  91. package/src/prover/deciders.ts +0 -4
  92. package/src/prover/first-order.ts +0 -11
  93. package/src/prover/isabelle/decide.ts +0 -6
  94. package/src/prover/isabelle/encode.ts +11 -23
  95. package/src/prover/isabelle/isar/inner-syntax.ts +108 -114
  96. package/src/prover/isabelle/isar/method.ts +25 -38
  97. package/src/prover/isabelle/isar/proof.ts +1 -10
  98. package/src/prover/isabelle/isar/statement.ts +1 -6
  99. package/src/prover/isabelle/isar/theory.ts +15 -26
  100. package/src/prover/isabelle/isar/type-check.ts +11 -25
  101. package/src/prover/isabelle/provers/blast/blast.ts +10 -41
  102. package/src/prover/isabelle/provers/blast/branch.ts +1 -32
  103. package/src/prover/isabelle/provers/blast/prove.ts +1 -35
  104. package/src/prover/isabelle/provers/blast/rules.ts +6 -44
  105. package/src/prover/isabelle/provers/blast/state.ts +2 -28
  106. package/src/prover/isabelle/provers/blast/term.ts +9 -36
  107. package/src/prover/isabelle/provers/clasimp.ts +1 -13
  108. package/src/prover/isabelle/provers/classical.ts +14 -42
  109. package/src/prover/isabelle/provers/hypsubst.ts +11 -25
  110. package/src/prover/isabelle/pure/bicompose.ts +16 -13
  111. package/src/prover/isabelle/pure/consts.ts +1 -7
  112. package/src/prover/isabelle/pure/conv.ts +1 -9
  113. package/src/prover/isabelle/pure/drule.ts +24 -40
  114. package/src/prover/isabelle/pure/envir.ts +3 -52
  115. package/src/prover/isabelle/pure/goal.ts +1 -7
  116. package/src/prover/isabelle/pure/interrupt.ts +0 -5
  117. package/src/prover/isabelle/pure/list.ts +0 -3
  118. package/src/prover/isabelle/pure/logic.ts +1 -14
  119. package/src/prover/isabelle/pure/name.ts +2 -9
  120. package/src/prover/isabelle/pure/net.ts +3 -59
  121. package/src/prover/isabelle/pure/object-logic.ts +3 -10
  122. package/src/prover/isabelle/pure/pattern.ts +2 -19
  123. package/src/prover/isabelle/pure/raw-simplifier.ts +13 -49
  124. package/src/prover/isabelle/pure/rewriter.ts +26 -58
  125. package/src/prover/isabelle/pure/search.ts +3 -10
  126. package/src/prover/isabelle/pure/seq.ts +1 -10
  127. package/src/prover/isabelle/pure/simplifier.ts +4 -12
  128. package/src/prover/isabelle/pure/table.ts +1 -31
  129. package/src/prover/isabelle/pure/tactic.ts +12 -22
  130. package/src/prover/isabelle/pure/tactical.ts +6 -12
  131. package/src/prover/isabelle/pure/term-ord.ts +2 -6
  132. package/src/prover/isabelle/pure/term.ts +2 -43
  133. package/src/prover/isabelle/pure/thm.ts +13 -36
  134. package/src/prover/isabelle/pure/type.ts +2 -15
  135. package/src/prover/isabelle/pure/unify.ts +20 -30
  136. package/src/prover/isabelle/pure/variable.ts +3 -7
  137. package/src/prover/isabelle/tla/classical-setup.ts +9 -19
  138. package/src/prover/isabelle/tla/context.ts +8 -16
  139. package/src/prover/isabelle/tla/logic.ts +4 -11
  140. package/src/prover/isabelle/tla/simpdata.ts +46 -34
  141. package/src/prover/isabelle/tools/intuitionistic.ts +1 -10
  142. package/src/prover/ocaml.ts +0 -6
  143. package/src/prover/prep/action.ts +4 -36
  144. package/src/prover/prep/enabled-axioms.ts +12 -19
  145. package/src/prover/prep/fingerprint.ts +0 -16
  146. package/src/prover/prep/level-comparison.ts +8 -12
  147. package/src/prover/prep/md5.ts +0 -2
  148. package/src/prover/prep/methods.ts +9 -36
  149. package/src/prover/prep/normalize.ts +4 -28
  150. package/src/prover/prove-worker.ts +0 -2
  151. package/src/prover/prove.ts +0 -36
  152. package/src/prover/ptl/decide.ts +7 -12
  153. package/src/prover/ptl/encode.ts +14 -36
  154. package/src/prover/ptl/sat.ts +24 -32
  155. package/src/prover/ptl/tableau.ts +12 -26
  156. package/src/prover/smt/axioms.ts +0 -7
  157. package/src/prover/smt/context.ts +19 -26
  158. package/src/prover/smt/data.ts +51 -54
  159. package/src/prover/smt/encode.ts +14 -35
  160. package/src/prover/smt/extensionality.ts +0 -10
  161. package/src/prover/smt/flatten.ts +3 -22
  162. package/src/prover/smt/format.ts +5 -10
  163. package/src/prover/smt/instances.ts +0 -10
  164. package/src/prover/smt/rewrite.ts +66 -101
  165. package/src/prover/smt/solver/act-cache.ts +0 -15
  166. package/src/prover/smt/solver/arith-rewriter.ts +3 -48
  167. package/src/prover/smt/solver/array.ts +1 -3
  168. package/src/prover/smt/solver/asserted-formulas.ts +1 -43
  169. package/src/prover/smt/solver/ast-lt.ts +1 -11
  170. package/src/prover/smt/solver/ast-util.ts +1 -6
  171. package/src/prover/smt/solver/ast.ts +1 -143
  172. package/src/prover/smt/solver/auf-solver.ts +6 -39
  173. package/src/prover/smt/solver/case-split-queue.ts +1 -9
  174. package/src/prover/smt/solver/cg-table.ts +1 -18
  175. package/src/prover/smt/solver/clause.ts +1 -27
  176. package/src/prover/smt/solver/conflict-resolution.ts +0 -9
  177. package/src/prover/smt/solver/context.ts +4 -61
  178. package/src/prover/smt/solver/ctx-simplify.ts +14 -41
  179. package/src/prover/smt/solver/der.ts +2 -21
  180. package/src/prover/smt/solver/dyn-ack.ts +1 -11
  181. package/src/prover/smt/solver/e-matching.ts +3 -34
  182. package/src/prover/smt/solver/enode.ts +1 -21
  183. package/src/prover/smt/solver/expr-ref.ts +1 -5
  184. package/src/prover/smt/solver/expr-safe-replace.ts +0 -5
  185. package/src/prover/smt/solver/fingerprints.ts +1 -12
  186. package/src/prover/smt/solver/flat-literals.ts +1 -9
  187. package/src/prover/smt/solver/goal.ts +2 -14
  188. package/src/prover/smt/solver/hash.ts +0 -8
  189. package/src/prover/smt/solver/hashtable.ts +1 -12
  190. package/src/prover/smt/solver/internalizer.ts +6 -98
  191. package/src/prover/smt/solver/lbool.ts +1 -2
  192. package/src/prover/smt/solver/literal.ts +0 -3
  193. package/src/prover/smt/solver/lp/bound-propagator.ts +8 -26
  194. package/src/prover/smt/solver/lp/constraints.ts +2 -8
  195. package/src/prover/smt/solver/lp/containers.ts +12 -30
  196. package/src/prover/smt/solver/lp/core-solver.ts +10 -31
  197. package/src/prover/smt/solver/lp/cross-nested.ts +6 -20
  198. package/src/prover/smt/solver/lp/dep-intervals.ts +7 -22
  199. package/src/prover/smt/solver/lp/dependency.ts +1 -4
  200. package/src/prover/smt/solver/lp/dioph-eq.ts +12 -98
  201. package/src/prover/smt/solver/lp/explanation.ts +1 -6
  202. package/src/prover/smt/solver/lp/gomory.ts +9 -22
  203. package/src/prover/smt/solver/lp/hnf-cutter.ts +17 -23
  204. package/src/prover/smt/solver/lp/hnf.ts +11 -26
  205. package/src/prover/smt/solver/lp/int-cube.ts +15 -36
  206. package/src/prover/smt/solver/lp/int-solver.ts +4 -34
  207. package/src/prover/smt/solver/lp/lar-solver.ts +32 -81
  208. package/src/prover/smt/solver/lp/lar-term.ts +1 -5
  209. package/src/prover/smt/solver/lp/lp-settings.ts +1 -14
  210. package/src/prover/smt/solver/lp/maximize-term.ts +20 -45
  211. package/src/prover/smt/solver/lp/nex-creator.ts +5 -28
  212. package/src/prover/smt/solver/lp/nex.ts +1 -6
  213. package/src/prover/smt/solver/lp/nla-backoff.ts +1 -4
  214. package/src/prover/smt/solver/lp/nla-basics.ts +5 -30
  215. package/src/prover/smt/solver/lp/nla-core.ts +35 -130
  216. package/src/prover/smt/solver/lp/nla-divisions.ts +32 -42
  217. package/src/prover/smt/solver/lp/nla-emonics.ts +4 -21
  218. package/src/prover/smt/solver/lp/nla-factorization.ts +1 -4
  219. package/src/prover/smt/solver/lp/nla-grobner.ts +15 -69
  220. package/src/prover/smt/solver/lp/nla-horner.ts +3 -11
  221. package/src/prover/smt/solver/lp/nla-intervals.ts +2 -12
  222. package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +16 -41
  223. package/src/prover/smt/solver/lp/nla-monotone.ts +2 -6
  224. package/src/prover/smt/solver/lp/nla-order.ts +2 -13
  225. package/src/prover/smt/solver/lp/nla-patcher.ts +4 -7
  226. package/src/prover/smt/solver/lp/nla-tangents.ts +1 -9
  227. package/src/prover/smt/solver/lp/nla-throttle.ts +1 -6
  228. package/src/prover/smt/solver/lp/nla-types.ts +1 -11
  229. package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -25
  230. package/src/prover/smt/solver/lp/nra-solver.ts +5 -52
  231. package/src/prover/smt/solver/lp/numeric-pair.ts +1 -4
  232. package/src/prover/smt/solver/lp/pdd-interval.ts +1 -3
  233. package/src/prover/smt/solver/lp/pdd-simplifier.ts +2 -14
  234. package/src/prover/smt/solver/lp/pdd-solver.ts +4 -33
  235. package/src/prover/smt/solver/lp/pdd.ts +7 -70
  236. package/src/prover/smt/solver/lp/random-updater.ts +1 -8
  237. package/src/prover/smt/solver/lp/static-matrix.ts +9 -19
  238. package/src/prover/smt/solver/lp/union-find.ts +1 -6
  239. package/src/prover/smt/solver/mam-compiler.ts +14 -56
  240. package/src/prover/smt/solver/mam-interpreter.ts +1 -21
  241. package/src/prover/smt/solver/maximize-ac-sharing.ts +2 -17
  242. package/src/prover/smt/solver/model-checker.ts +2 -36
  243. package/src/prover/smt/solver/model-evaluator.ts +3 -29
  244. package/src/prover/smt/solver/model-finder.ts +3 -15
  245. package/src/prover/smt/solver/model-generator.ts +1 -12
  246. package/src/prover/smt/solver/model-macro-solver.ts +12 -69
  247. package/src/prover/smt/solver/nlsat/algebraic.ts +55 -151
  248. package/src/prover/smt/solver/nlsat/atoms.ts +5 -19
  249. package/src/prover/smt/solver/nlsat/evaluator.ts +17 -22
  250. package/src/prover/smt/solver/nlsat/explain.ts +3 -47
  251. package/src/prover/smt/solver/nlsat/interval-set.ts +9 -50
  252. package/src/prover/smt/solver/nlsat/levelwise.ts +48 -129
  253. package/src/prover/smt/solver/nlsat/mpbq.ts +3 -14
  254. package/src/prover/smt/solver/nlsat/polynomial.ts +17 -156
  255. package/src/prover/smt/solver/nlsat/solver.ts +7 -67
  256. package/src/prover/smt/solver/nlsat/types.ts +1 -8
  257. package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -44
  258. package/src/prover/smt/solver/nlsat/upolynomial.ts +11 -92
  259. package/src/prover/smt/solver/nnf.ts +3 -38
  260. package/src/prover/smt/solver/pattern-inference.ts +2 -15
  261. package/src/prover/smt/solver/poly-rewriter.ts +3 -23
  262. package/src/prover/smt/solver/propagate-values.ts +1 -10
  263. package/src/prover/smt/solver/proto-model.ts +3 -48
  264. package/src/prover/smt/solver/pull-quant.ts +1 -12
  265. package/src/prover/smt/solver/qe-lite-der.ts +1 -29
  266. package/src/prover/smt/solver/qe-lite-fm.ts +2 -25
  267. package/src/prover/smt/solver/qe-lite.ts +3 -33
  268. package/src/prover/smt/solver/qi-queue.ts +1 -16
  269. package/src/prover/smt/solver/quant-tactics.ts +5 -22
  270. package/src/prover/smt/solver/quantifier-analyzer.ts +17 -37
  271. package/src/prover/smt/solver/quantifier-manager.ts +1 -8
  272. package/src/prover/smt/solver/random-gen.ts +1 -2
  273. package/src/prover/smt/solver/rational.ts +1 -8
  274. package/src/prover/smt/solver/ref-vector.ts +1 -6
  275. package/src/prover/smt/solver/relevancy.ts +2 -15
  276. package/src/prover/smt/solver/rewriter-tpl.ts +3 -147
  277. package/src/prover/smt/solver/rewriter.ts +3 -85
  278. package/src/prover/smt/solver/rlimit.ts +2 -20
  279. package/src/prover/smt/solver/smtlib-parser.ts +2 -37
  280. package/src/prover/smt/solver/solver.ts +1 -16
  281. package/src/prover/smt/solver/sort.ts +1 -5
  282. package/src/prover/smt/solver/sticky-generations.ts +0 -5
  283. package/src/prover/smt/solver/theory-lra-axioms.ts +3 -24
  284. package/src/prover/smt/solver/theory-lra-bounds.ts +0 -5
  285. package/src/prover/smt/solver/theory-lra-final-check.ts +4 -22
  286. package/src/prover/smt/solver/theory-lra-internalize.ts +1 -27
  287. package/src/prover/smt/solver/theory-lra-model.ts +4 -19
  288. package/src/prover/smt/solver/theory-lra-propagate.ts +1 -15
  289. package/src/prover/smt/solver/theory-lra-state.ts +3 -8
  290. package/src/prover/smt/solver/theory-lra.ts +1 -8
  291. package/src/prover/smt/solver/var-subst.ts +2 -26
  292. package/src/prover/smt/table.ts +0 -8
  293. package/src/prover/tlapm/cache.ts +20 -25
  294. package/src/prover/tlapm/ocaml-marshal.ts +19 -21
  295. package/src/prover/tlapm/tlapm.ts +12 -17
  296. package/src/prover/verdict.ts +0 -2
  297. package/src/prover/zenon/check/check.ts +0 -9
  298. package/src/prover/zenon/check/definitions.ts +5 -15
  299. package/src/prover/zenon/check/equality.ts +0 -8
  300. package/src/prover/zenon/check/functions.ts +0 -4
  301. package/src/prover/zenon/check/keys.ts +0 -7
  302. package/src/prover/zenon/check/propositional.ts +0 -3
  303. package/src/prover/zenon/check/records.ts +0 -5
  304. package/src/prover/zenon/check/relations.ts +0 -13
  305. package/src/prover/zenon/check/rewrites.ts +0 -6
  306. package/src/prover/zenon/check/sets.ts +0 -3
  307. package/src/prover/zenon/check/terms.ts +0 -17
  308. package/src/prover/zenon/check/tla.ts +0 -6
  309. package/src/prover/zenon/decide.ts +0 -12
  310. package/src/prover/zenon/encode.ts +1 -8
  311. package/src/prover/zenon/eqrel.ts +0 -13
  312. package/src/prover/zenon/equality-rules.ts +0 -4
  313. package/src/prover/zenon/expr.ts +1 -26
  314. package/src/prover/zenon/index-table.ts +17 -38
  315. package/src/prover/zenon/isar-case.ts +9 -19
  316. package/src/prover/zenon/isar.ts +1 -29
  317. package/src/prover/zenon/limits.ts +0 -4
  318. package/src/prover/zenon/llproof.ts +0 -9
  319. package/src/prover/zenon/mltoll.ts +54 -76
  320. package/src/prover/zenon/node.ts +1 -11
  321. package/src/prover/zenon/ocaml.ts +1 -17
  322. package/src/prover/zenon/parse.ts +2 -7
  323. package/src/prover/zenon/phrase.ts +1 -11
  324. package/src/prover/zenon/proof.ts +0 -9
  325. package/src/prover/zenon/propositional-rules.ts +0 -5
  326. package/src/prover/zenon/rules.ts +2 -6
  327. package/src/prover/zenon/search.ts +1 -17
  328. package/src/prover/zenon/tla/functions.ts +57 -29
  329. package/src/prover/zenon/tla/llproof.ts +63 -70
  330. package/src/prover/zenon/tla/records.ts +56 -27
  331. package/src/prover/zenon/tla/rewrites.ts +12 -19
  332. package/src/prover/zenon/tla/sets.ts +68 -39
  333. package/src/prover/zenon/tla/terms.ts +0 -6
  334. package/src/prover/zenon/tla/tla.ts +59 -58
  335. package/src/randomization.ts +81 -35
  336. package/src/resolve.ts +12 -112
  337. package/src/runtime.ts +22 -22
  338. package/src/sany/builtins.ts +2 -5
  339. package/src/sany/generator.ts +149 -252
  340. package/src/sany/levels.ts +6 -34
  341. package/src/sany/lexer.ts +41 -61
  342. package/src/sany/linter.ts +1 -9
  343. package/src/sany/modules.ts +1 -5
  344. package/src/sany/nodes.ts +0 -31
  345. package/src/sany/parse-error.ts +39 -117
  346. package/src/sany/report.ts +29 -63
  347. package/src/sany/selectors.ts +15 -39
  348. package/src/sany/source.ts +1 -17
  349. package/src/sany/xml.ts +13 -63
  350. package/src/search.ts +495 -155
  351. package/src/simulate.ts +685 -0
  352. package/src/spec-description.ts +176 -69
  353. package/src/standard-definitions.ts +0 -4
  354. package/src/standard-modules.ts +254 -69
  355. package/src/state-graph.ts +50 -24
  356. package/src/subexpressions.ts +69 -52
  357. package/src/substitution-levels.ts +2 -3
  358. package/src/successors.ts +260 -91
  359. package/src/symmetry.ts +33 -25
  360. package/src/tableau.ts +27 -24
  361. package/src/tlc/fingerprint.ts +183 -67
  362. package/src/tlc/jar-data.ts +112 -6
  363. package/src/tlc/messages.ts +110 -44
  364. package/src/tlc/order.ts +37 -60
  365. package/src/tlc/random.ts +33 -45
  366. package/src/tlc/replay.ts +549 -217
  367. package/src/tlc/summary.ts +36 -47
  368. package/src/tlc/tlc-operators.ts +76 -41
  369. package/src/tlc/tlcext-operators.ts +139 -122
  370. package/src/tlc/trace-spec.ts +269 -0
  371. package/src/tlc/value-stream.ts +139 -0
  372. package/src/tlc/version.ts +1 -4
  373. package/src/transfer.ts +22 -25
  374. package/src/typescript/actions.ts +8 -21
  375. package/src/typescript/collections.ts +0 -15
  376. package/src/typescript/compile.ts +0 -5
  377. package/src/typescript/context.ts +0 -12
  378. package/src/typescript/emit.ts +0 -1
  379. package/src/typescript/expressions.ts +0 -12
  380. package/src/typescript/formula.ts +4 -12
  381. package/src/typescript/functions.ts +6 -17
  382. package/src/typescript/model.ts +10 -11
  383. package/src/typescript/names.ts +0 -2
  384. package/src/typescript/program.ts +0 -3
  385. package/src/typescript/properties.ts +6 -8
  386. package/src/typescript/scope.ts +0 -5
  387. package/src/typescript/steps.ts +0 -10
  388. package/src/typescript/types.ts +1 -8
  389. package/src/values.ts +749 -330
  390. package/src/worker.ts +7 -8
@@ -1,8 +1,6 @@
1
- // Ported from Z3 (src/util/uint_set.h, src/util/heap.h, src/math/lp/stacked_vector.h), MIT
2
- // license, see z3-license.txt. The containers whose iteration order the lp solver depends on.
1
+ // Ported from Z3 (src/util/uint_set.h, src/util/heap.h, src/math/lp/stacked_vector.h), MIT license, see z3-license.txt.
3
2
  import { shrink } from "../array";
4
3
 
5
- // indexed_uint_set: insertion order, and a removal moves the last element into the gap.
6
4
  export class IndexedUintSet {
7
5
  elems: number[] = [];
8
6
  private positions: number[] = [];
@@ -39,7 +37,6 @@ export class IndexedUintSet {
39
37
  }
40
38
  }
41
39
 
42
- // heap<lpvar_lt>: the infeasible columns, smallest first.
43
40
  export class VarHeap {
44
41
  private values: number[] = [];
45
42
  private positions: number[] = [];
@@ -78,11 +75,6 @@ export class VarHeap {
78
75
  this.moveDown(this.positions[last]);
79
76
  }
80
77
 
81
- clear() {
82
- for (const value of this.values) this.positions[value] = -1;
83
- this.values = [];
84
- }
85
-
86
78
  private swap(first: number, second: number) {
87
79
  const values = this.values;
88
80
  const saved = values[first];
@@ -127,7 +119,6 @@ interface StackedScope {
127
119
  logSize: number;
128
120
  }
129
121
 
130
- // stacked_vector: a vector whose size and values a pop restores to the matching push.
131
122
  export class StackedVector<T> {
132
123
  values: T[] = [];
133
124
  private log: StackedLogEntry<T>[] = [];
@@ -172,8 +163,7 @@ interface HashNode<V> extends HashLink<V> {
172
163
  readonly value: V;
173
164
  }
174
165
 
175
- // __constrain_hash: a mask for a power of two bucket count, and a remainder otherwise.
176
- const getBucket = (hash: number, count: number) =>
166
+ const constrainHash = (hash: number, count: number) =>
177
167
  (count & (count - 1)) === 0 ? hash & (count - 1) : hash < count ? hash : hash % count;
178
168
 
179
169
  const isHashPowerOfTwo = (count: number) => count > 2 && (count & (count - 1)) === 0;
@@ -190,18 +180,12 @@ const getNextPrime = (value: number) => {
190
180
  return candidate;
191
181
  };
192
182
 
193
- // std::unordered_map<unsigned, V> of libc++, which Z3's release build on macOS uses: one list
194
- // threads every node, each bucket points at the node before its first one, a new node goes to the
195
- // front of its bucket, and the table grows to the next prime. The iteration order is the list.
183
+ // libc++'s std::unordered_map, whose iteration order Z3's macOS release build exposes: a Map would iterate differently.
196
184
  export class UnorderedUintMap<V> {
197
185
  private readonly anchor: HashLink<V> = { key: -1, next: null };
198
186
  private buckets: (HashLink<V> | null)[] = [];
199
187
  private nodes = new Map<number, HashNode<V>>();
200
188
 
201
- get size() {
202
- return this.nodes.size;
203
- }
204
-
205
189
  has(key: number) {
206
190
  return this.nodes.has(key);
207
191
  }
@@ -214,14 +198,13 @@ export class UnorderedUintMap<V> {
214
198
  for (let node = this.anchor.next; node !== null; node = node.next) yield [node.key, node.value];
215
199
  }
216
200
 
217
- // __emplace_unique_key_args: the key is new.
218
201
  insert(key: number, value: V) {
219
202
  const node: HashNode<V> = { key, value, next: null };
220
203
  const count = this.buckets.length;
221
204
  if (this.nodes.size + 1 > count || count === 0)
222
205
  this.rehash(Math.max(2 * count + (isHashPowerOfTwo(count) ? 0 : 1), this.nodes.size + 1));
223
206
  this.nodes.set(key, node);
224
- const bucket = getBucket(key, this.buckets.length);
207
+ const bucket = constrainHash(key, this.buckets.length);
225
208
  const previous = this.buckets[bucket];
226
209
  if (previous !== null) {
227
210
  node.next = previous.next;
@@ -231,29 +214,28 @@ export class UnorderedUintMap<V> {
231
214
  node.next = this.anchor.next;
232
215
  this.anchor.next = node;
233
216
  this.buckets[bucket] = this.anchor;
234
- if (node.next !== null) this.buckets[getBucket(node.next.key, this.buckets.length)] = node;
217
+ if (node.next !== null) this.buckets[constrainHash(node.next.key, this.buckets.length)] = node;
235
218
  }
236
219
 
237
- // remove: unlinks the node and repairs the buckets of it and of its successor.
238
220
  delete(key: number) {
239
221
  const node = this.nodes.get(key);
240
222
  if (node === undefined) return;
241
223
  this.nodes.delete(key);
242
224
  const count = this.buckets.length;
243
- const bucket = getBucket(key, count);
225
+ const bucket = constrainHash(key, count);
244
226
  let previous = this.buckets[bucket] ?? this.anchor;
245
227
  while (previous.next !== node) previous = previous.next ?? this.anchor;
246
- const isPreviousOutside = previous === this.anchor || getBucket(previous.key, count) !== bucket;
247
- if (isPreviousOutside && (node.next === null || getBucket(node.next.key, count) !== bucket))
228
+ const isPreviousOutside =
229
+ previous === this.anchor || constrainHash(previous.key, count) !== bucket;
230
+ if (isPreviousOutside && (node.next === null || constrainHash(node.next.key, count) !== bucket))
248
231
  this.buckets[bucket] = null;
249
232
  if (node.next !== null) {
250
- const nextBucket = getBucket(node.next.key, count);
233
+ const nextBucket = constrainHash(node.next.key, count);
251
234
  if (nextBucket !== bucket) this.buckets[nextBucket] = previous;
252
235
  }
253
236
  previous.next = node.next;
254
237
  }
255
238
 
256
- // clear keeps the bucket count.
257
239
  clear() {
258
240
  this.anchor.next = null;
259
241
  this.buckets.fill(null);
@@ -272,11 +254,11 @@ export class UnorderedUintMap<V> {
272
254
  let previous: HashLink<V> = this.anchor;
273
255
  let current = previous.next;
274
256
  if (current === null) return;
275
- let previousBucket = getBucket(current.key, count);
257
+ let previousBucket = constrainHash(current.key, count);
276
258
  this.buckets[previousBucket] = previous;
277
259
  previous = current;
278
260
  for (current = current.next; current !== null; current = previous.next) {
279
- const bucket = getBucket(current.key, count);
261
+ const bucket = constrainHash(current.key, count);
280
262
  if (bucket === previousBucket) {
281
263
  previous = current;
282
264
  continue;
@@ -1,13 +1,11 @@
1
1
  // Ported from Z3 (src/math/lp/lar_core_solver.h, src/math/lp/lp_core_solver_base.h,
2
2
  // src/math/lp/lp_primal_core_solver.h, src/math/lp/lp_primal_core_solver_tableau_def.h), MIT
3
- // license, see z3-license.txt. The tableau, the column values and bounds, and the primal simplex
4
- // that lar_solver runs with the tableau_rows strategy: the smallest infeasible basic column
5
- // leaves, and the entering column is the one in its row that frees the fewest bounded basics.
3
+ // license, see z3-license.txt.
6
4
  import { Rational } from "../rational";
7
5
  import { IndexedUintSet, StackedVector, VarHeap } from "./containers";
8
6
  import type { LpSettings } from "./lp-settings";
9
7
  import { Impq } from "./numeric-pair";
10
- import { RowCell, StaticMatrix } from "./static-matrix";
8
+ import { type RowCell, StaticMatrix } from "./static-matrix";
11
9
 
12
10
  export const COLUMN_FREE = 0;
13
11
  export const COLUMN_LOWER = 1;
@@ -15,7 +13,6 @@ export const COLUMN_UPPER = 2;
15
13
  export const COLUMN_BOXED = 3;
16
14
  export const COLUMN_FIXED = 4;
17
15
 
18
- // column_type: which bounds a column has.
19
16
  export type ColumnType =
20
17
  | typeof COLUMN_FREE
21
18
  | typeof COLUMN_LOWER
@@ -47,7 +44,6 @@ export class CoreSolver {
47
44
  infRowIndex = -1;
48
45
  infeasibleSumSign = 0;
49
46
  infeasibleCombination: [Rational, number][] = [];
50
- // m_d: the reduced costs while maximize_term runs the tableau_costs strategy, kept on pivots.
51
47
  reducedCosts: Rational[] | undefined;
52
48
  private isBlandMode = false;
53
49
  private leftBasis = new IndexedUintSet();
@@ -55,11 +51,6 @@ export class CoreSolver {
55
51
 
56
52
  constructor(readonly settings: LpSettings) {}
57
53
 
58
- getColumnCount() {
59
- return this.matrix.getColumnCount();
60
- }
61
-
62
- // add_new_var_to_core_fields_for_mpq: a column at zero, basic in a new row or nonbasic.
63
54
  addColumn(isBasic: boolean) {
64
55
  const column = this.matrix.getColumnCount();
65
56
  this.matrix.addColumn();
@@ -76,33 +67,30 @@ export class CoreSolver {
76
67
  this.nbasis.push(column);
77
68
  }
78
69
 
79
- // remove_last_column_from_basis_tableau: the last column out of the basis or the nonbasic
80
- // columns, once the tableau no longer holds it.
81
70
  removeLastColumn(column: number) {
82
71
  this.x.length = this.matrix.getColumnCount();
83
72
  const position = this.heading[column];
84
73
  if (position >= 0) {
85
74
  const lastPosition = this.basis.length - 1;
86
75
  if (position !== lastPosition) {
87
- const moved = this.basis[lastPosition];
88
- this.basis[position] = moved;
89
- this.heading[moved] = position;
76
+ const movedColumn = this.basis[lastPosition];
77
+ this.basis[position] = movedColumn;
78
+ this.heading[movedColumn] = position;
90
79
  }
91
80
  this.basis.pop();
92
81
  } else {
93
82
  const index = -1 - position;
94
83
  const lastPosition = this.nbasis.length - 1;
95
84
  if (index !== lastPosition) {
96
- const moved = this.nbasis[lastPosition];
97
- this.nbasis[index] = moved;
98
- this.heading[moved] = -index - 1;
85
+ const movedColumn = this.nbasis[lastPosition];
86
+ this.nbasis[index] = movedColumn;
87
+ this.heading[movedColumn] = -index - 1;
99
88
  }
100
89
  this.nbasis.pop();
101
90
  }
102
91
  this.heading.pop();
103
92
  }
104
93
 
105
- // The action, with pivots not recording the rows they touch.
106
94
  withoutTouchedRows<T>(action: () => T) {
107
95
  const savedTouchedRows = this.touchedRows;
108
96
  this.touchedRows = null;
@@ -171,7 +159,6 @@ export class CoreSolver {
171
159
  this.trackColumnFeasibility(column);
172
160
  }
173
161
 
174
- // make_column_feasible: moves the value of a column into its bounds, and returns the move.
175
162
  makeColumnFeasible(column: number) {
176
163
  const value = this.x[column];
177
164
  const lower = this.lowerBounds[column];
@@ -231,7 +218,6 @@ export class CoreSolver {
231
218
  return true;
232
219
  }
233
220
 
234
- // pivot_column_tableau: makes the column a unit column with its one in the pivot row.
235
221
  pivotColumnTableau(column: number, pivotRow: number) {
236
222
  if (!this.divideRowByPivot(pivotRow, column)) return false;
237
223
  this.settings.stats.pivots++;
@@ -256,7 +242,6 @@ export class CoreSolver {
256
242
  return true;
257
243
  }
258
244
 
259
- // pivot_to_reduced_costs_tableau: eliminates the reduced cost of the column that enters.
260
245
  private pivotToReducedCosts(reducedCosts: Rational[], pivotRow: number, column: number) {
261
246
  const alpha = reducedCosts[column];
262
247
  if (alpha.isZero()) return;
@@ -282,8 +267,6 @@ export class CoreSolver {
282
267
  this.matrix.transposeRows(first, second);
283
268
  }
284
269
 
285
- // The simplex.
286
-
287
270
  private needsToGrow(basic: number) {
288
271
  const type = this.columnTypes.get(basic);
289
272
  return (
@@ -292,7 +275,7 @@ export class CoreSolver {
292
275
  );
293
276
  }
294
277
 
295
- infSignOfColumn(basic: number) {
278
+ private infSignOfColumn(basic: number) {
296
279
  switch (this.columnTypes.get(basic)) {
297
280
  case COLUMN_FREE:
298
281
  return 0;
@@ -356,7 +339,6 @@ export class CoreSolver {
356
339
  return result;
357
340
  }
358
341
 
359
- // find_beneficial_entering_tableau_rows: the cell of the entering column, or undefined.
360
342
  private findBeneficialEntering(rowIndex: number) {
361
343
  const row = this.matrix.rows[rowIndex];
362
344
  const basic = this.basis[rowIndex];
@@ -450,7 +432,6 @@ export class CoreSolver {
450
432
  if (this.isFeasible()) this.status = LP_OPTIMAL;
451
433
  }
452
434
 
453
- // lp_primal_core_solver::solve, looking only for a feasible solution.
454
435
  private solveTableau() {
455
436
  if (this.isFeasible()) {
456
437
  this.status = LP_FEASIBLE;
@@ -473,7 +454,6 @@ export class CoreSolver {
473
454
  );
474
455
  }
475
456
 
476
- // lar_core_solver::solve.
477
457
  solve() {
478
458
  if (this.isFeasible()) {
479
459
  this.status = LP_OPTIMAL;
@@ -497,8 +477,7 @@ export class CoreSolver {
497
477
 
498
478
  popScope(count: number) {
499
479
  this.columnTypes.popScope(count);
500
- const columnCount = this.matrix.getColumnCount();
501
- this.x.length = columnCount;
480
+ this.x.length = this.matrix.getColumnCount();
502
481
  this.infeasibleCombination = [];
503
482
  }
504
483
  }
@@ -1,10 +1,6 @@
1
- // Ported from Z3 (src/math/lp/cross_nested.h), MIT license, see z3-license.txt. Enumerates the
2
- // cross-nested forms of a sum, such as x*(y + z) + w for x*y + x*z + w, and calls back on each
3
- // until the callback returns true or 100 forms are reported. A form is built by rewriting the
4
- // expression in place: the front holds the slots of the subsums still to split.
5
- //
6
- // The occurrence map is a Map in insertion order, where Z3 has an unordered_map. So when several
7
- // variables divide every summand, the extracted common factor may list them in another order.
1
+ // Ported from Z3 (src/math/lp/cross_nested.h), MIT license, see z3-license.txt.
2
+ // Deviation from Z3: the occurrence map iterates in insertion order where Z3 has an unordered_map,
3
+ // so an extracted common factor may list its variables in another order.
8
4
  import { Rational } from "../rational";
9
5
  import {
10
6
  type Nex,
@@ -17,7 +13,6 @@ import {
17
13
  } from "./nex";
18
14
  import type { NexCreator } from "./nex-creator";
19
15
 
20
- // A place that holds an expression, where Z3 has a nex**.
21
16
  interface NexSlot {
22
17
  get(): Nex;
23
18
  set(value: Nex): void;
@@ -45,8 +40,6 @@ const isDivisibleByVar = (expr: Nex, variable: number) =>
45
40
  (expr.kind === "mul" && containsVar(expr, variable)) ||
46
41
  (expr.kind === "var" && expr.variable === variable);
47
42
 
48
- // has_common_factor: whether a variable of the first summand divides the rest. A sum that
49
- // simplified to one term counts as a sum of that term.
50
43
  const hasCommonFactor = (expr: Nex) => {
51
44
  const children = expr.kind === "sum" ? expr.children : [expr];
52
45
  for (const variable of getVarsOfExpr(children[0]))
@@ -59,14 +52,13 @@ export class CrossNested {
59
52
  private isDone = false;
60
53
  private isLimitExceeded = false;
61
54
  private reported = 0;
62
- private isRandomBit = false;
63
55
 
64
56
  constructor(
65
57
  private readonly callOnResult: (expr: Nex) => boolean,
66
58
  private readonly varIsFixed: (variable: number) => boolean,
67
59
  private readonly limit: Limit,
68
60
  private randomSeed: number,
69
- readonly nexCreator: NexCreator,
61
+ private readonly nexCreator: NexCreator,
70
62
  ) {}
71
63
 
72
64
  run(expr: Nex) {
@@ -152,18 +144,16 @@ export class CrossNested {
152
144
  for (const entry of occurences) if (entry[1].occs <= 1) occurences.delete(entry[0]);
153
145
  }
154
146
 
155
- // The variables to factor out, by occurrences, then by power, then by index in the direction
156
- // of a random bit.
157
147
  private getVarsFromOccurencesMap() {
158
148
  const occurences = this.nexCreator.occurencesMap;
159
- this.isRandomBit = this.nextRandom() % 2 === 1;
149
+ const isRandomBit = this.nextRandom() % 2 === 1;
160
150
  return [...occurences.keys()].sort((first, second) => {
161
151
  const firstOcc = occurences.get(first);
162
152
  const secondOcc = occurences.get(second);
163
153
  if (firstOcc === undefined || secondOcc === undefined) return 0;
164
154
  if (firstOcc.occs !== secondOcc.occs) return secondOcc.occs - firstOcc.occs;
165
155
  if (firstOcc.power !== secondOcc.power) return secondOcc.power - firstOcc.power;
166
- return this.isRandomBit ? first - second : second - first;
156
+ return isRandomBit ? first - second : second - first;
167
157
  });
168
158
  }
169
159
 
@@ -174,10 +164,8 @@ export class CrossNested {
174
164
  return;
175
165
  }
176
166
  const expr = slot.get();
177
- // A front element is a sum, unlike in Z3, which would misread anything else as one.
178
167
  if (expr.kind === "sum") {
179
168
  this.calcOccurences(expr);
180
- // Z3 passes a copy of the front here.
181
169
  if (this.proceedWithCommonFactor(slot, expr, [...front])) return;
182
170
  const vars = this.getVarsFromOccurencesMap();
183
171
  if (vars.length > 0) return this.exploreExprOnFrontElemVars(slot, front, vars);
@@ -199,8 +187,6 @@ export class CrossNested {
199
187
  this.exploreExprOnFrontElem(next, front);
200
188
  }
201
189
 
202
- // split_with_var: e = j*a + b, where a sums the summands divisible by j, divided by it, and b
203
- // sums the rest. It is enough to split on the variables where a has no common factor.
204
190
  private splitWithVar(slot: NexSlot, variable: number, front: NexSlot[]) {
205
191
  const expr = slot.get();
206
192
  if (expr.kind !== "sum") return false;
@@ -1,8 +1,6 @@
1
1
  // Ported from Z3 (src/math/interval/interval.h, src/math/interval/interval_def.h,
2
2
  // src/math/interval/dep_intervals.h, src/math/interval/dep_intervals.cpp), MIT license, see
3
- // z3-license.txt. Exact rational intervals with open, closed, or infinite bounds, where each bound
4
- // carries the dependency that justifies it. Only the operations nla_intervals, horner,
5
- // pdd_interval, and monomial_bounds call are here; mpq is exact, so there is no rounding.
3
+ // z3-license.txt.
6
4
  import { Rational } from "../rational";
7
5
  import { type Dependency, linearize, mkJoin } from "./dependency";
8
6
 
@@ -17,7 +15,6 @@ export interface DepInterval {
17
15
  upperDep: Dependency;
18
16
  }
19
17
 
20
- // with_deps_t: whether an operation also computes the dependencies of the result.
21
18
  export type DepsMode = "with-deps" | "without-deps";
22
19
 
23
20
  interface ExtNumeral {
@@ -25,7 +22,6 @@ interface ExtNumeral {
25
22
  readonly value: Rational;
26
23
  }
27
24
 
28
- // interval_deps_combine_rule: bitmasks of the argument bounds that justify each result bound.
29
25
  interface CombineRule {
30
26
  readonly lower: number;
31
27
  readonly upper: number;
@@ -99,8 +95,6 @@ const extLt = (first: ExtNumeral, second: ExtNumeral) => {
99
95
  return second.kind === "plus-inf";
100
96
  };
101
97
 
102
- // The bounds of a result go in only after every bound of the arguments is read, since the result
103
- // may be one of the arguments.
104
98
  const setBounds = (
105
99
  result: DepInterval,
106
100
  lower: ExtNumeral,
@@ -130,7 +124,6 @@ const isN0 = (interval: DepInterval) => upperIsZero(interval) && !interval.isUpp
130
124
  const isN1 = (interval: DepInterval) =>
131
125
  upperIsNeg(interval) || (upperIsZero(interval) && interval.isUpperOpen);
132
126
  const isM = (interval: DepInterval) => lowerIsNeg(interval) && upperIsPos(interval);
133
- // interval_manager::is_zero, which unlike dep_intervals::is_zero ignores openness.
134
127
  const areBoundsZero = (interval: DepInterval) => lowerIsZero(interval) && upperIsZero(interval);
135
128
 
136
129
  const imSet = (target: DepInterval, source: DepInterval) => {
@@ -152,7 +145,6 @@ const imAdd = (first: DepInterval, second: DepInterval, result: DepInterval) =>
152
145
  first.isUpperOpen || second.isUpperOpen,
153
146
  );
154
147
 
155
- // div_mul with inv_k false.
156
148
  const imMulScalar = (scalar: Rational, interval: DepInterval, result: DepInterval) => {
157
149
  if (scalar.isZero()) return setBounds(result, MINUS_INF, true, PLUS_INF, true);
158
150
  const factor = mkNumeral(scalar);
@@ -236,7 +228,7 @@ const imMul = (first: DepInterval, second: DepInterval, result: DepInterval) =>
236
228
  );
237
229
  };
238
230
 
239
- // The divisor must not contain zero. Like Z3, a zero test of c or d reads the stored value.
231
+ // Z3 tests the stored value of c and d for zero even when the bound is infinite.
240
232
  const imDiv = (first: DepInterval, second: DepInterval, result: DepInterval) => {
241
233
  if (areBoundsZero(first))
242
234
  return setBounds(result, mkNumeral(Rational.zero), false, mkNumeral(Rational.zero), false);
@@ -451,7 +443,6 @@ const getPowerRule = (interval: DepInterval, exponent: number): CombineRule => {
451
443
  return { lower: 0, upper: DEP_IN_LOWER1 | DEP_IN_UPPER1 };
452
444
  };
453
445
 
454
- // im_config::mk_dependency: the joined dependencies of the bounds in the mask.
455
446
  const mkDependency = (first: DepInterval, second: DepInterval | null, mask: number) => {
456
447
  const withLower1 = mask & DEP_IN_LOWER1 ? first.lowerDep : null;
457
448
  const withLower2 =
@@ -460,8 +451,7 @@ const mkDependency = (first: DepInterval, second: DepInterval | null, mask: numb
460
451
  return second !== null && mask & DEP_IN_UPPER2 ? mkJoin(withUpper1, second.upperDep) : withUpper1;
461
452
  };
462
453
 
463
- // im_config::add_deps.
464
- const combineDeps = (
454
+ const addDeps = (
465
455
  first: DepInterval,
466
456
  second: DepInterval | null,
467
457
  rule: CombineRule,
@@ -489,7 +479,7 @@ export const power = (
489
479
  if (exponent === 1 && interval === result) return;
490
480
  const rule = getPowerRule(interval, exponent);
491
481
  imPower(interval, exponent, result);
492
- if (mode === "with-deps") combineDeps(interval, null, rule, result);
482
+ if (mode === "with-deps") addDeps(interval, null, rule, result);
493
483
  };
494
484
 
495
485
  export const mulScalar = (
@@ -514,7 +504,7 @@ export const mul = (
514
504
  ) => {
515
505
  const rule = getMulRule(first, second);
516
506
  imMul(first, second, result);
517
- if (mode === "with-deps") combineDeps(first, second, rule, result);
507
+ if (mode === "with-deps") addDeps(first, second, rule, result);
518
508
  };
519
509
 
520
510
  export const div = (
@@ -525,7 +515,7 @@ export const div = (
525
515
  ) => {
526
516
  const rule = getDivRule(first, second);
527
517
  imDiv(first, second, result);
528
- if (mode === "with-deps") combineDeps(first, second, rule, result);
518
+ if (mode === "with-deps") addDeps(first, second, rule, result);
529
519
  };
530
520
 
531
521
  export const add = (
@@ -535,10 +525,9 @@ export const add = (
535
525
  mode: DepsMode,
536
526
  ) => {
537
527
  imAdd(first, second, result);
538
- if (mode === "with-deps") combineDeps(first, second, getAddRule(), result);
528
+ if (mode === "with-deps") addDeps(first, second, getAddRule(), result);
539
529
  };
540
530
 
541
- // add(rational, interval): shifts the finite bounds and keeps the dependencies.
542
531
  export const addScalar = (scalar: Rational, interval: DepInterval) => {
543
532
  if (!interval.isLowerInf) interval.lower = interval.lower.add(scalar);
544
533
  if (!interval.isUpperInf) interval.upper = interval.upper.add(scalar);
@@ -558,7 +547,6 @@ const copyUpperBound = (source: DepInterval, target: DepInterval, mode: DepsMode
558
547
  if (mode === "with-deps") target.upperDep = source.upperDep;
559
548
  };
560
549
 
561
- // On equal bounds the bound of first wins if it is open, else the bound of second.
562
550
  export const intersect = (
563
551
  first: DepInterval,
564
552
  second: DepInterval,
@@ -583,7 +571,6 @@ export const intersect = (
583
571
  }
584
572
  };
585
573
 
586
- // set_value and set_interval_for_scalar: the closed point interval, keeping the dependencies.
587
574
  export const setValue = (interval: DepInterval, value: Rational) =>
588
575
  setBounds(interval, mkNumeral(value), false, mkNumeral(value), false);
589
576
 
@@ -611,8 +598,6 @@ const separatedFromZeroOnUpper = (interval: DepInterval) =>
611
598
  export const separatedFromZero = (interval: DepInterval) =>
612
599
  separatedFromZeroOnUpper(interval) || separatedFromZeroOnLower(interval);
613
600
 
614
- // When the interval excludes zero, reports the joined dependency of dep and the separating bound,
615
- // lower first.
616
601
  export const checkIntervalForConflictOnZero = (
617
602
  interval: DepInterval,
618
603
  dep: Dependency,
@@ -1,6 +1,4 @@
1
- // Ported from Z3 (src/util/dependency.h), MIT license, see z3-license.txt. The witnesses of bounds:
2
- // a DAG whose leaves are constraint indices. Without proofs, lar_solver's evidence_manager is the
3
- // plain u_dependency_manager.
1
+ // Ported from Z3 (src/util/dependency.h), MIT license, see z3-license.txt.
4
2
 
5
3
  export interface DependencyLeaf {
6
4
  readonly isLeaf: true;
@@ -25,7 +23,6 @@ export const mkJoin = (first: Dependency, second: Dependency): Dependency => {
25
23
  return { isLeaf: false, first, second, isMarked: false };
26
24
  };
27
25
 
28
- // linearize: the leaves in breadth-first order, each once, from the given roots.
29
26
  export const linearize = (roots: Dependency[]) => {
30
27
  const todo: (DependencyLeaf | DependencyJoin)[] = [];
31
28
  for (const root of roots) {