tla-ts 0.0.9-dev.8298a52 → 0.0.10

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 +71 -10
  8. package/dist/index.d.ts +71 -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 +141 -29
  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 +128 -103
  21. package/dist/transfer.js +128 -103
  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 +7 -21
  26. package/src/bags.ts +99 -99
  27. package/src/builtins.ts +44 -75
  28. package/src/bundled-modules.ts +1 -8
  29. package/src/check.ts +539 -276
  30. package/src/cli/options.ts +10 -5
  31. package/src/cli/run.ts +2 -2
  32. package/src/cli/runtime-invariants.ts +135 -0
  33. package/src/cli/shared.ts +20 -9
  34. package/src/cli/tlapm.ts +0 -12
  35. package/src/cli/tlc-arguments.ts +646 -0
  36. package/src/cli/tlc-usage.ts +362 -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 +567 -289
  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 +2 -12
  54. package/src/json-reader.ts +456 -0
  55. package/src/json.ts +262 -139
  56. package/src/levels.ts +2 -3
  57. package/src/lexer.ts +17 -26
  58. package/src/liveness-checker.ts +4 -15
  59. package/src/liveness.ts +115 -47
  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 +24 -9
  83. package/src/parser.ts +436 -90
  84. package/src/pcal/ast.ts +7 -28
  85. package/src/pcal/parse.ts +11 -39
  86. package/src/pcal/tokenize.ts +4 -20
  87. package/src/pcal/translate.ts +10 -42
  88. package/src/pcal/validate.ts +3 -21
  89. package/src/pretty-print.ts +1 -2
  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 +84 -35
  336. package/src/resolve.ts +18 -60
  337. package/src/runtime.ts +11 -4
  338. package/src/sany/builtins.ts +3 -4
  339. package/src/sany/generator.ts +119 -169
  340. package/src/sany/levels.ts +6 -30
  341. package/src/sany/lexer.ts +7 -23
  342. package/src/sany/linter.ts +1 -8
  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 +494 -154
  351. package/src/simulate.ts +694 -0
  352. package/src/spec-description.ts +166 -48
  353. package/src/standard-definitions.ts +2 -3
  354. package/src/standard-modules.ts +264 -68
  355. package/src/state-graph.ts +51 -18
  356. package/src/subexpressions.ts +31 -5
  357. package/src/substitution-levels.ts +2 -3
  358. package/src/successors.ts +264 -74
  359. package/src/symmetry.ts +31 -8
  360. package/src/tableau.ts +27 -24
  361. package/src/tlc/fingerprint.ts +183 -61
  362. package/src/tlc/jar-data.ts +113 -6
  363. package/src/tlc/messages.ts +122 -37
  364. package/src/tlc/order.ts +33 -38
  365. package/src/tlc/random.ts +16 -16
  366. package/src/tlc/replay.ts +563 -211
  367. package/src/tlc/summary.ts +2 -4
  368. package/src/tlc/tlc-operators.ts +81 -36
  369. package/src/tlc/tlcext-operators.ts +138 -117
  370. package/src/tlc/trace-spec.ts +273 -0
  371. package/src/tlc/value-stream.ts +143 -0
  372. package/src/tlc/version.ts +2 -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 +793 -267
  390. package/src/worker.ts +7 -8
@@ -1,14 +1,5 @@
1
1
  // Ported from Z3 (src/nlsat/nlsat_solver.cpp, src/nlsat/nlsat_justification.h), MIT license, see
2
- // z3-license.txt. The nlsat search of Jovanovic and de Moura: Boolean variables first, then the
3
- // arithmetic variables in order, each a stage. A stage assigns its variable outside the intervals
4
- // that the clauses watching it exclude, and a conflict learns the explanation of the excluded
5
- // line. Only Z3's default nlsat parameters are ported: lazy 0, simplify_conflicts, reorder and
6
- // randomize on, shuffle_vars, inline_vars, minimize_conflicts and check_lemmas off, seed 0. So
7
- // nlsat_simplify and the bounds of eliminated variables, which only inline_vars makes, are not
8
- // ported. Neither are what nra never uses: Boolean variables beyond true, transcendental
9
- // constraints, check(assumptions), check_limit, retract, and set_max_var, without which
10
- // select_witness never picks the maximal value. The search counts its steps against the resource
11
- // limit, but not the memory, which Z3 also bounds by max_memory.
2
+ // z3-license.txt.
12
3
  import { SmtCanceledError } from "../../../../errors";
13
4
  import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
14
5
  import { type Dependency, linearize, mkJoin, mkLeaf } from "../lp/dependency";
@@ -23,10 +14,8 @@ import type { IntervalSet } from "./interval-set";
23
14
  import { NULL_VAR, type Polynomial, PolynomialCache, PolynomialManager } from "./polynomial";
24
15
  import { type Clause, type IneqAtom, type IneqKind, isIneqAtom } from "./types";
25
16
 
26
- // null_bool_var: past every Boolean variable.
27
17
  const NULL_BOOL_VAR = Infinity;
28
18
 
29
- // m_restart_threshold: the conflicts between two reorderings of the variables.
30
19
  const RESTART_THRESHOLD = 10000;
31
20
 
32
21
  type Justification =
@@ -75,7 +64,6 @@ export class NlsatSolver {
75
64
  private watches: Clause[][] = [];
76
65
  private infeasible: (IntervalSet | null)[] = [];
77
66
  private var2eq: (IneqAtom | null)[] = [];
78
- // perm: internal to external variables. invPerm: external to internal.
79
67
  private perm: number[] = [];
80
68
  private invPerm: number[] = [];
81
69
  private explain = new Explain(this.pm, this.am, this.cache, {
@@ -95,7 +83,6 @@ export class NlsatSolver {
95
83
  private lemmaAssumptions: Dependency = null;
96
84
  private randomSeed = 0;
97
85
  private isReordered = false;
98
- // max_conflicts: nra sets it before each check.
99
86
  maxConflicts = Infinity;
100
87
  readonly stats = {
101
88
  conflicts: 0,
@@ -106,15 +93,12 @@ export class NlsatSolver {
106
93
  irrationalAssignments: 0,
107
94
  };
108
95
 
109
- // m_rlimit: the steps of the search count against the limit, and against the budget of this
110
- // solver, which Z3 sets with a scoped_rlimit on a child limit.
111
96
  steps = 0;
112
97
 
113
98
  constructor(
114
99
  private limit: ResourceLimit | null = null,
115
100
  private budget = Infinity,
116
101
  ) {
117
- // mk_true_bvar: the clause [true], whose literal the first Boolean stage assigns.
118
102
  this.mkClause([TRUE_LITERAL], false, null);
119
103
  }
120
104
 
@@ -143,17 +127,14 @@ export class NlsatSolver {
143
127
  return this.atoms.getAtom(literal);
144
128
  }
145
129
 
146
- // mk_external_clause: an input clause, which depends on assumption when it is not null.
147
130
  mkExternalClause(literals: readonly number[], assumption: number | null) {
148
131
  this.mkClause(literals, false, assumption === null ? null : mkLeaf(assumption));
149
132
  }
150
133
 
151
- // value(x): the model's value of x, zero when unassigned.
152
134
  getValue(variable: number) {
153
135
  return this.assignment[variable] ?? new Anum(Rational.zero);
154
136
  }
155
137
 
156
- // get_core: the assumptions of the input clauses the last conflict depends on.
157
138
  getCore() {
158
139
  return linearize([this.lemmaAssumptions]);
159
140
  }
@@ -177,8 +158,6 @@ export class NlsatSolver {
177
158
  return max;
178
159
  }
179
160
 
180
- // lit_lt: Boolean literals first, then by maximal variable, degree, inequalities before
181
- // equations, and index.
182
161
  private compareLiterals(first: number, second: number) {
183
162
  const firstAtom = this.atoms.getAtom(first);
184
163
  const secondAtom = this.atoms.getAtom(second);
@@ -197,7 +176,7 @@ export class NlsatSolver {
197
176
  }
198
177
 
199
178
  private mkClause(literals: readonly number[], isLearned: boolean, assumptions: Dependency) {
200
- const clause: Clause = {
179
+ const clause = {
201
180
  id: this.nextClauseId++,
202
181
  literals: literals.length === 0 ? [FALSE_LITERAL] : [...literals],
203
182
  isLearned,
@@ -228,8 +207,6 @@ export class NlsatSolver {
228
207
  for (const literal of clause.literals) this.atoms.decRef(literal);
229
208
  }
230
209
 
231
- // Search.
232
-
233
210
  private unassignBoolVar(boolVar: number) {
234
211
  this.bvalues[boolVar] = L_UNDEF;
235
212
  this.levels[boolVar] = Infinity;
@@ -298,7 +275,6 @@ export class NlsatSolver {
298
275
  this.setLiteralToTrue(literal, DECISION);
299
276
  }
300
277
 
301
- // value: the assigned value, else the atom's value once its maximal variable is assigned.
302
278
  private value(literal: number) {
303
279
  const assigned = this.getAssignedValue(literal);
304
280
  if (assigned !== L_UNDEF) return assigned;
@@ -326,7 +302,6 @@ export class NlsatSolver {
326
302
  return true;
327
303
  }
328
304
 
329
- // R_propagate: literal is true, because with the justifications of set it is infeasible.
330
305
  private propagate(literal: number, set: IntervalSet | null, isLiteralIncluded = true) {
331
306
  const justifications = this.ism.getJustifications(set);
332
307
  const literals = [...justifications.literals];
@@ -340,8 +315,6 @@ export class NlsatSolver {
340
315
  this.infeasible[this.xk] = this.ism.mkUnion(set, old);
341
316
  }
342
317
 
343
- // updt_eq: the equation of least degree that holds for the current variable, for the
344
- // explanation to simplify with.
345
318
  private updateEq(boolVar: number, justification: Justification) {
346
319
  if (this.bvalues[boolVar] !== L_TRUE) return;
347
320
  const atom = this.atoms.atoms[boolVar];
@@ -436,7 +409,6 @@ export class NlsatSolver {
436
409
  this.xk = this.xk === NULL_VAR ? 0 : this.xk + 1;
437
410
  }
438
411
 
439
- // select_witness: a value outside the infeasible intervals, at random among the candidates.
440
412
  private selectWitness() {
441
413
  const witness = this.ism.pickInComplement(this.infeasible[this.xk], true);
442
414
  if (!this.am.isRational(witness)) this.stats.irrationalAssignments++;
@@ -472,8 +444,6 @@ export class NlsatSolver {
472
444
  }
473
445
  }
474
446
 
475
- // gc: drops the learned clauses that took no part in a conflict since the last collection,
476
- // once they outnumber the input clauses four to one.
477
447
  private gc() {
478
448
  if (this.learned.length <= 4 * this.clauses.length) return;
479
449
  this.resetWatches();
@@ -498,7 +468,6 @@ export class NlsatSolver {
498
468
  this.xk = NULL_VAR;
499
469
  }
500
470
 
501
- // do_reorder
502
471
  private reorderAtRestart() {
503
472
  this.undoToBase();
504
473
  this.stats.restarts++;
@@ -507,7 +476,6 @@ export class NlsatSolver {
507
476
  this.applyReorder();
508
477
  }
509
478
 
510
- // try_reorder
511
479
  private tryReorder() {
512
480
  this.gc();
513
481
  if (this.stats.restarts % 10 !== 0) return;
@@ -515,9 +483,6 @@ export class NlsatSolver {
515
483
  this.applyReorder();
516
484
  }
517
485
 
518
- // search_check: the search, again after each model that gives an integer variable a fraction,
519
- // with the lemma that the variable lies outside the open interval between the integers around
520
- // its value.
521
486
  private searchCheck() {
522
487
  this.stats.conflicts = 0;
523
488
  this.stats.restarts = 0;
@@ -563,8 +528,6 @@ export class NlsatSolver {
563
528
  this.assignment.length = 0;
564
529
  }
565
530
 
566
- // check: satisfiable, unsatisfiable or unknown once maxConflicts conflicts passed. The variables
567
- // are reordered for the search and restored after it.
568
531
  check() {
569
532
  this.initSearch();
570
533
  this.explain.isFullDimensional = this.clauses.every((clause) =>
@@ -593,7 +556,6 @@ export class NlsatSolver {
593
556
  }
594
557
  }
595
558
 
596
- // sort_clauses_by_degree
597
559
  private sortClausesByDegree(clauses: Clause[]) {
598
560
  if (clauses.length <= 1) return;
599
561
  const degrees = clauses.map((clause) => this.getClauseDegree(clause));
@@ -604,10 +566,6 @@ export class NlsatSolver {
604
566
  for (let index = 0; index < sorted.length; index++) clauses[index] = sorted[index];
605
567
  }
606
568
 
607
- // check(rvalues, clause): the assignment's verdict on the clauses. A falsified clause gives the
608
- // literal of least degree among the falsified clauses, and the lemma of the linear cell around
609
- // the assignment in which that literal stays false. Like Z3, only that case restores the
610
- // assignment.
611
569
  checkAssignment(values: readonly (Anum | undefined)[]) {
612
570
  const saved = this.assignment.map((value) =>
613
571
  value === undefined ? undefined : this.am.copy(value),
@@ -644,8 +602,6 @@ export class NlsatSolver {
644
602
  this.assignment[variable] = value === undefined ? undefined : this.am.copy(value);
645
603
  }
646
604
 
647
- // Conflict resolution.
648
-
649
605
  private processAntecedent(antecedent: number) {
650
606
  this.checkpoint();
651
607
  const boolVar = antecedent >> 1;
@@ -674,8 +630,6 @@ export class NlsatSolver {
674
630
  this.lemmaAssumptions = mkJoin(clause.assumptions, this.lemmaAssumptions);
675
631
  }
676
632
 
677
- // resolve_lazy_justification: the explanation of the excluded line, with the negations of the
678
- // literals that excluded it, as the clause to resolve with.
679
633
  private resolveLazyJustification(boolVar: number, literals: number[], clauses: Clause[]) {
680
634
  this.lazyClause.reset();
681
635
  this.explain.computeConflictExplanation(literals, this.lazyClause);
@@ -690,7 +644,6 @@ export class NlsatSolver {
690
644
  for (const literal of this.lemma.literals) this.marks[literal >> 1] = false;
691
645
  }
692
646
 
693
- // scoped_reset_marks
694
647
  private releaseMarks() {
695
648
  if (this.markCount > 0) {
696
649
  this.markCount = 0;
@@ -698,7 +651,6 @@ export class NlsatSolver {
698
651
  } else this.resetMarks();
699
652
  }
700
653
 
701
- // resolve: learns a lemma from the conflict and backjumps. False when the lemma is empty.
702
654
  private resolve(conflict: Clause) {
703
655
  let conflictClause = conflict;
704
656
  while (true) {
@@ -717,8 +669,6 @@ export class NlsatSolver {
717
669
  }
718
670
  }
719
671
 
720
- // The body of resolve for one conflict: null for the empty lemma, true when the conflict clause
721
- // itself is the lemma and now propagates, else the learned clause.
722
672
  private learn(conflict: Clause): Clause | true | null {
723
673
  this.resolveClause(-1, conflict);
724
674
  let top = this.trail.length;
@@ -749,7 +699,6 @@ export class NlsatSolver {
749
699
  for (const literal of literals)
750
700
  if (this.getAssignedValue(literal) === L_FALSE)
751
701
  maxLevel = Math.max(maxLevel, this.levels[literal >> 1]);
752
- // remove_literals_from_lvl
753
702
  let kept = 0;
754
703
  for (const literal of literals) {
755
704
  const boolVar = literal >> 1;
@@ -782,7 +731,7 @@ export class NlsatSolver {
782
731
  if (literals.every((literal) => this.atoms.getAtom(literal) === null)) {
783
732
  const boolVar = literals[literals.length - 1] >> 1;
784
733
  this.undoUntil(() => this.bvalues[boolVar] !== L_UNDEF);
785
- } else this.undoUntilLevel(this.findNewLevel(literals));
734
+ } else this.undoUntilLevel(this.findNewLevelArithLemma(literals));
786
735
  if (
787
736
  literals.length === conflict.literals.length &&
788
737
  literals.every((literal, index) => literal === conflict.literals[index])
@@ -793,9 +742,7 @@ export class NlsatSolver {
793
742
  return this.mkClause(literals, true, this.lemmaAssumptions);
794
743
  }
795
744
 
796
- // find_new_level_arith_lemma: the highest level of a literal of the current stage other than the
797
- // last, else the level below the current one.
798
- private findNewLevel(literals: readonly number[]) {
745
+ private findNewLevelArithLemma(literals: readonly number[]) {
799
746
  let level = -1;
800
747
  for (const literal of literals.slice(0, -1))
801
748
  if (this.atoms.getMaxVar(literal) === this.xk)
@@ -803,8 +750,6 @@ export class NlsatSolver {
803
750
  return level === -1 ? this.scopeLevel - 1 : level;
804
751
  }
805
752
 
806
- // Variable order.
807
-
808
753
  private canReorder() {
809
754
  return [...this.learned, ...this.clauses].every((clause) =>
810
755
  clause.literals.every(
@@ -813,7 +758,6 @@ export class NlsatSolver {
813
758
  );
814
759
  }
815
760
 
816
- // apply_reorder
817
761
  private applyReorder() {
818
762
  this.isReordered = false;
819
763
  if (!this.canReorder()) return;
@@ -821,7 +765,6 @@ export class NlsatSolver {
821
765
  this.isReordered = true;
822
766
  }
823
767
 
824
- // heuristic_reorder: higher maximal degree first, then more occurrences, then a random order.
825
768
  private reorderHeuristically() {
826
769
  const count = this.isInt.length;
827
770
  const maxDegrees = Array.from({ length: count }, () => 0);
@@ -840,7 +783,6 @@ export class NlsatSolver {
840
783
  if (isIneqAtom(atom)) atom.polynomials.forEach(collect);
841
784
  else collect(atom.polynomial);
842
785
  }
843
- // init_shuffle
844
786
  const shuffle = Array.from({ length: count }, (_value, index) => index);
845
787
  const random = new RandomGen(++this.randomSeed);
846
788
  for (let index = count; index-- > 0;) {
@@ -858,8 +800,6 @@ export class NlsatSolver {
858
800
  this.reorder(permutation);
859
801
  }
860
802
 
861
- // reorder: renames each variable x to permutation[x], in the polynomials, the assignment and
862
- // the watches.
863
803
  private reorder(permutation: readonly number[]) {
864
804
  let kept = 0;
865
805
  for (const clause of this.learned) {
@@ -878,11 +818,12 @@ export class NlsatSolver {
878
818
  const invPerm = this.invPerm.map((variable) => permutation[variable]);
879
819
  for (const [external, internal] of invPerm.entries()) this.perm[internal] = external;
880
820
  const isInt = [...this.isInt];
881
- for (const [variable, flag] of isInt.entries()) this.isInt[permutation[variable]] = flag;
821
+ for (const [variable, isIntVariable] of isInt.entries())
822
+ this.isInt[permutation[variable]] = isIntVariable;
882
823
  this.invPerm = invPerm;
883
824
  const polynomials = new Set<Polynomial>();
884
825
  for (const atom of this.atoms.atoms) {
885
- if (atom === null || atom === undefined) continue;
826
+ if (atom === null) continue;
886
827
  if (isIneqAtom(atom)) for (const polynomial of atom.polynomials) polynomials.add(polynomial);
887
828
  else polynomials.add(atom.polynomial);
888
829
  }
@@ -893,7 +834,6 @@ export class NlsatSolver {
893
834
  this.reattachArithClauses(this.learned);
894
835
  }
895
836
 
896
- // restore_order
897
837
  restoreOrder() {
898
838
  this.reorder([...this.perm]);
899
839
  }
@@ -1,14 +1,11 @@
1
1
  // Ported from Z3 (src/nlsat/nlsat_types.h, src/nlsat/nlsat_clause.h), MIT license, see
2
- // z3-license.txt. The atoms and clauses of nlsat. A literal is 2 * boolVar + sign, where sign 1
3
- // negates the atom.
2
+ // z3-license.txt.
4
3
  import type { Dependency } from "../lp/dependency";
5
4
  import type { Polynomial } from "./polynomial";
6
5
 
7
6
  export type IneqKind = "EQ" | "LT" | "GT";
8
7
  export type RootKind = "ROOT_EQ" | "ROOT_LT" | "ROOT_GT" | "ROOT_LE" | "ROOT_GE";
9
8
 
10
- // p1 * ... * pn kind 0, where isEven[i] marks a factor of even degree, which only its zeros
11
- // matter for. maxVar is the largest maximal variable of the factors.
12
9
  export interface IneqAtom {
13
10
  kind: IneqKind;
14
11
  boolVar: number;
@@ -17,8 +14,6 @@ export interface IneqAtom {
17
14
  isEven: boolean[];
18
15
  }
19
16
 
20
- // x kind root[index](p): the index-th real root of p, from 1, as a polynomial in x at the values of
21
- // the variables below x. maxVar is x.
22
17
  export interface RootAtom {
23
18
  kind: RootKind;
24
19
  boolVar: number;
@@ -29,8 +24,6 @@ export interface RootAtom {
29
24
 
30
25
  export type Atom = IneqAtom | RootAtom;
31
26
 
32
- // A clause, with the assumptions it depends on. isActive marks a learned clause that took part in
33
- // a conflict since the last garbage collection.
34
27
  export interface Clause {
35
28
  id: number;
36
29
  literals: number[];
@@ -1,29 +1,22 @@
1
1
  // Ported from Z3 (src/math/polynomial/upolynomial_factorization{.cpp,_int.h}, the factorization
2
2
  // in src/math/polynomial/upolynomial.cpp, src/util/prime_generator.cpp and mpz_manager::root),
3
- // MIT license, see z3-license.txt. Factorization of univariate integer polynomials: square-free
4
- // decomposition, Berlekamp's algorithm in Z_p for small primes p, quadratic Hensel lifting to
5
- // p^e above a Mignotte bound, and a search over combinations of the lifted factors (Zassenhaus).
3
+ // MIT license, see z3-license.txt.
6
4
  import { type Upolynomial, UpolynomialManager } from "./upolynomial";
7
5
 
8
6
  const UINT_MAX = 4294967295;
9
7
 
10
8
  export interface FactorParams {
11
- // Factor in Z_p for primes p up to maxPrime.
12
9
  maxPrime: number;
13
- // The number of factorizations in Z_p whose degree sets are intersected before lifting.
14
10
  primeTrials: number;
15
- // The most combinations of lifted factors the search tries.
16
11
  maxSearchSize: number;
17
12
  }
18
13
 
19
- // polynomial::factor_params(), which polynomial factorization and nlsat use.
20
14
  export const DEFAULT_FACTOR_PARAMS: FactorParams = {
21
15
  maxPrime: UINT_MAX,
22
16
  primeTrials: 4,
23
17
  maxSearchSize: UINT_MAX,
24
18
  };
25
19
 
26
- // constant * factors[0]^degrees[0] * ... * factors[n]^degrees[n].
27
20
  export interface UpolynomialFactors {
28
21
  constant: bigint;
29
22
  factors: bigint[][];
@@ -48,7 +41,6 @@ const pushFactor = (
48
41
  fs.degrees.push(degree);
49
42
  };
50
43
 
51
- // factors::multiply
52
44
  const multiplyFactors = (um: UpolynomialManager, fs: UpolynomialFactors) => {
53
45
  if (fs.constant === 0n) return [];
54
46
  let result = [um.normalizeNumeral(fs.constant)];
@@ -60,7 +52,6 @@ const multiplyFactors = (um: UpolynomialManager, fs: UpolynomialFactors) => {
60
52
  return result;
61
53
  };
62
54
 
63
- // prime_iterator: 2, 3, 5, 7, ...
64
55
  const mkPrimeIterator = () => {
65
56
  let current = 1;
66
57
  return () => {
@@ -76,8 +67,6 @@ const mkPrimeIterator = () => {
76
67
  };
77
68
  };
78
69
 
79
- // mpz_manager::root for n = 2: bisection from powers of two, returning the upper end when the
80
- // square root is not an integer.
81
70
  const getSquareRoot = (value: bigint) => {
82
71
  if (value === 0n) return value;
83
72
  const log2 = value.toString(2).length - 1;
@@ -94,14 +83,12 @@ const getSquareRoot = (value: bigint) => {
94
83
  }
95
84
  };
96
85
 
97
- // mpz_manager::is_perfect_square: the nonnegative square root, or null.
98
86
  export const getExactSquareRoot = (value: bigint) => {
99
87
  if (value < 0n) return null;
100
88
  const root = getSquareRoot(value);
101
89
  return root * root === value ? root : null;
102
90
  };
103
91
 
104
- // factorization_degree_set: the degrees that products of the factors can have.
105
92
  const getDegreeSet = (fs: UpolynomialFactors) => {
106
93
  let set = [true];
107
94
  for (let index = 0; index < fs.factors.length; index++) {
@@ -119,7 +106,6 @@ const isTrivialDegreeSet = (set: readonly boolean[]) => {
119
106
  return true;
120
107
  };
121
108
 
122
- // berlekamp_matrix: Q - I, where row i of Q holds x^(p*i) modulo f.
123
109
  class BerlekampMatrix {
124
110
  private matrix: bigint[];
125
111
  private size: number;
@@ -159,8 +145,6 @@ class BerlekampMatrix {
159
145
  this.matrix[row * this.size + column] = this.zp.normalizeNumeral(value);
160
146
  }
161
147
 
162
- // diagonalize: column operations that turn each pivot into -1. Returns the rank of the null
163
- // space.
164
148
  diagonalize() {
165
149
  let nullRank = 0;
166
150
  for (let row = 0; row < this.size; row++) {
@@ -189,7 +173,6 @@ class BerlekampMatrix {
189
173
  return nullRank;
190
174
  }
191
175
 
192
- // next_null_space_vector: the next basis vector of the null space, skipping [1, 0, ..., 0].
193
176
  nextNullSpaceVector() {
194
177
  for (; this.nullRow < this.size; this.nullRow++) {
195
178
  if (this.rowPivot[this.nullRow] >= 0) continue;
@@ -207,8 +190,6 @@ class BerlekampMatrix {
207
190
  }
208
191
  }
209
192
 
210
- // zp_factor_square_free_berlekamp, deterministic: splits the monic square-free f in Z_p with
211
- // gcd(v - s, f) for the null space vectors v of Q - I. Returns false when f is irreducible.
212
193
  const factorSquareFreeInZp = (zp: UpolynomialManager, f: Upolynomial, fs: UpolynomialFactors) => {
213
194
  const prime = Number(zp.zp);
214
195
  const matrix = new BerlekampMatrix(zp, f);
@@ -237,8 +218,6 @@ const factorSquareFreeInZp = (zp: UpolynomialManager, f: Upolynomial, fs: Upolyn
237
218
  return true;
238
219
  };
239
220
 
240
- // hensel_lift: from C = A*B (mod b) and U*A + V*B = 1 (mod r) with r | b, the A1 = A (mod b) and
241
- // B1 = B (mod b) with C = A1*B1 (mod b*r), deg(A1) = deg(A) and lc(A1) = lc(A).
242
221
  const henselLiftOnce = (
243
222
  z: UpolynomialManager,
244
223
  b: bigint,
@@ -255,8 +234,6 @@ const henselLiftOnce = (
255
234
  };
256
235
  };
257
236
 
258
- // hensel_lift_quadratic: lifts C = A*B from Z_p to Z_(p^e), squaring the modulus of zpe and
259
- // lifting U*A + V*B = 1 along with A and B.
260
237
  const henselLiftQuadratic = (
261
238
  z: UpolynomialManager,
262
239
  c: Upolynomial,
@@ -296,8 +273,6 @@ const henselLiftQuadratic = (
296
273
  return { a: currentA, b: currentB };
297
274
  };
298
275
 
299
- // hensel_lift: the monic factors of f in Z_p lifted one by one to Z_(p^e), the last one carrying
300
- // lc(f) until it is divided out.
301
276
  const henselLiftFactors = (
302
277
  z: UpolynomialManager,
303
278
  f: Upolynomial,
@@ -330,8 +305,6 @@ const henselLiftFactors = (
330
305
  return zpeFs;
331
306
  };
332
307
 
333
- // mignotte_bound: the e, a power of two, with p^e above 2^n * (|f| + |lc(f)|) for n = deg(f)/2,
334
- // which bounds twice the coefficients of the factors of degree at most n.
335
308
  const getMignotteBound = (f: Upolynomial, prime: bigint) => {
336
309
  let squareNorm = 0n;
337
310
  for (const coeff of f) if (coeff !== 0n) squareNorm += coeff * coeff;
@@ -344,9 +317,6 @@ const getMignotteBound = (f: Upolynomial, prime: bigint) => {
344
317
  return e;
345
318
  };
346
319
 
347
- // ufactorization_combination_iterator: the subsets of the enabled factors, smallest first and at
348
- // most half of them, whose degree is in the degree set. Selected factors that turn out to be true
349
- // factors are removed from later subsets.
350
320
  class CombinationIterator {
351
321
  private totalSize: number;
352
322
  private maxSize: number;
@@ -427,7 +397,6 @@ class CombinationIterator {
427
397
  return degree;
428
398
  }
429
399
 
430
- // The enabled factors outside the selection, in order.
431
400
  private getRest() {
432
401
  const rest: number[] = [];
433
402
  for (let factor = 0, selected = 0; factor < this.fs.factors.length; factor++) {
@@ -455,7 +424,6 @@ class CombinationIterator {
455
424
  return result;
456
425
  }
457
426
 
458
- // get_left_tail_coeff, get_right_tail_coeff: m times the constant terms of the side's factors.
459
427
  getLeftTailCoeff(multiplier: bigint) {
460
428
  let result = this.zpe.normalizeNumeral(multiplier);
461
429
  for (let index = 0; index < this.currentSize; index++)
@@ -474,9 +442,6 @@ class CombinationIterator {
474
442
  const divides = (divisor: bigint, dividend: bigint) =>
475
443
  divisor === 0n ? dividend === 0n : dividend % divisor === 0n;
476
444
 
477
- // factor_square_free: the factors of the primitive square-free f in Z[x], each pushed with
478
- // multiplicity k. Returns false when a limit in params stopped the search, leaving a factor that
479
- // may be reducible.
480
445
  export const factorSquareFree = (
481
446
  z: UpolynomialManager,
482
447
  f: Upolynomial,
@@ -553,8 +518,6 @@ export const factorSquareFree = (
553
518
  isRemoving = false;
554
519
  continue;
555
520
  }
556
- // The factor is the side of degree at most half, which the bound makes recoverable. The
557
- // search continues with the other side.
558
521
  pushFactor(z, fs, z.getPrimitive(isUsingLeft ? trial : quotient), k);
559
522
  fPp = z.getPrimitive(isUsingLeft ? quotient : trial);
560
523
  leading = fPp[fPp.length - 1];
@@ -565,7 +528,6 @@ export const factorSquareFree = (
565
528
  return result;
566
529
  };
567
530
 
568
- // factor_2_sqf_pp: a square-free primitive quadratic splits when its discriminant is a square.
569
531
  const factorQuadratic = (
570
532
  z: UpolynomialManager,
571
533
  p: Upolynomial,
@@ -581,7 +543,6 @@ const factorQuadratic = (
581
543
  pushFactor(z, fs, z.normalize([p[1] + root, 2n * p[2]]), k);
582
544
  };
583
545
 
584
- // factor_sqf_pp
585
546
  const factorSqfPp = (
586
547
  z: UpolynomialManager,
587
548
  p: Upolynomial,
@@ -600,16 +561,12 @@ const factorSqfPp = (
600
561
  return factorSquareFree(z, p, fs, k, params);
601
562
  };
602
563
 
603
- // flip_factor_sign_if_lm_neg
604
564
  const flipFactorSignIfLmNeg = (p: Upolynomial, fs: UpolynomialFactors, k: number) => {
605
565
  if (p.length === 0 || p[p.length - 1] >= 0n) return p;
606
566
  if (k % 2 === 1) fs.constant = -fs.constant;
607
567
  return p.map((coeff) => -coeff);
608
568
  };
609
569
 
610
- // manager::factor: the content and the irreducible factors of p with their multiplicities, by
611
- // Yun's square-free decomposition. Returns false when a limit in params left a factor that may be
612
- // reducible.
613
570
  export const factorUpolynomial = (
614
571
  z: UpolynomialManager,
615
572
  p: Upolynomial,