tla-ts 0.0.9-dev.8298a52 → 0.0.10-dev.06b481ee0
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.
- package/README.md +8 -0
- package/dist/compile.cjs +6 -6
- package/dist/compile.js +10 -10
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +121 -12
- package/dist/index.d.ts +121 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1155 -900
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +318 -656
- package/src/cli/typescript.ts +0 -3
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +260 -371
- package/src/errors.ts +93 -58
- package/src/evaluate.ts +848 -374
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +97 -43
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -325
- package/src/liveness.ts +224 -131
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +34 -57
- package/src/parallel.ts +62 -72
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +129 -38
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +296 -105
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +10 -25
- package/src/typescript/collections.ts +34 -35
- package/src/typescript/compile.ts +1 -8
- package/src/typescript/context.ts +0 -12
- package/src/typescript/emit.ts +0 -1
- package/src/typescript/expressions.ts +0 -12
- package/src/typescript/formula.ts +9 -15
- package/src/typescript/functions.ts +6 -17
- package/src/typescript/model.ts +14 -16
- package/src/typescript/names.ts +0 -2
- package/src/typescript/program.ts +0 -3
- package/src/typescript/properties.ts +6 -8
- package/src/typescript/scope.ts +0 -5
- package/src/typescript/steps.ts +20 -28
- package/src/typescript/types.ts +3 -10
- package/src/values.ts +917 -522
- package/src/worker.ts +7 -8
- package/src/prover/isabelle/isar/statement.ts +0 -57
- package/src/prover/smt/solver/z3-license.txt +0 -10
- package/src/prover/tlaps-module.ts +0 -510
- package/src/prover/zenon/LICENSE +0 -32
|
@@ -1,29 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
// z3-license.txt. nla's bridge to nlsat. The constraints in the cone of influence of the monomials
|
|
3
|
-
// to refine go to nlsat, with every monomial and term column replaced by its polynomial. check runs
|
|
4
|
-
// nlsat's search on them: a model becomes nla's, and a refutation a lemma over the constraints of
|
|
5
|
-
// its core. check_assignment instead hands nlsat the current values, and when they violate a
|
|
6
|
-
// constraint, nlsat's linear cell around them becomes a lemma.
|
|
7
|
-
// Deviations from Z3:
|
|
8
|
-
// - nlsat input it does not implement (NlsatUnsupportedError) answers unknown. That is a linear
|
|
9
|
-
// cell around an irrational section, where Z3 exits the process (levelwise.cpp,
|
|
10
|
-
// add_linear_approximations).
|
|
11
|
-
// - nlsat's check(rvalues) never answers satisfied, because its solver starts with the clause
|
|
12
|
-
// [true], whose literal is unassigned outside search. So the satisfied branch of
|
|
13
|
-
// check_assignment, which switches nla to nlsat's model, is left out.
|
|
14
|
-
// - A lemma literal of check_assignment is always linear, because the cell bounds are, so
|
|
15
|
-
// add_mul_def, which defines a fresh monomial column, is left out. A nonlinear literal would
|
|
16
|
-
// answer unknown.
|
|
17
|
-
// - nlsat counts against the budget of a check only its own steps, not those of the polynomial and
|
|
18
|
-
// algebraic number managers, so a long search stops at a different point than Z3's. Like Z3's,
|
|
19
|
-
// it then throws, which ends the whole check as unknown.
|
|
20
|
-
// - Transcendental functions are not supported, so none are registered with nlsat.
|
|
21
|
-
import { NlsatUnsupportedError, SmtInvariantError } from "../../../../errors";
|
|
1
|
+
import { SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
22
2
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
23
3
|
import { Rational, getLcm } from "../rational";
|
|
24
4
|
import { Anum } from "../nlsat/algebraic";
|
|
25
5
|
import { NlsatSolver } from "../nlsat/solver";
|
|
26
|
-
import type
|
|
6
|
+
import { type Polynomial, PolynomialRef, PolynomialRefVector } from "../nlsat/polynomial";
|
|
27
7
|
import { isIneqAtom } from "../nlsat/types";
|
|
28
8
|
import {
|
|
29
9
|
KIND_EQ,
|
|
@@ -35,9 +15,9 @@ import {
|
|
|
35
15
|
type LarConstraint,
|
|
36
16
|
} from "./constraints";
|
|
37
17
|
import { Explanation } from "./explanation";
|
|
38
|
-
import type
|
|
18
|
+
import { type LarSolver, NULL_LPVAR } from "./lar-solver";
|
|
39
19
|
import { LarTerm } from "./lar-term";
|
|
40
|
-
import {
|
|
20
|
+
import type { NlaCore } from "./nla-core";
|
|
41
21
|
import { LemmaBuilder, mkIneq } from "./nla-types";
|
|
42
22
|
|
|
43
23
|
interface Occurrences {
|
|
@@ -46,14 +26,11 @@ interface Occurrences {
|
|
|
46
26
|
terms: number[];
|
|
47
27
|
}
|
|
48
28
|
|
|
49
|
-
// lar_base_constraint::coeffs: the term of a term column, else the column itself.
|
|
50
29
|
const getConstraintCoeffs = (lra: LarSolver, constraint: LarConstraint): [number, Rational][] =>
|
|
51
30
|
lra.hasTerm(constraint.column)
|
|
52
31
|
? [...lra.getTerm(constraint.column).coeffs]
|
|
53
32
|
: [[constraint.column, Rational.one]];
|
|
54
33
|
|
|
55
|
-
// coi::init: the constraints reachable from the monomials to refine through shared variables,
|
|
56
|
-
// monomials and terms, in the order the search reaches them.
|
|
57
34
|
const getConeOfInfluence = (core: NlaCore) => {
|
|
58
35
|
const lra = core.lra;
|
|
59
36
|
const occurrences: Occurrences[] = [];
|
|
@@ -68,7 +45,12 @@ const getConeOfInfluence = (core: NlaCore) => {
|
|
|
68
45
|
for (const lpVar of monic.vars) getOccurrences(lpVar).monics.push(monic.variable);
|
|
69
46
|
for (const term of lra.terms)
|
|
70
47
|
for (const entry of term.coeffs) getOccurrences(entry[0]).terms.push(term.column);
|
|
71
|
-
|
|
48
|
+
// The applications of transcendental functions are neither monomials nor terms.
|
|
49
|
+
const todo = [
|
|
50
|
+
...core.transcendentals.apps.flatMap((app) => [app.arg, app.val]),
|
|
51
|
+
...core.transcendentals.atan2Apps.flatMap((app) => [app.y, app.x, app.val]),
|
|
52
|
+
...core.toRefine.elems,
|
|
53
|
+
];
|
|
72
54
|
const vars = new Set<number>();
|
|
73
55
|
const constraints = new Set<number>();
|
|
74
56
|
const monics = new Set<number>();
|
|
@@ -96,95 +78,87 @@ const getConeOfInfluence = (core: NlaCore) => {
|
|
|
96
78
|
return { vars, constraints, monics };
|
|
97
79
|
};
|
|
98
80
|
|
|
99
|
-
// has_large_dyadic_denominator: a denominator 2^k with k >= 24.
|
|
100
81
|
const hasLargeDyadicDenominator = (value: Rational) => {
|
|
101
82
|
const den = value.den;
|
|
102
83
|
return den >= 1n << 24n && (den & (den - 1n)) === 0n;
|
|
103
84
|
};
|
|
104
85
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
86
|
+
const getSortedVars = (vars: readonly number[]) =>
|
|
87
|
+
[...vars].sort((first, second) => first - second);
|
|
88
|
+
|
|
108
89
|
const isDyadicArtifact = (lra: LarSolver, constraint: LarConstraint) =>
|
|
109
90
|
constraint.isAuxiliary &&
|
|
110
91
|
(hasLargeDyadicDenominator(constraint.rhs.x) ||
|
|
111
92
|
getConstraintCoeffs(lra, constraint).some((entry) => hasLargeDyadicDenominator(entry[1])));
|
|
112
93
|
|
|
113
94
|
export class NraSolver {
|
|
114
|
-
|
|
115
|
-
private solver = new NlsatSolver();
|
|
95
|
+
private solver: NlsatSolver;
|
|
116
96
|
private values: Anum[] = [];
|
|
117
|
-
// m_lp2nl: the nlsat variable of each column the solver has.
|
|
118
97
|
private lp2nl = new Map<number, number>();
|
|
98
|
+
private literal2constraint = new Map<number, number>();
|
|
99
|
+
private vars2mon = new Map<string, number>();
|
|
119
100
|
|
|
120
|
-
constructor(private core: NlaCore) {
|
|
101
|
+
constructor(private core: NlaCore) {
|
|
102
|
+
this.solver = new NlsatSolver(core.nraLimit);
|
|
103
|
+
}
|
|
121
104
|
|
|
122
105
|
get am() {
|
|
123
106
|
return this.solver.am;
|
|
124
107
|
}
|
|
125
108
|
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
109
|
+
private reset() {
|
|
110
|
+
this.solver = new NlsatSolver(this.core.nraLimit);
|
|
111
|
+
this.values = [];
|
|
112
|
+
this.lp2nl.clear();
|
|
129
113
|
}
|
|
130
114
|
|
|
131
|
-
// mk_definition: each included column as a polynomial in the included columns that are neither
|
|
132
|
-
// monomials nor terms, scaled by an integer denominator to keep the coefficients integral.
|
|
133
|
-
// Excluded columns have no definition.
|
|
134
115
|
private mkDefinitions(isIncluded: (lpVar: number) => boolean) {
|
|
135
116
|
const core = this.core;
|
|
136
117
|
const lra = core.lra;
|
|
137
118
|
const solver = this.solver;
|
|
138
119
|
const pm = solver.pm;
|
|
139
|
-
const definitions
|
|
120
|
+
const definitions = new PolynomialRefVector(pm);
|
|
140
121
|
const denominators: bigint[] = [];
|
|
122
|
+
const p = new PolynomialRef(pm);
|
|
123
|
+
const constant = new PolynomialRef(pm);
|
|
124
|
+
const product = new PolynomialRef(pm);
|
|
141
125
|
for (let lpVar = 0; lpVar < lra.columns.length; lpVar++) {
|
|
142
126
|
if (!isIncluded(lpVar)) {
|
|
143
|
-
definitions.push(
|
|
127
|
+
definitions.push(pm.zero);
|
|
144
128
|
denominators.push(0n);
|
|
145
129
|
continue;
|
|
146
130
|
}
|
|
147
131
|
const variable = solver.mkVar(lra.isInt(lpVar));
|
|
148
132
|
this.lp2nl.set(lpVar, variable);
|
|
133
|
+
let denominator = 1n;
|
|
149
134
|
if (core.emons.isMonicVar(lpVar)) {
|
|
150
|
-
|
|
151
|
-
let denominator = 1n;
|
|
152
|
-
for (const factor of core.emons.get(lpVar).vars) {
|
|
135
|
+
for (const [index, factor] of core.emons.get(lpVar).vars.entries()) {
|
|
153
136
|
denominator = denominators[factor] * denominator;
|
|
154
|
-
|
|
155
|
-
definition === null ? definitions[factor] : pm.mul(definition, definitions[factor]!);
|
|
137
|
+
p.set(index === 0 ? definitions.get(factor) : pm.mul(p.get(), definitions.get(factor)));
|
|
156
138
|
}
|
|
157
|
-
|
|
158
|
-
denominators.push(denominator);
|
|
159
|
-
continue;
|
|
160
|
-
}
|
|
161
|
-
if (lra.hasTerm(lpVar)) {
|
|
139
|
+
} else if (lra.hasTerm(lpVar)) {
|
|
162
140
|
const term = [...lra.getTerm(lpVar).coeffs];
|
|
163
|
-
const
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
);
|
|
167
|
-
let definition: Polynomial | null = null;
|
|
168
|
-
for (const entry of term) {
|
|
141
|
+
for (const entry of term)
|
|
142
|
+
denominator = getLcm(entry[1].div(Rational.of(denominators[entry[0]])).den, denominator);
|
|
143
|
+
for (const [index, entry] of term.entries()) {
|
|
169
144
|
const coeff = entry[1].mul(Rational.of(denominator, denominators[entry[0]]));
|
|
170
|
-
|
|
171
|
-
|
|
145
|
+
constant.set(pm.mkConst(coeff.num));
|
|
146
|
+
product.set(pm.mul(constant.get(), definitions.get(entry[0])));
|
|
147
|
+
p.set(index === 0 ? product.get() : pm.add(p.get(), product.get()));
|
|
148
|
+
product.reset();
|
|
149
|
+
constant.reset();
|
|
172
150
|
}
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
definitions.push(pm.mkVar(variable));
|
|
178
|
-
denominators.push(1n);
|
|
151
|
+
} else p.set(pm.mkVar(variable));
|
|
152
|
+
definitions.push(p.getOrNull() ?? pm.zero);
|
|
153
|
+
denominators.push(denominator);
|
|
154
|
+
p.reset();
|
|
179
155
|
}
|
|
180
156
|
return { definitions, denominators };
|
|
181
157
|
}
|
|
182
158
|
|
|
183
|
-
// add_constraint: the constraint sum(coeff * v) kind rhs as den * (sum(coeff / den[v] * def[v]) -
|
|
184
|
-
// rhs) kind 0, where den clears every denominator, in a unit clause that assumes the constraint.
|
|
185
159
|
private addConstraint(
|
|
186
160
|
constraintIndex: number,
|
|
187
|
-
definitions:
|
|
161
|
+
definitions: PolynomialRefVector,
|
|
188
162
|
denominators: readonly bigint[],
|
|
189
163
|
) {
|
|
190
164
|
const lra = this.core.lra;
|
|
@@ -197,37 +171,65 @@ export class NraSolver {
|
|
|
197
171
|
(result, entry) => getLcm(result, entry[1].div(Rational.of(denominators[entry[0]])).den),
|
|
198
172
|
rhs.den,
|
|
199
173
|
);
|
|
200
|
-
|
|
174
|
+
const p = new PolynomialRef(pm);
|
|
175
|
+
const poly = new PolynomialRef(pm);
|
|
176
|
+
const constant = new PolynomialRef(pm);
|
|
177
|
+
p.set(pm.mkConst(-(rhs.num * denominator) / rhs.den));
|
|
201
178
|
for (const entry of coeffs) {
|
|
202
179
|
const coeff = entry[1].mul(Rational.of(denominator, denominators[entry[0]]));
|
|
203
|
-
|
|
180
|
+
poly.set(definitions.get(entry[0]));
|
|
181
|
+
constant.set(pm.mkConst(coeff.num));
|
|
182
|
+
poly.set(pm.mul(poly.get(), constant.get()));
|
|
183
|
+
constant.reset();
|
|
184
|
+
p.set(pm.add(p.get(), poly.get()));
|
|
185
|
+
poly.reset();
|
|
204
186
|
}
|
|
205
187
|
const kind = constraint.kind;
|
|
206
188
|
const literal =
|
|
207
189
|
kind === KIND_LE
|
|
208
|
-
? solver.mkIneqLiteral("GT", [
|
|
190
|
+
? solver.mkIneqLiteral("GT", [p.get()], [false]) ^ 1
|
|
209
191
|
: kind === KIND_GE
|
|
210
|
-
? solver.mkIneqLiteral("LT", [
|
|
192
|
+
? solver.mkIneqLiteral("LT", [p.get()], [false]) ^ 1
|
|
211
193
|
: solver.mkIneqLiteral(
|
|
212
194
|
kind === KIND_LT ? "LT" : kind === KIND_GT ? "GT" : "EQ",
|
|
213
|
-
[
|
|
195
|
+
[p.get()],
|
|
214
196
|
[false],
|
|
215
197
|
);
|
|
216
198
|
solver.mkExternalClause([literal], constraintIndex);
|
|
199
|
+
p.reset();
|
|
217
200
|
return literal;
|
|
218
201
|
}
|
|
219
202
|
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
203
|
+
private getNlVar(lpVar: number) {
|
|
204
|
+
const variable = this.lp2nl.get(lpVar) ?? this.solver.mkVar(this.core.lra.isInt(lpVar));
|
|
205
|
+
this.lp2nl.set(lpVar, variable);
|
|
206
|
+
return variable;
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
private registerTranscendentals() {
|
|
210
|
+
const transcendentals = this.core.transcendentals;
|
|
211
|
+
const solver = this.solver.transcendentals;
|
|
212
|
+
for (const app of transcendentals.apps)
|
|
213
|
+
solver.add(app.op, this.getNlVar(app.arg), this.getNlVar(app.val));
|
|
214
|
+
for (const app of transcendentals.atan2Apps)
|
|
215
|
+
solver.addAtan2(this.getNlVar(app.y), this.getNlVar(app.x), this.getNlVar(app.val));
|
|
216
|
+
if (transcendentals.piVar !== NULL_LPVAR) solver.addPi(this.getNlVar(transcendentals.piVar));
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
check(maxConflicts: number) {
|
|
220
|
+
try {
|
|
221
|
+
return this.checkCore(maxConflicts);
|
|
222
|
+
} catch (error) {
|
|
223
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
224
|
+
throw error;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
private checkCore(maxConflicts: number) {
|
|
225
229
|
const core = this.core;
|
|
226
230
|
const lra = core.lra;
|
|
227
|
-
this.
|
|
231
|
+
this.reset();
|
|
228
232
|
this.solver.maxConflicts = maxConflicts;
|
|
229
|
-
this.values = [];
|
|
230
|
-
this.lp2nl.clear();
|
|
231
233
|
const cone = getConeOfInfluence(core);
|
|
232
234
|
const definitions = this.mkDefinitions((lpVar) => cone.vars.has(lpVar));
|
|
233
235
|
const skipped = new Set<number>();
|
|
@@ -238,19 +240,13 @@ export class NraSolver {
|
|
|
238
240
|
}
|
|
239
241
|
this.addConstraint(constraintIndex, definitions.definitions, definitions.denominators);
|
|
240
242
|
}
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
} catch (error) {
|
|
245
|
-
if (error instanceof NlsatUnsupportedError) return L_UNDEF;
|
|
246
|
-
throw error;
|
|
247
|
-
}
|
|
248
|
-
})();
|
|
243
|
+
definitions.definitions.reset();
|
|
244
|
+
this.registerTranscendentals();
|
|
245
|
+
const result = this.solver.check();
|
|
249
246
|
if (result === L_TRUE) {
|
|
250
247
|
this.solver.restoreOrder();
|
|
251
248
|
core.setUseNraModel(true);
|
|
252
249
|
lra.initModel();
|
|
253
|
-
// A violated constraint or monomial that nlsat saw would be a bug.
|
|
254
250
|
for (const [constraintIndex, constraint] of lra.constraints.constraints.entries()) {
|
|
255
251
|
if (!constraint.isActive || this.isConstraintSatisfied(constraint)) continue;
|
|
256
252
|
if (cone.constraints.has(constraintIndex) && !skipped.has(constraintIndex))
|
|
@@ -273,8 +269,6 @@ export class NraSolver {
|
|
|
273
269
|
return result;
|
|
274
270
|
}
|
|
275
271
|
|
|
276
|
-
// value: the model's value of a column. A monomial or term gets the value of its definition, a
|
|
277
|
-
// column outside the cone of influence its value in lar_solver.
|
|
278
272
|
value(lpVar: number) {
|
|
279
273
|
const core = this.core;
|
|
280
274
|
const lra = core.lra;
|
|
@@ -308,7 +302,6 @@ export class NraSolver {
|
|
|
308
302
|
return this.values[lpVar];
|
|
309
303
|
}
|
|
310
304
|
|
|
311
|
-
// check_monic
|
|
312
305
|
private isMonicSatisfied(lpVar: number, vars: readonly number[]) {
|
|
313
306
|
const am = this.solver.am;
|
|
314
307
|
const product = vars.reduce(
|
|
@@ -318,7 +311,6 @@ export class NraSolver {
|
|
|
318
311
|
return am.compare(this.value(lpVar), product) === 0;
|
|
319
312
|
}
|
|
320
313
|
|
|
321
|
-
// check_constraint: the value of the left side against the right side, without δ.
|
|
322
314
|
private isConstraintSatisfied(constraint: LarConstraint) {
|
|
323
315
|
const am = this.solver.am;
|
|
324
316
|
const sum = getConstraintCoeffs(this.core.lra, constraint).reduce(
|
|
@@ -338,55 +330,92 @@ export class NraSolver {
|
|
|
338
330
|
: sign === 0;
|
|
339
331
|
}
|
|
340
332
|
|
|
341
|
-
|
|
342
|
-
// constraint each literal came from, or null when nlsat finds no violated constraint.
|
|
343
|
-
private getClause() {
|
|
333
|
+
private setupAssignmentSolver() {
|
|
344
334
|
const core = this.core;
|
|
345
335
|
const lra = core.lra;
|
|
346
|
-
this.
|
|
347
|
-
this.
|
|
336
|
+
this.reset();
|
|
337
|
+
this.literal2constraint.clear();
|
|
338
|
+
this.vars2mon.clear();
|
|
348
339
|
const cone = getConeOfInfluence(core);
|
|
349
340
|
const definitions = this.mkDefinitions(() => true);
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
341
|
+
for (let lpVar = 0; lpVar < lra.columns.length; lpVar++) {
|
|
342
|
+
this.values.push(new Anum(core.val(lpVar)));
|
|
343
|
+
if (core.emons.isMonicVar(lpVar))
|
|
344
|
+
this.vars2mon.set(getSortedVars(core.emons.get(lpVar).vars).join(","), lpVar);
|
|
345
|
+
}
|
|
353
346
|
for (const constraintIndex of cone.constraints) {
|
|
354
347
|
const literal = this.addConstraint(
|
|
355
348
|
constraintIndex,
|
|
356
349
|
definitions.definitions,
|
|
357
350
|
definitions.denominators,
|
|
358
351
|
);
|
|
359
|
-
|
|
352
|
+
this.literal2constraint.set(literal, constraintIndex);
|
|
360
353
|
}
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
return { clause: result.clause, literalConstraints };
|
|
354
|
+
definitions.definitions.reset();
|
|
355
|
+
this.registerTranscendentals();
|
|
364
356
|
}
|
|
365
357
|
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
358
|
+
private processPolynomialCheckAssignment(
|
|
359
|
+
polynomial: Polynomial,
|
|
360
|
+
nl2lp: readonly number[],
|
|
361
|
+
term: LarTerm,
|
|
362
|
+
) {
|
|
363
|
+
let bound = Rational.zero;
|
|
364
|
+
for (let index = 0; index < polynomial.size; index++) {
|
|
365
|
+
const monomial = polynomial.ms[index];
|
|
366
|
+
const coeff = Rational.of(polynomial.as[index]);
|
|
367
|
+
// Like Z3, this drops degrees: only an axiom's ¬best can be nonlinear, and ¬cell is valid alone.
|
|
368
|
+
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
369
|
+
else if (monomial.size === 1) term.addMonomial(coeff, nl2lp[monomial.vars[0]]);
|
|
370
|
+
else {
|
|
371
|
+
const vars = getSortedVars(monomial.vars.map((variable) => nl2lp[variable]));
|
|
372
|
+
term.addMonomial(coeff, this.vars2mon.get(vars.join(",")) ?? this.core.addMulDef(vars));
|
|
374
373
|
}
|
|
375
|
-
}
|
|
376
|
-
|
|
377
|
-
|
|
374
|
+
}
|
|
375
|
+
return bound;
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
private reverseLp2nl() {
|
|
379
|
+
const nl2lp: number[] = [];
|
|
380
|
+
for (const entry of this.lp2nl) nl2lp[entry[1]] = entry[0];
|
|
381
|
+
return nl2lp;
|
|
382
|
+
}
|
|
383
|
+
|
|
384
|
+
checkAssignment() {
|
|
385
|
+
try {
|
|
386
|
+
return this.checkAssignmentCore();
|
|
387
|
+
} catch (error) {
|
|
388
|
+
if (error instanceof SmtCanceledError && this.core.nraLimit.isExhausted()) return L_UNDEF;
|
|
389
|
+
throw error;
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
private checkAssignmentCore() {
|
|
394
|
+
const core = this.core;
|
|
395
|
+
const lra = core.lra;
|
|
396
|
+
this.setupAssignmentSolver();
|
|
397
|
+
const result = this.solver.checkAssignment(this.values);
|
|
398
|
+
if (result.result === L_TRUE) {
|
|
399
|
+
core.setUseNraModel(true);
|
|
400
|
+
lra.initModel();
|
|
401
|
+
for (const constraint of lra.constraints.constraints)
|
|
402
|
+
if (constraint.isActive && !this.isConstraintSatisfied(constraint)) return L_UNDEF;
|
|
403
|
+
for (const monic of core.emons.monics)
|
|
404
|
+
if (!this.isMonicSatisfied(monic.variable, monic.vars)) return L_UNDEF;
|
|
405
|
+
core.setUseNraModel(true);
|
|
406
|
+
}
|
|
407
|
+
if (result.result === L_FALSE) return this.addLemma(result.clause);
|
|
408
|
+
return result.result;
|
|
378
409
|
}
|
|
379
410
|
|
|
380
|
-
|
|
381
|
-
// explanation, and any other literal an inequality over the columns. Unknown, without the lemma,
|
|
382
|
-
// when such an inequality already holds.
|
|
383
|
-
private addLemma(clause: number[], literalConstraints: ReadonlyMap<number, number>) {
|
|
411
|
+
private addLemma(clause: readonly number[]) {
|
|
384
412
|
const core = this.core;
|
|
385
413
|
const solver = this.solver;
|
|
386
|
-
const
|
|
414
|
+
const nl2lp = this.reverseLp2nl();
|
|
415
|
+
let result = L_FALSE;
|
|
387
416
|
const lemma = new LemmaBuilder(core);
|
|
388
417
|
for (const literal of clause) {
|
|
389
|
-
const constraintIndex =
|
|
418
|
+
const constraintIndex = this.literal2constraint.get(literal ^ 1);
|
|
390
419
|
if (constraintIndex !== undefined) {
|
|
391
420
|
const explanation = new Explanation();
|
|
392
421
|
explanation.push(constraintIndex);
|
|
@@ -395,25 +424,12 @@ export class NraSolver {
|
|
|
395
424
|
}
|
|
396
425
|
const atom = solver.getAtom(literal);
|
|
397
426
|
if (atom === null) throw new SmtInvariantError(`nlsat literal ${literal} has no atom`);
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
atom.polynomials.length !== 1 ||
|
|
402
|
-
pm.totalDegree(atom.polynomials[0]) > 1
|
|
403
|
-
) {
|
|
404
|
-
core.lemmas.pop();
|
|
405
|
-
return L_UNDEF;
|
|
427
|
+
if (!isIneqAtom(atom) || atom.polynomials.length !== 1) {
|
|
428
|
+
result = L_UNDEF;
|
|
429
|
+
break;
|
|
406
430
|
}
|
|
407
|
-
// process_polynomial_check_assignment, for a linear polynomial.
|
|
408
|
-
const polynomial = atom.polynomials[0];
|
|
409
431
|
const term = new LarTerm();
|
|
410
|
-
|
|
411
|
-
for (let index = 0; index < polynomial.size; index++) {
|
|
412
|
-
const monomial = polynomial.ms[index];
|
|
413
|
-
const coeff = Rational.of(polynomial.as[index]);
|
|
414
|
-
if (monomial.size === 0) bound = bound.sub(coeff);
|
|
415
|
-
else term.addMonomial(coeff, monomial.vars[0]);
|
|
416
|
-
}
|
|
432
|
+
const bound = this.processPolynomialCheckAssignment(atom.polynomials[0], nl2lp, term);
|
|
417
433
|
const isNegated = (literal & 1) === 1;
|
|
418
434
|
const kind =
|
|
419
435
|
atom.kind === "EQ"
|
|
@@ -429,12 +445,13 @@ export class NraSolver {
|
|
|
429
445
|
: KIND_GT;
|
|
430
446
|
const ineq = mkIneq(term, kind, bound);
|
|
431
447
|
if (core.ineqHolds(ineq)) {
|
|
432
|
-
|
|
433
|
-
|
|
448
|
+
result = L_UNDEF;
|
|
449
|
+
break;
|
|
434
450
|
}
|
|
435
451
|
lemma.addIneq(ineq);
|
|
436
452
|
}
|
|
437
|
-
core.isCheckFeasible = true;
|
|
438
|
-
|
|
453
|
+
if (result === L_FALSE) core.isCheckFeasible = true;
|
|
454
|
+
if (result === L_UNDEF) core.lemmas.pop();
|
|
455
|
+
return result;
|
|
439
456
|
}
|
|
440
457
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/lp/numeric_pair.h), MIT license, see z3-license.txt. The value x + δy
|
|
2
|
-
// of a column, where δ is a positive infinitesimal that encodes strict bounds.
|
|
3
1
|
import { Rational } from "../rational";
|
|
4
2
|
|
|
5
3
|
export class Impq {
|
|
@@ -30,7 +28,6 @@ export class Impq {
|
|
|
30
28
|
return new Impq(this.x.neg(), this.y.neg());
|
|
31
29
|
}
|
|
32
30
|
|
|
33
|
-
// Lexicographic, as δ is smaller than any positive rational.
|
|
34
31
|
compare(other: Impq) {
|
|
35
32
|
const byX = this.x.compare(other.x);
|
|
36
33
|
return byX !== 0 ? byX : this.y.compare(other.y);
|
|
@@ -48,7 +45,6 @@ export class Impq {
|
|
|
48
45
|
return this.y.isZero() && this.x.isInt();
|
|
49
46
|
}
|
|
50
47
|
|
|
51
|
-
// floor and ceil of numeric_pair: x + δy rounded, for a positive δ smaller than any gap.
|
|
52
48
|
floor() {
|
|
53
49
|
if (!this.x.isInt()) return this.x.floor();
|
|
54
50
|
return this.y.isNegative() ? this.x.sub(Rational.one) : this.x;
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
// Ported from Z3 (src/math/dd/pdd_interval.h), MIT license, see z3-license.txt. The interval of a
|
|
2
|
-
// pdd under the intervals of its variables, as x*hi + lo by interval arithmetic. The distributed
|
|
3
|
-
// variant, which nla does not call, is not ported.
|
|
4
1
|
import {
|
|
5
2
|
add,
|
|
6
3
|
type DepInterval,
|
|
@@ -22,8 +19,12 @@ export const getPddInterval = (
|
|
|
22
19
|
return result;
|
|
23
20
|
}
|
|
24
21
|
const varInterval = getVarInterval(poly.var(), mode);
|
|
25
|
-
const
|
|
26
|
-
const
|
|
22
|
+
const hiPoly = poly.hi();
|
|
23
|
+
const hi = getPddInterval(hiPoly, mode, getVarInterval);
|
|
24
|
+
hiPoly.release();
|
|
25
|
+
const loPoly = poly.lo();
|
|
26
|
+
const lo = getPddInterval(loPoly, mode, getVarInterval);
|
|
27
|
+
loPoly.release();
|
|
27
28
|
const product = mkDepInterval();
|
|
28
29
|
mul(hi, varInterval, product, mode);
|
|
29
30
|
add(product, lo, result, mode);
|