tla-ts 0.0.10-dev.28c823e4b → 0.0.10-dev.37a75eb5b
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 +2 -1
- 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 +4 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove.cjs +2683 -427
- package/dist/prove.js +2681 -425
- package/dist/run.cjs +43 -42
- package/dist/run.js +45 -44
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +43 -40
- package/dist/transfer.js +42 -39
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +1 -1
- package/src/ast.ts +41 -36
- package/src/bags.ts +47 -28
- package/src/builtins.ts +4 -13
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +268 -0
- package/src/check.ts +476 -590
- package/src/cli/options.ts +6 -31
- package/src/cli/runtime-invariants.ts +20 -56
- package/src/cli/shared.ts +1 -1
- package/src/cli/tlapm.ts +433 -70
- package/src/cli/tlc-arguments.ts +224 -212
- package/src/cli/tlc-output.ts +686 -0
- package/src/cli/tlc-usage.ts +1 -2
- package/src/cli/tlc.ts +60 -708
- package/src/cli/xml-exporter.ts +23 -33
- package/src/codegen.ts +5 -10
- package/src/coverage.ts +3 -10
- package/src/dependencies.ts +30 -14
- package/src/dfid.ts +25 -18
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +73 -338
- package/src/errors.ts +33 -5
- package/src/evaluate.ts +14 -7
- package/src/exit-codes.ts +3 -0
- package/src/fingerprints.ts +65 -1
- package/src/instances.ts +47 -10
- package/src/java-hash.ts +7 -0
- package/src/json.ts +4 -7
- package/src/levels.ts +42 -44
- package/src/lexer.ts +5 -3
- package/src/liveness-checker.ts +597 -240
- package/src/liveness.ts +94 -86
- package/src/obligations/action.ts +14 -17
- package/src/obligations/anonymize.ts +37 -16
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +36 -8
- package/src/obligations/format.ts +0 -2
- package/src/obligations/generate.ts +66 -54
- package/src/obligations/index.ts +38 -8
- package/src/obligations/levels.ts +24 -11
- package/src/obligations/module.ts +28 -41
- package/src/obligations/normalize.ts +26 -14
- package/src/obligations/operators.ts +0 -2
- package/src/obligations/pragma.ts +53 -16
- package/src/obligations/printer.ts +43 -13
- package/src/obligations/proof.ts +3 -2
- package/src/obligations/regroup.ts +0 -2
- package/src/obligations/simplify.ts +55 -50
- package/src/obligations/source.ts +118 -74
- package/src/obligations/subexpression.ts +45 -18
- package/src/obligations/substitution.ts +1 -3
- package/src/obligations/temporal.ts +5 -7
- package/src/obligations/tuples.ts +0 -2
- package/src/parallel-worker.ts +17 -31
- package/src/parallel.ts +29 -47
- package/src/parser.ts +652 -220
- package/src/pretty-print.ts +1 -1
- package/src/prover/decide-pool.ts +3 -3
- package/src/prover/deciders.ts +12 -9
- package/src/prover/isabelle/decide.ts +3 -25
- package/src/prover/isabelle/encode.ts +72 -42
- 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 +158 -7
- package/src/prover/isabelle/isar/method.ts +509 -212
- package/src/prover/isabelle/isar/proof.ts +570 -14
- package/src/prover/isabelle/isar/rule-cases.ts +224 -0
- package/src/prover/isabelle/isar/theory.ts +487 -76
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +89 -14
- package/src/prover/isabelle/provers/blast/blast.ts +7 -65
- package/src/prover/isabelle/provers/blast/branch.ts +0 -2
- package/src/prover/isabelle/provers/blast/prove.ts +0 -2
- package/src/prover/isabelle/provers/blast/rules.ts +0 -2
- package/src/prover/isabelle/provers/blast/state.ts +0 -2
- package/src/prover/isabelle/provers/blast/term.ts +0 -2
- package/src/prover/isabelle/provers/clasimp.ts +0 -2
- package/src/prover/isabelle/provers/classical.ts +45 -20
- package/src/prover/isabelle/provers/hypsubst.ts +17 -28
- package/src/prover/isabelle/pure/bicompose.ts +9 -27
- package/src/prover/isabelle/pure/consts.ts +0 -2
- package/src/prover/isabelle/pure/conv.ts +2 -10
- package/src/prover/isabelle/pure/drule.ts +72 -6
- package/src/prover/isabelle/pure/envir.ts +0 -2
- package/src/prover/isabelle/pure/goal.ts +1 -3
- package/src/prover/isabelle/pure/logic.ts +1 -3
- package/src/prover/isabelle/pure/name.ts +0 -2
- package/src/prover/isabelle/pure/net.ts +0 -2
- package/src/prover/isabelle/pure/object-logic.ts +13 -7
- package/src/prover/isabelle/pure/pattern.ts +0 -2
- package/src/prover/isabelle/pure/raw-simplifier.ts +4 -15
- package/src/prover/isabelle/pure/rewriter.ts +6 -17
- package/src/prover/isabelle/pure/search.ts +0 -2
- package/src/prover/isabelle/pure/seq.ts +0 -2
- package/src/prover/isabelle/pure/simplifier.ts +26 -7
- package/src/prover/isabelle/pure/table.ts +2 -3
- package/src/prover/isabelle/pure/tactic.ts +0 -2
- package/src/prover/isabelle/pure/tactical.ts +42 -37
- package/src/prover/isabelle/pure/term-ord.ts +0 -2
- package/src/prover/isabelle/pure/term.ts +0 -2
- package/src/prover/isabelle/pure/thm.ts +14 -13
- package/src/prover/isabelle/pure/type.ts +0 -2
- package/src/prover/isabelle/pure/unify.ts +0 -2
- package/src/prover/isabelle/pure/variable.ts +0 -2
- package/src/prover/isabelle/tla/classical-setup.ts +18 -16
- package/src/prover/isabelle/tla/context.ts +58 -11
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +49 -21
- package/src/prover/isabelle/tla/simpdata.ts +1 -12
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -12
- package/src/prover/ocaml.ts +4 -1
- package/src/prover/prep/action.ts +30 -31
- package/src/prover/prep/enabled-axioms.ts +11 -2
- package/src/prover/prep/fingerprint.ts +2 -5
- package/src/prover/prep/methods.ts +181 -51
- package/src/prover/prep/normalize.ts +38 -9
- package/src/prover/prove.ts +395 -94
- package/src/prover/ptl/decide.ts +95 -50
- package/src/prover/ptl/encode.ts +2 -3
- package/src/prover/ptl/tableau.ts +28 -2
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -8
- package/src/prover/smt/context.ts +43 -8
- package/src/prover/smt/data.ts +498 -379
- package/src/prover/smt/encode.ts +148 -57
- package/src/prover/smt/extensionality.ts +5 -3
- package/src/prover/smt/flatten.ts +4 -6
- package/src/prover/smt/format.ts +28 -4
- package/src/prover/smt/instances.ts +7 -1
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -618
- 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 -1
- 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 +613 -6
- 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 +309 -0
- package/src/prover/smt/solver/asserted-formulas.ts +93 -15
- package/src/prover/smt/solver/ast-lt.ts +166 -12
- package/src/prover/smt/solver/ast-util.ts +160 -2
- package/src/prover/smt/solver/ast.ts +1427 -41
- package/src/prover/smt/solver/auf-solver.ts +2 -6
- package/src/prover/smt/solver/bit-blast-tactic.ts +582 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +600 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +338 -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 +110 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -2
- package/src/prover/smt/solver/cg-table.ts +39 -25
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -1
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -2
- package/src/prover/smt/solver/context.ts +536 -117
- package/src/prover/smt/solver/ctx-simplify.ts +20 -10
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +572 -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 +81 -0
- package/src/prover/smt/solver/der.ts +38 -10
- package/src/prover/smt/solver/diff-neq.ts +206 -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 +260 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -1
- package/src/prover/smt/solver/e-matching.ts +7 -8
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +545 -0
- package/src/prover/smt/solver/enode.ts +100 -3
- 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 +907 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1205 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1050 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +830 -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 +335 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -1
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -2
- 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 +267 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -15
- package/src/prover/smt/solver/fix-dl-var.ts +148 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -1
- 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 +348 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +177 -15
- 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 -1
- package/src/prover/smt/solver/hashtable.ts +30 -16
- 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 +110 -38
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -1
- 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 -1
- package/src/prover/smt/solver/logic-tactics.ts +345 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +0 -1
- package/src/prover/smt/solver/lp/constraints.ts +0 -1
- package/src/prover/smt/solver/lp/containers.ts +7 -2
- package/src/prover/smt/solver/lp/core-solver.ts +18 -3
- package/src/prover/smt/solver/lp/cross-nested.ts +1 -4
- package/src/prover/smt/solver/lp/dep-intervals.ts +0 -3
- package/src/prover/smt/solver/lp/dependency.ts +0 -2
- package/src/prover/smt/solver/lp/dioph-eq.ts +1 -10
- package/src/prover/smt/solver/lp/explanation.ts +0 -1
- package/src/prover/smt/solver/lp/gomory.ts +0 -1
- package/src/prover/smt/solver/lp/hnf-cutter.ts +1 -2
- package/src/prover/smt/solver/lp/hnf.ts +0 -3
- package/src/prover/smt/solver/lp/int-cube.ts +3 -4
- package/src/prover/smt/solver/lp/int-solver.ts +0 -2
- package/src/prover/smt/solver/lp/lar-solver.ts +40 -4
- package/src/prover/smt/solver/lp/lar-term.ts +0 -1
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -1
- package/src/prover/smt/solver/lp/maximize-term.ts +59 -10
- package/src/prover/smt/solver/lp/nex-creator.ts +3 -3
- package/src/prover/smt/solver/lp/nex.ts +2 -2
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -2
- package/src/prover/smt/solver/lp/nla-basics.ts +46 -3
- package/src/prover/smt/solver/lp/nla-core.ts +68 -17
- package/src/prover/smt/solver/lp/nla-divisions.ts +0 -2
- package/src/prover/smt/solver/lp/nla-emonics.ts +0 -1
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -1
- package/src/prover/smt/solver/lp/nla-grobner.ts +165 -83
- package/src/prover/smt/solver/lp/nla-horner.ts +0 -2
- package/src/prover/smt/solver/lp/nla-intervals.ts +0 -1
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +0 -2
- package/src/prover/smt/solver/lp/nla-monotone.ts +0 -1
- package/src/prover/smt/solver/lp/nla-order.ts +0 -2
- package/src/prover/smt/solver/lp/nla-patcher.ts +0 -1
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -2
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -1
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -2
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +0 -1
- package/src/prover/smt/solver/lp/nra-solver.ts +163 -99
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -1
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +60 -21
- package/src/prover/smt/solver/lp/pdd-solver.ts +72 -41
- package/src/prover/smt/solver/lp/pdd.ts +725 -289
- package/src/prover/smt/solver/lp/random-updater.ts +0 -2
- package/src/prover/smt/solver/lp/static-matrix.ts +0 -1
- package/src/prover/smt/solver/lp/union-find.ts +7 -2
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +122 -90
- package/src/prover/smt/solver/mam-interpreter.ts +0 -1
- 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 +309 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -6
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +105 -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 +18 -27
- package/src/prover/smt/solver/model-evaluator.ts +188 -12
- package/src/prover/smt/solver/model-finder.ts +12 -18
- package/src/prover/smt/solver/model-generator.ts +56 -29
- package/src/prover/smt/solver/model-macro-solver.ts +49 -46
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +410 -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 +496 -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 +201 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +337 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1407 -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 +315 -97
- package/src/prover/smt/solver/nlsat/atoms.ts +71 -38
- package/src/prover/smt/solver/nlsat/evaluator.ts +0 -1
- package/src/prover/smt/solver/nlsat/explain.ts +427 -229
- package/src/prover/smt/solver/nlsat/interval-set.ts +1 -2
- package/src/prover/smt/solver/nlsat/levelwise.ts +464 -246
- package/src/prover/smt/solver/nlsat/mpbq.ts +45 -1
- package/src/prover/smt/solver/nlsat/polynomial.ts +2410 -683
- package/src/prover/smt/solver/nlsat/solver.ts +293 -92
- 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 -2
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -8
- package/src/prover/smt/solver/nlsat/upolynomial.ts +40 -19
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +105 -23
- 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 +792 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +282 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +311 -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 +19 -11
- package/src/prover/smt/solver/pb-rewriter.ts +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +202 -57
- package/src/prover/smt/solver/probes.ts +512 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -21
- package/src/prover/smt/solver/proto-model.ts +648 -19
- package/src/prover/smt/solver/pull-quant.ts +28 -12
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1098 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -3
- package/src/prover/smt/solver/qe-lite-fm.ts +3 -4
- package/src/prover/smt/solver/qe-lite.ts +37 -17
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1498 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -1
- package/src/prover/smt/solver/qsat.ts +814 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +16 -56
- package/src/prover/smt/solver/quantifier-analyzer.ts +19 -20
- package/src/prover/smt/solver/quantifier-manager.ts +22 -25
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -1
- package/src/prover/smt/solver/rational.ts +45 -1
- package/src/prover/smt/solver/recfun-decl-plugin.ts +261 -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 -1
- package/src/prover/smt/solver/relevancy.ts +1 -2
- package/src/prover/smt/solver/rewriter-tpl.ts +77 -10
- package/src/prover/smt/solver/rewriter.ts +475 -36
- package/src/prover/smt/solver/rlimit.ts +38 -2
- 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 +526 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +378 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +261 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1577 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +44 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +165 -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 +2127 -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 +1010 -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 +728 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1170 -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 +2402 -0
- package/src/prover/smt/solver/seq-skolem.ts +317 -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 +90 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +496 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3126 -316
- package/src/prover/smt/solver/smtlib-script.ts +1704 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +113 -22
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -1
- package/src/prover/smt/solver/tactic.ts +1995 -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 +1200 -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 +53 -2
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -6
- package/src/prover/smt/solver/theory-lra-final-check.ts +56 -70
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -27
- package/src/prover/smt/solver/theory-lra-model.ts +20 -35
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -26
- package/src/prover/smt/solver/theory-lra-state.ts +6 -22
- package/src/prover/smt/solver/theory-lra.ts +188 -1
- package/src/prover/smt/solver/theory-pb.ts +934 -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 +871 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +485 -0
- package/src/prover/smt/solver/var-subst.ts +36 -14
- package/src/prover/smt/table.ts +3 -2
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +50 -19
- package/src/prover/tlapm/tlapm.ts +15 -9
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -0
- package/src/prover/zenon/check/check.ts +1 -2
- package/src/prover/zenon/check/records.ts +1 -1
- package/src/prover/zenon/check/relations.ts +2 -1
- package/src/prover/zenon/check/rewrites.ts +2 -15
- package/src/prover/zenon/check/sets.ts +40 -58
- package/src/prover/zenon/check/terms.ts +1 -2
- package/src/prover/zenon/decide.ts +10 -7
- package/src/prover/zenon/encode.ts +0 -2
- package/src/prover/zenon/eqrel.ts +2 -2
- package/src/prover/zenon/equality-rules.ts +24 -2
- package/src/prover/zenon/expr.ts +28 -2
- package/src/prover/zenon/index-table.ts +11 -21
- package/src/prover/zenon/isar-case.ts +0 -2
- package/src/prover/zenon/isar.ts +35 -37
- package/src/prover/zenon/llproof.ts +2 -13
- package/src/prover/zenon/mltoll.ts +12 -30
- package/src/prover/zenon/node.ts +20 -5
- package/src/prover/zenon/parse.ts +9 -8
- package/src/prover/zenon/phrase.ts +0 -2
- package/src/prover/zenon/proof.ts +0 -2
- package/src/prover/zenon/propositional-rules.ts +0 -2
- package/src/prover/zenon/rules.ts +2 -3
- package/src/prover/zenon/search.ts +11 -19
- package/src/prover/zenon/tla/functions.ts +2 -4
- package/src/prover/zenon/tla/llproof.ts +9 -13
- package/src/prover/zenon/tla/records.ts +1 -8
- package/src/prover/zenon/tla/rewrites.ts +0 -2
- package/src/prover/zenon/tla/sets.ts +22 -22
- package/src/prover/zenon/tla/terms.ts +0 -2
- package/src/prover/zenon/tla/tla.ts +7 -8
- package/src/resolve.ts +127 -108
- package/src/runtime.ts +6 -0
- package/src/sany/generation.ts +382 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1092 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +155 -2625
- package/src/sany/levels.ts +0 -2
- package/src/sany/lexer.ts +17 -16
- package/src/sany/linter.ts +0 -2
- package/src/sany/nodes.ts +6 -13
- package/src/sany/report.ts +3 -6
- package/src/sany/selectors.ts +35 -38
- package/src/sany/xml.ts +23 -55
- package/src/search.ts +243 -52
- package/src/simulate.ts +160 -133
- package/src/spec-description.ts +33 -48
- package/src/standard-definitions.ts +4 -0
- package/src/standard-modules.ts +16 -32
- package/src/state-graph.ts +2 -9
- package/src/subexpressions.ts +3 -1
- package/src/substitution-levels.ts +5 -4
- package/src/successors.ts +6 -8
- package/src/symmetry.ts +2 -2
- package/src/tableau.ts +2 -2
- package/src/tlc/fingerprint.ts +81 -9
- package/src/tlc/jar-data.ts +12 -0
- package/src/tlc/messages.ts +20 -15
- package/src/tlc/order.ts +16 -12
- package/src/tlc/random.ts +4 -4
- package/src/tlc/replay.ts +8 -15
- package/src/tlc/summary.ts +29 -14
- package/src/tlc/tlc-operators.ts +2 -3
- package/src/tlc/tlcext-operators.ts +61 -16
- package/src/tlc/trace-spec.ts +26 -47
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +2 -4
- package/src/typescript/collections.ts +34 -20
- package/src/typescript/compile.ts +1 -3
- package/src/typescript/formula.ts +5 -3
- package/src/typescript/model.ts +4 -5
- package/src/typescript/steps.ts +20 -18
- package/src/values.ts +63 -158
- package/src/prover/isabelle/isar/statement.ts +0 -52
- 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,6 +1,7 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
|
|
1
|
+
// Of Z3's nlsat parameters only seed and factor are ported, so nlsat_simplify and the bounds of
|
|
2
|
+
// eliminated variables are not. The search counts its steps against the resource limit, but not the
|
|
3
|
+
// memory, which Z3 also bounds by max_memory.
|
|
4
|
+
import { SmtInvariantError } from "../../../../errors";
|
|
4
5
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
5
6
|
import { type Dependency, linearize, mkJoin, mkLeaf } from "../lp/dependency";
|
|
6
7
|
import { RandomGen } from "../random-gen";
|
|
@@ -10,9 +11,16 @@ import { AlgebraicManager, Anum } from "./algebraic";
|
|
|
10
11
|
import { AtomTable, FALSE_LITERAL, ScopedLiterals, TRUE_LITERAL } from "./atoms";
|
|
11
12
|
import { Evaluator } from "./evaluator";
|
|
12
13
|
import { Explain } from "./explain";
|
|
13
|
-
import type { IntervalSet } from "./interval-set";
|
|
14
|
-
import {
|
|
15
|
-
|
|
14
|
+
import type { IntervalSet, IntervalSetManager } from "./interval-set";
|
|
15
|
+
import {
|
|
16
|
+
NULL_VAR,
|
|
17
|
+
type Polynomial,
|
|
18
|
+
PolynomialCache,
|
|
19
|
+
PolynomialManager,
|
|
20
|
+
PolynomialRef,
|
|
21
|
+
} from "./polynomial";
|
|
22
|
+
import { NlsatTranscendentals } from "./transcendentals";
|
|
23
|
+
import { type Clause, type IneqAtom, type IneqKind, isIneqAtom, type RootKind } from "./types";
|
|
16
24
|
|
|
17
25
|
const NULL_BOOL_VAR = Infinity;
|
|
18
26
|
|
|
@@ -33,30 +41,18 @@ type Trail =
|
|
|
33
41
|
| { kind: "eq"; old: IneqAtom | null };
|
|
34
42
|
|
|
35
43
|
export class NlsatSolver {
|
|
36
|
-
readonly pm
|
|
37
|
-
readonly am
|
|
38
|
-
private cache
|
|
44
|
+
readonly pm: PolynomialManager;
|
|
45
|
+
readonly am: AlgebraicManager;
|
|
46
|
+
private cache: PolynomialCache;
|
|
39
47
|
private bvalues: number[] = [];
|
|
40
48
|
private levels: number[] = [];
|
|
41
49
|
private justifications: (Justification | null)[] = [];
|
|
42
50
|
private bwatches: Clause[][] = [];
|
|
43
51
|
private isDead: boolean[] = [];
|
|
44
|
-
|
|
45
|
-
onMk: (boolVar) => {
|
|
46
|
-
this.bvalues[boolVar] = L_UNDEF;
|
|
47
|
-
this.levels[boolVar] = Infinity;
|
|
48
|
-
this.justifications[boolVar] = null;
|
|
49
|
-
this.bwatches[boolVar] = [];
|
|
50
|
-
this.isDead[boolVar] = false;
|
|
51
|
-
},
|
|
52
|
-
onDelete: (boolVar) => {
|
|
53
|
-
this.isDead[boolVar] = true;
|
|
54
|
-
this.bvalues[boolVar] = L_UNDEF;
|
|
55
|
-
},
|
|
56
|
-
});
|
|
52
|
+
readonly atoms: AtomTable;
|
|
57
53
|
private assignment: (Anum | undefined)[] = [];
|
|
58
|
-
private evaluator
|
|
59
|
-
private ism
|
|
54
|
+
private evaluator: Evaluator;
|
|
55
|
+
private ism: IntervalSetManager;
|
|
60
56
|
private clauses: Clause[] = [];
|
|
61
57
|
private learned: Clause[] = [];
|
|
62
58
|
private nextClauseId = 0;
|
|
@@ -66,24 +62,23 @@ export class NlsatSolver {
|
|
|
66
62
|
private var2eq: (IneqAtom | null)[] = [];
|
|
67
63
|
private perm: number[] = [];
|
|
68
64
|
private invPerm: number[] = [];
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
sample: this.assignment,
|
|
72
|
-
getValue: (literal) => this.value(literal),
|
|
73
|
-
var2eq: this.var2eq,
|
|
74
|
-
});
|
|
65
|
+
readonly explain: Explain;
|
|
66
|
+
readonly transcendentals: NlsatTranscendentals;
|
|
75
67
|
private bk = 0;
|
|
76
68
|
private xk = NULL_VAR;
|
|
77
69
|
private scopeLevel = 0;
|
|
78
70
|
private trail: Trail[] = [];
|
|
79
71
|
private marks: boolean[] = [];
|
|
80
72
|
private markCount = 0;
|
|
81
|
-
private lemma
|
|
82
|
-
private lazyClause
|
|
73
|
+
private lemma: ScopedLiterals;
|
|
74
|
+
private lazyClause: ScopedLiterals;
|
|
83
75
|
private lemmaAssumptions: Dependency = null;
|
|
84
76
|
private randomSeed = 0;
|
|
85
77
|
private isReordered = false;
|
|
78
|
+
private maxVar = NULL_VAR;
|
|
79
|
+
private nextTag = 0;
|
|
86
80
|
maxConflicts = Infinity;
|
|
81
|
+
isReordering = true;
|
|
87
82
|
readonly stats = {
|
|
88
83
|
conflicts: 0,
|
|
89
84
|
restarts: 0,
|
|
@@ -93,19 +88,44 @@ export class NlsatSolver {
|
|
|
93
88
|
irrationalAssignments: 0,
|
|
94
89
|
};
|
|
95
90
|
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
91
|
+
constructor(private limit: ResourceLimit) {
|
|
92
|
+
this.pm = new PolynomialManager(limit);
|
|
93
|
+
this.am = new AlgebraicManager(limit);
|
|
94
|
+
this.cache = new PolynomialCache(this.pm);
|
|
95
|
+
this.atoms = new AtomTable(this.pm, this.cache, {
|
|
96
|
+
onMk: (boolVar) => {
|
|
97
|
+
this.bvalues[boolVar] = L_UNDEF;
|
|
98
|
+
this.levels[boolVar] = Infinity;
|
|
99
|
+
this.justifications[boolVar] = null;
|
|
100
|
+
this.bwatches[boolVar] = [];
|
|
101
|
+
this.isDead[boolVar] = false;
|
|
102
|
+
},
|
|
103
|
+
onDelete: (boolVar) => {
|
|
104
|
+
this.isDead[boolVar] = true;
|
|
105
|
+
this.bvalues[boolVar] = L_UNDEF;
|
|
106
|
+
},
|
|
107
|
+
});
|
|
108
|
+
this.evaluator = new Evaluator(this.pm, this.am, this.assignment);
|
|
109
|
+
this.ism = this.evaluator.ism;
|
|
110
|
+
this.explain = new Explain(this.pm, this.am, this.cache, {
|
|
111
|
+
atoms: this.atoms,
|
|
112
|
+
sample: this.assignment,
|
|
113
|
+
getValue: (literal) => this.value(literal),
|
|
114
|
+
var2eq: this.var2eq,
|
|
115
|
+
getNumVars: () => this.isInt.length,
|
|
116
|
+
reorder: (permutation) => this.reorder(permutation),
|
|
117
|
+
restoreOrder: () => this.restoreOrder(),
|
|
118
|
+
});
|
|
119
|
+
this.transcendentals = new NlsatTranscendentals(this);
|
|
120
|
+
this.lemma = new ScopedLiterals(this.atoms);
|
|
121
|
+
this.lazyClause = new ScopedLiterals(this.atoms);
|
|
102
122
|
this.mkClause([TRUE_LITERAL], false, null);
|
|
103
123
|
}
|
|
104
124
|
|
|
105
|
-
|
|
106
|
-
this.
|
|
107
|
-
|
|
108
|
-
|
|
125
|
+
updtParams(seed: number, isFactoring: boolean) {
|
|
126
|
+
this.randomSeed = seed;
|
|
127
|
+
this.ism.setSeed(seed);
|
|
128
|
+
this.explain.isFactoring = isFactoring;
|
|
109
129
|
}
|
|
110
130
|
|
|
111
131
|
mkVar(isInt: boolean) {
|
|
@@ -127,6 +147,57 @@ export class NlsatSolver {
|
|
|
127
147
|
return this.atoms.getAtom(literal);
|
|
128
148
|
}
|
|
129
149
|
|
|
150
|
+
mkBoolVar() {
|
|
151
|
+
return this.atoms.mkBoolVar();
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
mkRootAtom(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
155
|
+
return this.atoms.mkRootAtom(kind, variable, index, polynomial);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
getBoolValue(boolVar: number) {
|
|
159
|
+
return this.bvalues[boolVar];
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
vars(literal: number) {
|
|
163
|
+
const atom = this.atoms.getAtom(literal);
|
|
164
|
+
if (atom === null) return [];
|
|
165
|
+
if (isIneqAtom(atom))
|
|
166
|
+
return atom.polynomials.flatMap((polynomial) => this.pm.getVars(polynomial));
|
|
167
|
+
return [...this.pm.getVars(atom.polynomial), atom.maxVar];
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
getRvalues() {
|
|
171
|
+
return this.assignment.map((value) => (value === undefined ? undefined : this.am.copy(value)));
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
setRvalues(values: readonly (Anum | undefined)[]) {
|
|
175
|
+
this.setAssignment(values);
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
getBvalues(boolVars: Iterable<number>) {
|
|
179
|
+
const values: number[] = [];
|
|
180
|
+
for (const boolVar of boolVars) {
|
|
181
|
+
while (values.length <= boolVar) values.push(L_UNDEF);
|
|
182
|
+
if (this.atoms.atoms[boolVar] === null) values[boolVar] = this.bvalues[boolVar];
|
|
183
|
+
}
|
|
184
|
+
return values;
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
setBvalues(values: readonly number[]) {
|
|
188
|
+
for (const [boolVar, value] of values.entries())
|
|
189
|
+
if (value !== L_UNDEF) this.bvalues[boolVar] = value;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
setMaxVar(variable: number) {
|
|
193
|
+
this.maxVar = variable;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
getMaxVarSup() {
|
|
197
|
+
if (this.maxVar === NULL_VAR || this.assignment[this.maxVar] === undefined) return null;
|
|
198
|
+
return this.ism.queryMaxInComplement(this.infeasible[this.maxVar]);
|
|
199
|
+
}
|
|
200
|
+
|
|
130
201
|
mkExternalClause(literals: readonly number[], assumption: number | null) {
|
|
131
202
|
this.mkClause(literals, false, assumption === null ? null : mkLeaf(assumption));
|
|
132
203
|
}
|
|
@@ -139,17 +210,8 @@ export class NlsatSolver {
|
|
|
139
210
|
return linearize([this.lemmaAssumptions]);
|
|
140
211
|
}
|
|
141
212
|
|
|
142
|
-
private getMaxVar(clause: Clause) {
|
|
143
|
-
let result = NULL_VAR;
|
|
144
|
-
for (const literal of clause.literals) {
|
|
145
|
-
const atom = this.atoms.getAtom(literal);
|
|
146
|
-
if (atom !== null && (result === NULL_VAR || atom.maxVar > result)) result = atom.maxVar;
|
|
147
|
-
}
|
|
148
|
-
return result;
|
|
149
|
-
}
|
|
150
|
-
|
|
151
213
|
private getClauseDegree(clause: Clause) {
|
|
152
|
-
if (this.
|
|
214
|
+
if (this.atoms.getMaxVarOfLiterals(clause.literals) === NULL_VAR) return 0;
|
|
153
215
|
let max = 0;
|
|
154
216
|
for (const literal of clause.literals) {
|
|
155
217
|
const atom = this.atoms.getAtom(literal);
|
|
@@ -191,13 +253,13 @@ export class NlsatSolver {
|
|
|
191
253
|
}
|
|
192
254
|
|
|
193
255
|
private addClauseToWatches(clause: Clause) {
|
|
194
|
-
const variable = this.
|
|
256
|
+
const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
|
|
195
257
|
if (variable !== NULL_VAR) this.watches[variable].push(clause);
|
|
196
258
|
else this.bwatches[Math.max(...clause.literals.map((literal) => literal >> 1))].push(clause);
|
|
197
259
|
}
|
|
198
260
|
|
|
199
261
|
private delClause(clause: Clause) {
|
|
200
|
-
const variable = this.
|
|
262
|
+
const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
|
|
201
263
|
const watches =
|
|
202
264
|
variable !== NULL_VAR
|
|
203
265
|
? this.watches[variable]
|
|
@@ -275,7 +337,7 @@ export class NlsatSolver {
|
|
|
275
337
|
this.setLiteralToTrue(literal, DECISION);
|
|
276
338
|
}
|
|
277
339
|
|
|
278
|
-
|
|
340
|
+
value(literal: number) {
|
|
279
341
|
const assigned = this.getAssignedValue(literal);
|
|
280
342
|
if (assigned !== L_UNDEF) return assigned;
|
|
281
343
|
const atom = this.atoms.getAtom(literal);
|
|
@@ -344,10 +406,12 @@ export class NlsatSolver {
|
|
|
344
406
|
let selectedSet: IntervalSet | null = null;
|
|
345
407
|
const xkSet = this.infeasible[this.xk];
|
|
346
408
|
for (const [index, literal] of clause.literals.entries()) {
|
|
347
|
-
this.checkpoint();
|
|
409
|
+
this.limit.checkpoint();
|
|
348
410
|
if (this.value(literal) === L_FALSE) continue;
|
|
349
411
|
if (this.value(literal) === L_TRUE) return true;
|
|
350
|
-
const atom = this.atoms.getAtom(literal)
|
|
412
|
+
const atom = this.atoms.getAtom(literal);
|
|
413
|
+
if (atom === null)
|
|
414
|
+
throw new SmtInvariantError("a literal of an arithmetic clause has no atom");
|
|
351
415
|
const set = this.evaluator.infeasibleIntervals(atom, (literal & 1) === 1, clause);
|
|
352
416
|
if (set === null) {
|
|
353
417
|
this.propagate(literal, null);
|
|
@@ -410,7 +474,10 @@ export class NlsatSolver {
|
|
|
410
474
|
}
|
|
411
475
|
|
|
412
476
|
private selectWitness() {
|
|
413
|
-
const
|
|
477
|
+
const set = this.infeasible[this.xk];
|
|
478
|
+
const witness =
|
|
479
|
+
(this.xk === this.maxVar ? this.ism.pickMaxInComplement(set) : null) ??
|
|
480
|
+
this.ism.pickInComplement(set, true);
|
|
414
481
|
if (!this.am.isRational(witness)) this.stats.irrationalAssignments++;
|
|
415
482
|
this.assignment[this.xk] = witness;
|
|
416
483
|
}
|
|
@@ -427,7 +494,7 @@ export class NlsatSolver {
|
|
|
427
494
|
} else this.newStage();
|
|
428
495
|
if (this.bk === NULL_BOOL_VAR && this.xk >= this.isInt.length) return L_TRUE;
|
|
429
496
|
while (true) {
|
|
430
|
-
this.checkpoint();
|
|
497
|
+
this.limit.checkpoint();
|
|
431
498
|
const conflict = this.processClauses(
|
|
432
499
|
this.xk === NULL_VAR ? this.bwatches[this.bk] : this.watches[this.xk],
|
|
433
500
|
);
|
|
@@ -447,7 +514,7 @@ export class NlsatSolver {
|
|
|
447
514
|
private gc() {
|
|
448
515
|
if (this.learned.length <= 4 * this.clauses.length) return;
|
|
449
516
|
this.resetWatches();
|
|
450
|
-
this.atoms.reinitCache();
|
|
517
|
+
this.atoms.reinitCache(this.clauses, this.learned);
|
|
451
518
|
let kept = 0;
|
|
452
519
|
for (const [index, clause] of this.learned.entries()) {
|
|
453
520
|
if (index - kept < this.clauses.length && clause.literals.length > 1 && !clause.isActive)
|
|
@@ -507,15 +574,21 @@ export class NlsatSolver {
|
|
|
507
574
|
}
|
|
508
575
|
bounds.push([variable, lower]);
|
|
509
576
|
}
|
|
510
|
-
if (bounds.length === 0)
|
|
577
|
+
if (bounds.length === 0) {
|
|
578
|
+
if (this.transcendentals.isEmpty || !this.transcendentals.refine()) return result;
|
|
579
|
+
this.initSearch();
|
|
580
|
+
continue;
|
|
581
|
+
}
|
|
511
582
|
this.initSearch();
|
|
512
583
|
for (const bound of bounds) {
|
|
584
|
+
const p = new PolynomialRef(this.pm);
|
|
513
585
|
this.lemma.reset();
|
|
514
|
-
|
|
515
|
-
this.lemma.push(this.mkIneqLiteral("GT", [
|
|
516
|
-
|
|
517
|
-
this.lemma.push(this.mkIneqLiteral("LT", [
|
|
586
|
+
p.set(this.pm.mkLinear([1n], [bound[0]], -bound[1].num));
|
|
587
|
+
this.lemma.push(this.mkIneqLiteral("GT", [p.get()], [false]) ^ 1);
|
|
588
|
+
p.set(this.pm.mkLinear([1n], [bound[0]], -bound[1].num - 1n));
|
|
589
|
+
this.lemma.push(this.mkIneqLiteral("LT", [p.get()], [false]) ^ 1);
|
|
518
590
|
this.mkClause(this.lemma.literals, true, null);
|
|
591
|
+
p.reset();
|
|
519
592
|
}
|
|
520
593
|
}
|
|
521
594
|
}
|
|
@@ -541,6 +614,32 @@ export class NlsatSolver {
|
|
|
541
614
|
return result;
|
|
542
615
|
}
|
|
543
616
|
|
|
617
|
+
// Keeps in assumptions the ones in the core when unsatisfiable, and none otherwise.
|
|
618
|
+
checkAssumptions(assumptions: number[]) {
|
|
619
|
+
const tags = assumptions.map((literal) => {
|
|
620
|
+
const tag = --this.nextTag;
|
|
621
|
+
this.mkExternalClause([literal], tag);
|
|
622
|
+
return tag;
|
|
623
|
+
});
|
|
624
|
+
const result = this.check();
|
|
625
|
+
const core: number[] = [];
|
|
626
|
+
if (result === L_FALSE)
|
|
627
|
+
for (const tag of this.getCore()) {
|
|
628
|
+
const index = tags.indexOf(tag);
|
|
629
|
+
if (index !== -1) core.push(assumptions[index]);
|
|
630
|
+
}
|
|
631
|
+
const isKept = (clause: Clause) => {
|
|
632
|
+
const isFound = linearize([clause.assumptions]).some((tag) => tags.includes(tag));
|
|
633
|
+
if (isFound) this.delClause(clause);
|
|
634
|
+
return !isFound;
|
|
635
|
+
};
|
|
636
|
+
this.clauses = this.clauses.filter(isKept);
|
|
637
|
+
this.learned = this.learned.filter(isKept);
|
|
638
|
+
assumptions.length = 0;
|
|
639
|
+
assumptions.push(...core);
|
|
640
|
+
return result;
|
|
641
|
+
}
|
|
642
|
+
|
|
544
643
|
private isFullDimensional(literal: number) {
|
|
545
644
|
const atom = this.atoms.getAtom(literal);
|
|
546
645
|
if (atom === null) return true;
|
|
@@ -566,6 +665,112 @@ export class NlsatSolver {
|
|
|
566
665
|
for (let index = 0; index < sorted.length; index++) clauses[index] = sorted[index];
|
|
567
666
|
}
|
|
568
667
|
|
|
668
|
+
private projectModel(cube: ScopedLiterals) {
|
|
669
|
+
const seen = new Set<number>();
|
|
670
|
+
for (const clause of this.clauses) {
|
|
671
|
+
this.limit.checkpoint();
|
|
672
|
+
const witness = clause.literals.find((literal) => this.value(literal) === L_TRUE);
|
|
673
|
+
if (witness === undefined) throw new SmtInvariantError("nlsat's model falsifies a clause");
|
|
674
|
+
if (this.atoms.getAtom(witness) === null || seen.has(witness >> 1)) continue;
|
|
675
|
+
seen.add(witness >> 1);
|
|
676
|
+
cube.push(witness);
|
|
677
|
+
}
|
|
678
|
+
// Strict sector bounds keep every point of the projection extensible.
|
|
679
|
+
this.explain.isFullDimensional = false;
|
|
680
|
+
const projected = new ScopedLiterals(this.atoms);
|
|
681
|
+
try {
|
|
682
|
+
for (let variable = this.isInt.length - 1; variable >= 1 && cube.size > 0; variable--) {
|
|
683
|
+
this.limit.checkpoint();
|
|
684
|
+
projected.reset();
|
|
685
|
+
this.explain.projectVariable(variable, cube.literals, projected);
|
|
686
|
+
[cube.literals, projected.literals] = [projected.literals, cube.literals];
|
|
687
|
+
}
|
|
688
|
+
} finally {
|
|
689
|
+
projected.reset();
|
|
690
|
+
}
|
|
691
|
+
}
|
|
692
|
+
|
|
693
|
+
private getCubeSup(cube: ScopedLiterals) {
|
|
694
|
+
let infeasible: IntervalSet | null = null;
|
|
695
|
+
for (const literal of cube.literals) {
|
|
696
|
+
const excluded = this.evaluator.infeasibleIntervals(
|
|
697
|
+
this.atoms.getAtom(literal)!,
|
|
698
|
+
(literal & 1) === 1,
|
|
699
|
+
null,
|
|
700
|
+
);
|
|
701
|
+
infeasible = this.ism.mkUnion(infeasible, excluded);
|
|
702
|
+
}
|
|
703
|
+
if (this.ism.isFull(infeasible))
|
|
704
|
+
throw new SmtInvariantError("nlsat's model projection is inconsistent");
|
|
705
|
+
return this.ism.queryMaxInComplement(infeasible);
|
|
706
|
+
}
|
|
707
|
+
|
|
708
|
+
checkLimit(variable: number, bound: Anum | null) {
|
|
709
|
+
if (variable !== 0 || this.invPerm[0] !== 0)
|
|
710
|
+
throw new SmtInvariantError("nlsat checks the limit of the first variable");
|
|
711
|
+
if (this.isInt.some(Boolean)) return L_UNDEF;
|
|
712
|
+
const limit = bound === null ? null : this.am.copy(bound);
|
|
713
|
+
const savedMaxVar = this.maxVar;
|
|
714
|
+
this.maxVar = variable;
|
|
715
|
+
const tag = --this.nextTag;
|
|
716
|
+
try {
|
|
717
|
+
if (limit !== null) {
|
|
718
|
+
const isRational = this.am.isRational(limit);
|
|
719
|
+
const p = new PolynomialRef(this.pm);
|
|
720
|
+
p.set(this.pm.toPolynomial(this.am.getPolynomial(limit), variable));
|
|
721
|
+
const upper = isRational
|
|
722
|
+
? this.mkIneqLiteral("LT", [p.get()], [false])
|
|
723
|
+
: 2 * this.mkRootAtom("ROOT_LT", variable, this.am.getRootIndex(limit), p.get());
|
|
724
|
+
this.mkExternalClause([upper], tag);
|
|
725
|
+
p.reset();
|
|
726
|
+
}
|
|
727
|
+
while (true) {
|
|
728
|
+
this.limit.checkpoint();
|
|
729
|
+
const status = this.check();
|
|
730
|
+
if (status !== L_TRUE) return status;
|
|
731
|
+
const cube = new ScopedLiterals(this.atoms);
|
|
732
|
+
try {
|
|
733
|
+
this.projectModel(cube);
|
|
734
|
+
const sup = this.getCubeSup(cube);
|
|
735
|
+
if (
|
|
736
|
+
limit === null
|
|
737
|
+
? sup === null
|
|
738
|
+
: sup !== null && !sup.isAttained && this.am.compare(sup.sup, limit) === 0
|
|
739
|
+
)
|
|
740
|
+
return L_TRUE;
|
|
741
|
+
this.mkExternalClause(
|
|
742
|
+
cube.literals.map((literal) => literal ^ 1),
|
|
743
|
+
tag,
|
|
744
|
+
);
|
|
745
|
+
} finally {
|
|
746
|
+
cube.reset();
|
|
747
|
+
}
|
|
748
|
+
}
|
|
749
|
+
} finally {
|
|
750
|
+
this.retract(tag);
|
|
751
|
+
this.maxVar = savedMaxVar;
|
|
752
|
+
}
|
|
753
|
+
}
|
|
754
|
+
|
|
755
|
+
retract(tag: number, maxLemmas = Infinity) {
|
|
756
|
+
this.initSearch();
|
|
757
|
+
this.explain.reset();
|
|
758
|
+
this.lemma.reset();
|
|
759
|
+
this.lazyClause.reset();
|
|
760
|
+
this.lemmaAssumptions = null;
|
|
761
|
+
const isKept = (clause: Clause) => {
|
|
762
|
+
const isFound = linearize([clause.assumptions]).includes(tag);
|
|
763
|
+
if (isFound) this.delClause(clause);
|
|
764
|
+
return !isFound;
|
|
765
|
+
};
|
|
766
|
+
this.clauses = this.clauses.filter(isKept);
|
|
767
|
+
this.learned = this.learned.filter(isKept);
|
|
768
|
+
if (this.learned.length <= maxLemmas) return;
|
|
769
|
+
this.learned.sort((first, second) => first.literals.length - second.literals.length);
|
|
770
|
+
for (const clause of this.learned.splice(maxLemmas).reverse()) this.delClause(clause);
|
|
771
|
+
}
|
|
772
|
+
|
|
773
|
+
// Like Z3, only a falsified clause restores the assignment.
|
|
569
774
|
checkAssignment(values: readonly (Anum | undefined)[]) {
|
|
570
775
|
const saved = this.assignment.map((value) =>
|
|
571
776
|
value === undefined ? undefined : this.am.copy(value),
|
|
@@ -603,10 +808,10 @@ export class NlsatSolver {
|
|
|
603
808
|
}
|
|
604
809
|
|
|
605
810
|
private processAntecedent(antecedent: number) {
|
|
606
|
-
this.checkpoint();
|
|
811
|
+
this.limit.checkpoint();
|
|
607
812
|
const boolVar = antecedent >> 1;
|
|
608
813
|
if (this.getAssignedValue(antecedent) === L_UNDEF) {
|
|
609
|
-
this.checkpoint();
|
|
814
|
+
this.limit.checkpoint();
|
|
610
815
|
if (!this.marks[boolVar]) {
|
|
611
816
|
this.marks[boolVar] = true;
|
|
612
817
|
this.lemma.push(antecedent);
|
|
@@ -634,7 +839,7 @@ export class NlsatSolver {
|
|
|
634
839
|
this.lazyClause.reset();
|
|
635
840
|
this.explain.computeConflictExplanation(literals, this.lazyClause);
|
|
636
841
|
for (const literal of literals) this.lazyClause.push(literal ^ 1);
|
|
637
|
-
this.checkpoint();
|
|
842
|
+
this.limit.checkpoint();
|
|
638
843
|
this.resolveLiterals(boolVar, this.lazyClause.literals);
|
|
639
844
|
for (const clause of clauses)
|
|
640
845
|
this.lemmaAssumptions = mkJoin(clause.assumptions, this.lemmaAssumptions);
|
|
@@ -675,7 +880,7 @@ export class NlsatSolver {
|
|
|
675
880
|
let isDecision = false;
|
|
676
881
|
while (true) {
|
|
677
882
|
while (this.markCount > 0) {
|
|
678
|
-
this.checkpoint();
|
|
883
|
+
this.limit.checkpoint();
|
|
679
884
|
const entry = this.trail[top - 1];
|
|
680
885
|
if (entry.kind === "assignment" && this.marks[entry.boolVar]) {
|
|
681
886
|
const boolVar = entry.boolVar;
|
|
@@ -720,12 +925,7 @@ export class NlsatSolver {
|
|
|
720
925
|
this.resetMarks();
|
|
721
926
|
const literals = this.lemma.literals;
|
|
722
927
|
if (!isDecision) {
|
|
723
|
-
|
|
724
|
-
for (const literal of literals) {
|
|
725
|
-
const variable = this.atoms.getMaxVar(literal);
|
|
726
|
-
if (variable !== NULL_VAR && (maxVar === NULL_VAR || variable > maxVar)) maxVar = variable;
|
|
727
|
-
}
|
|
728
|
-
this.undoUntilStage(maxVar);
|
|
928
|
+
this.undoUntilStage(this.atoms.getMaxVarOfLiterals(literals));
|
|
729
929
|
return this.mkClause(literals, true, this.lemmaAssumptions);
|
|
730
930
|
}
|
|
731
931
|
if (literals.every((literal) => this.atoms.getAtom(literal) === null)) {
|
|
@@ -750,11 +950,18 @@ export class NlsatSolver {
|
|
|
750
950
|
return level === -1 ? this.scopeLevel - 1 : level;
|
|
751
951
|
}
|
|
752
952
|
|
|
953
|
+
private isRootLiteral(literal: number) {
|
|
954
|
+
const atom = this.atoms.getAtom(literal);
|
|
955
|
+
return atom !== null && !isIneqAtom(atom);
|
|
956
|
+
}
|
|
957
|
+
|
|
753
958
|
private canReorder() {
|
|
754
|
-
return
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
)
|
|
959
|
+
return (
|
|
960
|
+
this.isReordering &&
|
|
961
|
+
this.maxVar === NULL_VAR &&
|
|
962
|
+
[...this.learned, ...this.clauses].every((clause) =>
|
|
963
|
+
clause.literals.every((literal) => !this.isRootLiteral(literal)),
|
|
964
|
+
)
|
|
758
965
|
);
|
|
759
966
|
}
|
|
760
967
|
|
|
@@ -800,15 +1007,14 @@ export class NlsatSolver {
|
|
|
800
1007
|
this.reorder(permutation);
|
|
801
1008
|
}
|
|
802
1009
|
|
|
803
|
-
|
|
1010
|
+
reorder(permutation: readonly number[]) {
|
|
804
1011
|
let kept = 0;
|
|
805
1012
|
for (const clause of this.learned) {
|
|
806
|
-
if (clause.literals.some((literal) => this.
|
|
807
|
-
this.delClause(clause);
|
|
1013
|
+
if (clause.literals.some((literal) => this.isRootLiteral(literal))) this.delClause(clause);
|
|
808
1014
|
else this.learned[kept++] = clause;
|
|
809
1015
|
}
|
|
810
1016
|
this.learned.length = kept;
|
|
811
|
-
this.atoms.reinitCache();
|
|
1017
|
+
this.atoms.reinitCache(this.clauses, this.learned);
|
|
812
1018
|
this.resetWatches();
|
|
813
1019
|
const assignment: (Anum | undefined)[] = [];
|
|
814
1020
|
for (const [variable, value] of this.assignment.entries())
|
|
@@ -821,14 +1027,9 @@ export class NlsatSolver {
|
|
|
821
1027
|
for (const [variable, isIntVariable] of isInt.entries())
|
|
822
1028
|
this.isInt[permutation[variable]] = isIntVariable;
|
|
823
1029
|
this.invPerm = invPerm;
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
827
|
-
if (isIneqAtom(atom)) for (const polynomial of atom.polynomials) polynomials.add(polynomial);
|
|
828
|
-
else polynomials.add(atom.polynomial);
|
|
829
|
-
}
|
|
830
|
-
this.pm.rename(permutation, polynomials);
|
|
831
|
-
this.atoms.reinitCache();
|
|
1030
|
+
this.pm.rename(permutation);
|
|
1031
|
+
this.transcendentals.rename(permutation);
|
|
1032
|
+
this.atoms.reinitCache(this.clauses, this.learned);
|
|
832
1033
|
this.setAssignment(assignment);
|
|
833
1034
|
this.reattachArithClauses(this.clauses);
|
|
834
1035
|
this.reattachArithClauses(this.learned);
|
|
@@ -844,7 +1045,7 @@ export class NlsatSolver {
|
|
|
844
1045
|
|
|
845
1046
|
private reattachArithClauses(clauses: readonly Clause[]) {
|
|
846
1047
|
for (const clause of clauses) {
|
|
847
|
-
const variable = this.
|
|
1048
|
+
const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
|
|
848
1049
|
if (variable !== NULL_VAR) this.watches[variable].push(clause);
|
|
849
1050
|
}
|
|
850
1051
|
}
|