tla-ts 0.0.9 → 0.0.10-dev.09e53c2a6
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 +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +57 -53
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +109 -10
- package/dist/index.d.ts +109 -10
- 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 +146 -31
- package/dist/run.js +146 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +132 -104
- package/dist/transfer.js +132 -104
- package/dist/worker.cjs +6 -6
- package/dist/worker.js +6 -6
- package/package.json +3 -1
- package/src/ast.ts +45 -59
- package/src/bags.ts +99 -102
- package/src/builtins.ts +28 -75
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +116 -0
- package/src/check-trace.ts +282 -0
- package/src/check.ts +797 -782
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +136 -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 +687 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +323 -658
- package/src/cli/typescript.ts +23 -0
- package/src/cli/xml-exporter.ts +27 -49
- package/src/cli.ts +0 -1
- package/src/codegen.ts +196 -74
- package/src/config.ts +140 -109
- package/src/coverage.ts +830 -0
- package/src/dependencies.ts +36 -54
- package/src/dfid.ts +618 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +178 -339
- package/src/errors.ts +100 -57
- package/src/evaluate.ts +598 -340
- package/src/exit-codes.ts +38 -3
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +126 -21
- package/src/java-hash.ts +7 -0
- package/src/java-overrides.ts +4 -19
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +46 -58
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +590 -311
- package/src/liveness.ts +180 -124
- 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 +38 -19
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +30 -37
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +89 -58
- 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 +119 -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 +30 -60
- package/src/parallel.ts +59 -73
- package/src/parser.ts +1082 -399
- 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 +224 -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 +0 -14
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +27 -52
- 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 +31 -74
- 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 +1 -44
- 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 +0 -2
- 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 +1026 -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 +615 -53
- 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/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +87 -58
- package/src/prover/smt/solver/ast-lt.ts +166 -22
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1424 -180
- package/src/prover/smt/solver/auf-solver.ts +7 -44
- 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 -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 +278 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +519 -175
- package/src/prover/smt/solver/ctx-simplify.ts +33 -50
- 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 +39 -30
- 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 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- 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 -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 +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 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +146 -0
- package/src/prover/smt/solver/factor.ts +141 -0
- package/src/prover/smt/solver/fd-solver.ts +265 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +148 -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 +640 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2249 -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 +176 -28
- package/src/prover/smt/solver/goal2nlsat.ts +189 -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 +26 -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 +112 -132
- 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 +345 -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 +11 -30
- package/src/prover/smt/solver/lp/core-solver.ts +23 -29
- package/src/prover/smt/solver/lp/cross-nested.ts +5 -20
- 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 +69 -82
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +0 -14
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +4 -28
- package/src/prover/smt/solver/lp/nex.ts +0 -6
- 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 +91 -135
- 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 +22 -72
- 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 +123 -112
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +0 -3
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +1 -14
- package/src/prover/smt/solver/lp/pdd-solver.ts +2 -33
- package/src/prover/smt/solver/lp/pdd.ts +7 -70
- 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 +309 -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 +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 +19 -62
- package/src/prover/smt/solver/model-evaluator.ts +190 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +56 -40
- 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 +711 -0
- package/src/prover/smt/solver/mus.ts +51 -0
- package/src/prover/smt/solver/muz/dl-context.ts +404 -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 +1406 -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 +218 -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 +177 -160
- package/src/prover/smt/solver/nlsat/atoms.ts +24 -24
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +65 -69
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +48 -135
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +29 -161
- package/src/prover/smt/solver/nlsat/solver.ts +241 -110
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +367 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +1 -47
- package/src/prover/smt/solver/nlsat/upolynomial.ts +10 -93
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +107 -60
- 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 +787 -0
- package/src/prover/smt/solver/opt-nlsat.ts +375 -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 +308 -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 +284 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +204 -79
- package/src/prover/smt/solver/probes.ts +512 -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/qe-arith-plugin.ts +1098 -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 +39 -49
- 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 -16
- 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 +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +8 -23
- 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 +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 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +52 -129
- package/src/prover/smt/solver/rewriter.ts +477 -120
- package/src/prover/smt/solver/rlimit.ts +39 -21
- 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 +43 -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 +1301 -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 +83 -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 +3140 -365
- package/src/prover/smt/solver/smtlib-script.ts +1631 -0
- package/src/prover/smt/solver/solve-eqs.ts +929 -0
- package/src/prover/smt/solver/solver.ts +119 -39
- 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 +1986 -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 +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +59 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +94 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +24 -40
- package/src/prover/smt/solver/theory-lra-state.ts +6 -27
- package/src/prover/smt/solver/theory-lra.ts +188 -8
- 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 +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +67 -41
- 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 +0 -6
- package/src/prover/zenon/expr.ts +8 -28
- package/src/prover/zenon/index-table.ts +26 -59
- package/src/prover/zenon/isar-case.ts +8 -20
- package/src/prover/zenon/isar.ts +35 -65
- 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 +1 -13
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +2 -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 +67 -185
- package/src/runtime.ts +26 -22
- package/src/sany/builtins.ts +2 -5
- package/src/sany/generation.ts +394 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +686 -0
- package/src/sany/generator-expressions.ts +1100 -0
- package/src/sany/generator-proofs.ts +662 -0
- package/src/sany/generator.ts +191 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +58 -77
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +1 -5
- package/src/sany/nodes.ts +5 -43
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +49 -76
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +35 -117
- package/src/search.ts +671 -169
- package/src/simulate.ts +712 -0
- package/src/spec-description.ts +192 -100
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +264 -95
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +69 -52
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +267 -100
- package/src/symmetry.ts +35 -27
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +112 -6
- package/src/tlc/messages.ts +125 -54
- package/src/tlc/order.ts +39 -69
- package/src/tlc/random.ts +37 -49
- package/src/tlc/replay.ts +553 -228
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +78 -44
- package/src/tlc/tlcext-operators.ts +171 -122
- package/src/tlc/trace-spec.ts +249 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6535 -0
- package/src/typescript/actions.ts +479 -0
- package/src/typescript/collections.ts +614 -0
- package/src/typescript/compile.ts +63 -0
- package/src/typescript/context.ts +94 -0
- package/src/typescript/emit.ts +121 -0
- package/src/typescript/expressions.ts +496 -0
- package/src/typescript/formula.ts +154 -0
- package/src/typescript/functions.ts +284 -0
- package/src/typescript/model.ts +162 -0
- package/src/typescript/names.ts +114 -0
- package/src/typescript/program.ts +48 -0
- package/src/typescript/properties.ts +139 -0
- package/src/typescript/scope.ts +112 -0
- package/src/typescript/steps.ts +167 -0
- package/src/typescript/types.ts +171 -0
- package/src/values.ts +832 -484
- 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,15 +1,7 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
|
|
5
|
-
// line. Only Z3's default nlsat parameters are ported: lazy 0, simplify_conflicts, reorder and
|
|
6
|
-
// randomize on, shuffle_vars, inline_vars, minimize_conflicts and check_lemmas off, seed 0. So
|
|
7
|
-
// nlsat_simplify and the bounds of eliminated variables, which only inline_vars makes, are not
|
|
8
|
-
// ported. Neither are what nra never uses: Boolean variables beyond true, transcendental
|
|
9
|
-
// constraints, check(assumptions), check_limit, retract, and set_max_var, without which
|
|
10
|
-
// select_witness never picks the maximal value. The search counts its steps against the resource
|
|
11
|
-
// limit, but not the memory, which Z3 also bounds by max_memory.
|
|
12
|
-
import { SmtCanceledError } from "../../../../errors";
|
|
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 { SmtCanceledError, SmtInvariantError } from "../../../../errors";
|
|
13
5
|
import { L_FALSE, L_TRUE, L_UNDEF } from "../lbool";
|
|
14
6
|
import { type Dependency, linearize, mkJoin, mkLeaf } from "../lp/dependency";
|
|
15
7
|
import { RandomGen } from "../random-gen";
|
|
@@ -21,12 +13,11 @@ import { Evaluator } from "./evaluator";
|
|
|
21
13
|
import { Explain } from "./explain";
|
|
22
14
|
import type { IntervalSet } from "./interval-set";
|
|
23
15
|
import { NULL_VAR, type Polynomial, PolynomialCache, PolynomialManager } from "./polynomial";
|
|
24
|
-
import {
|
|
16
|
+
import { NlsatTranscendentals } from "./transcendentals";
|
|
17
|
+
import { type Clause, type IneqAtom, type IneqKind, isIneqAtom, type RootKind } from "./types";
|
|
25
18
|
|
|
26
|
-
// null_bool_var: past every Boolean variable.
|
|
27
19
|
const NULL_BOOL_VAR = Infinity;
|
|
28
20
|
|
|
29
|
-
// m_restart_threshold: the conflicts between two reorderings of the variables.
|
|
30
21
|
const RESTART_THRESHOLD = 10000;
|
|
31
22
|
|
|
32
23
|
type Justification =
|
|
@@ -52,7 +43,7 @@ export class NlsatSolver {
|
|
|
52
43
|
private justifications: (Justification | null)[] = [];
|
|
53
44
|
private bwatches: Clause[][] = [];
|
|
54
45
|
private isDead: boolean[] = [];
|
|
55
|
-
|
|
46
|
+
readonly atoms = new AtomTable(this.pm, this.cache, {
|
|
56
47
|
onMk: (boolVar) => {
|
|
57
48
|
this.bvalues[boolVar] = L_UNDEF;
|
|
58
49
|
this.levels[boolVar] = Infinity;
|
|
@@ -75,15 +66,18 @@ export class NlsatSolver {
|
|
|
75
66
|
private watches: Clause[][] = [];
|
|
76
67
|
private infeasible: (IntervalSet | null)[] = [];
|
|
77
68
|
private var2eq: (IneqAtom | null)[] = [];
|
|
78
|
-
// perm: internal to external variables. invPerm: external to internal.
|
|
79
69
|
private perm: number[] = [];
|
|
80
70
|
private invPerm: number[] = [];
|
|
81
|
-
|
|
71
|
+
readonly explain = new Explain(this.pm, this.am, this.cache, {
|
|
82
72
|
atoms: this.atoms,
|
|
83
73
|
sample: this.assignment,
|
|
84
74
|
getValue: (literal) => this.value(literal),
|
|
85
75
|
var2eq: this.var2eq,
|
|
76
|
+
getNumVars: () => this.isInt.length,
|
|
77
|
+
reorder: (permutation) => this.reorder(permutation),
|
|
78
|
+
restoreOrder: () => this.restoreOrder(),
|
|
86
79
|
});
|
|
80
|
+
readonly transcendentals = new NlsatTranscendentals(this);
|
|
87
81
|
private bk = 0;
|
|
88
82
|
private xk = NULL_VAR;
|
|
89
83
|
private scopeLevel = 0;
|
|
@@ -95,8 +89,10 @@ export class NlsatSolver {
|
|
|
95
89
|
private lemmaAssumptions: Dependency = null;
|
|
96
90
|
private randomSeed = 0;
|
|
97
91
|
private isReordered = false;
|
|
98
|
-
|
|
92
|
+
private maxVar = NULL_VAR;
|
|
93
|
+
private nextTag = 0;
|
|
99
94
|
maxConflicts = Infinity;
|
|
95
|
+
isReordering = true;
|
|
100
96
|
readonly stats = {
|
|
101
97
|
conflicts: 0,
|
|
102
98
|
restarts: 0,
|
|
@@ -106,22 +102,18 @@ export class NlsatSolver {
|
|
|
106
102
|
irrationalAssignments: 0,
|
|
107
103
|
};
|
|
108
104
|
|
|
109
|
-
|
|
110
|
-
// solver, which Z3 sets with a scoped_rlimit on a child limit.
|
|
111
|
-
steps = 0;
|
|
112
|
-
|
|
113
|
-
constructor(
|
|
114
|
-
private limit: ResourceLimit | null = null,
|
|
115
|
-
private budget = Infinity,
|
|
116
|
-
) {
|
|
117
|
-
// mk_true_bvar: the clause [true], whose literal the first Boolean stage assigns.
|
|
105
|
+
constructor(private limit: ResourceLimit | null = null) {
|
|
118
106
|
this.mkClause([TRUE_LITERAL], false, null);
|
|
119
107
|
}
|
|
120
108
|
|
|
109
|
+
updtParams(seed: number, isFactoring: boolean) {
|
|
110
|
+
this.randomSeed = seed;
|
|
111
|
+
this.ism.setSeed(seed);
|
|
112
|
+
this.explain.isFactoring = isFactoring;
|
|
113
|
+
}
|
|
114
|
+
|
|
121
115
|
private checkpoint() {
|
|
122
|
-
this.
|
|
123
|
-
if ((this.limit !== null && !this.limit.inc()) || this.steps > this.budget)
|
|
124
|
-
throw new SmtCanceledError();
|
|
116
|
+
if (this.limit !== null && !this.limit.inc()) throw new SmtCanceledError();
|
|
125
117
|
}
|
|
126
118
|
|
|
127
119
|
mkVar(isInt: boolean) {
|
|
@@ -143,32 +135,71 @@ export class NlsatSolver {
|
|
|
143
135
|
return this.atoms.getAtom(literal);
|
|
144
136
|
}
|
|
145
137
|
|
|
146
|
-
|
|
138
|
+
mkBoolVar() {
|
|
139
|
+
return this.atoms.mkBoolVar();
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
mkRootAtom(kind: RootKind, variable: number, index: number, polynomial: Polynomial) {
|
|
143
|
+
return this.atoms.mkRootAtom(kind, variable, index, polynomial);
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
getBoolValue(boolVar: number) {
|
|
147
|
+
return this.bvalues[boolVar];
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
vars(literal: number) {
|
|
151
|
+
const atom = this.atoms.getAtom(literal);
|
|
152
|
+
if (atom === null) return [];
|
|
153
|
+
if (isIneqAtom(atom))
|
|
154
|
+
return atom.polynomials.flatMap((polynomial) => this.pm.getVars(polynomial));
|
|
155
|
+
return [...this.pm.getVars(atom.polynomial), atom.maxVar];
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
getRvalues() {
|
|
159
|
+
return this.assignment.map((value) => (value === undefined ? undefined : this.am.copy(value)));
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
setRvalues(values: readonly (Anum | undefined)[]) {
|
|
163
|
+
this.setAssignment(values);
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
getBvalues(boolVars: Iterable<number>) {
|
|
167
|
+
const values: number[] = [];
|
|
168
|
+
for (const boolVar of boolVars) {
|
|
169
|
+
while (values.length <= boolVar) values.push(L_UNDEF);
|
|
170
|
+
if (this.atoms.atoms[boolVar] === null) values[boolVar] = this.bvalues[boolVar];
|
|
171
|
+
}
|
|
172
|
+
return values;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
setBvalues(values: readonly number[]) {
|
|
176
|
+
for (const [boolVar, value] of values.entries())
|
|
177
|
+
if (value !== L_UNDEF) this.bvalues[boolVar] = value;
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
setMaxVar(variable: number) {
|
|
181
|
+
this.maxVar = variable;
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
getMaxVarSup() {
|
|
185
|
+
if (this.maxVar === NULL_VAR || this.assignment[this.maxVar] === undefined) return null;
|
|
186
|
+
return this.ism.queryMaxInComplement(this.infeasible[this.maxVar]);
|
|
187
|
+
}
|
|
188
|
+
|
|
147
189
|
mkExternalClause(literals: readonly number[], assumption: number | null) {
|
|
148
190
|
this.mkClause(literals, false, assumption === null ? null : mkLeaf(assumption));
|
|
149
191
|
}
|
|
150
192
|
|
|
151
|
-
// value(x): the model's value of x, zero when unassigned.
|
|
152
193
|
getValue(variable: number) {
|
|
153
194
|
return this.assignment[variable] ?? new Anum(Rational.zero);
|
|
154
195
|
}
|
|
155
196
|
|
|
156
|
-
// get_core: the assumptions of the input clauses the last conflict depends on.
|
|
157
197
|
getCore() {
|
|
158
198
|
return linearize([this.lemmaAssumptions]);
|
|
159
199
|
}
|
|
160
200
|
|
|
161
|
-
private getMaxVar(clause: Clause) {
|
|
162
|
-
let result = NULL_VAR;
|
|
163
|
-
for (const literal of clause.literals) {
|
|
164
|
-
const atom = this.atoms.getAtom(literal);
|
|
165
|
-
if (atom !== null && (result === NULL_VAR || atom.maxVar > result)) result = atom.maxVar;
|
|
166
|
-
}
|
|
167
|
-
return result;
|
|
168
|
-
}
|
|
169
|
-
|
|
170
201
|
private getClauseDegree(clause: Clause) {
|
|
171
|
-
if (this.
|
|
202
|
+
if (this.atoms.getMaxVarOfLiterals(clause.literals) === NULL_VAR) return 0;
|
|
172
203
|
let max = 0;
|
|
173
204
|
for (const literal of clause.literals) {
|
|
174
205
|
const atom = this.atoms.getAtom(literal);
|
|
@@ -177,8 +208,6 @@ export class NlsatSolver {
|
|
|
177
208
|
return max;
|
|
178
209
|
}
|
|
179
210
|
|
|
180
|
-
// lit_lt: Boolean literals first, then by maximal variable, degree, inequalities before
|
|
181
|
-
// equations, and index.
|
|
182
211
|
private compareLiterals(first: number, second: number) {
|
|
183
212
|
const firstAtom = this.atoms.getAtom(first);
|
|
184
213
|
const secondAtom = this.atoms.getAtom(second);
|
|
@@ -197,7 +226,7 @@ export class NlsatSolver {
|
|
|
197
226
|
}
|
|
198
227
|
|
|
199
228
|
private mkClause(literals: readonly number[], isLearned: boolean, assumptions: Dependency) {
|
|
200
|
-
const clause
|
|
229
|
+
const clause = {
|
|
201
230
|
id: this.nextClauseId++,
|
|
202
231
|
literals: literals.length === 0 ? [FALSE_LITERAL] : [...literals],
|
|
203
232
|
isLearned,
|
|
@@ -212,13 +241,13 @@ export class NlsatSolver {
|
|
|
212
241
|
}
|
|
213
242
|
|
|
214
243
|
private addClauseToWatches(clause: Clause) {
|
|
215
|
-
const variable = this.
|
|
244
|
+
const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
|
|
216
245
|
if (variable !== NULL_VAR) this.watches[variable].push(clause);
|
|
217
246
|
else this.bwatches[Math.max(...clause.literals.map((literal) => literal >> 1))].push(clause);
|
|
218
247
|
}
|
|
219
248
|
|
|
220
249
|
private delClause(clause: Clause) {
|
|
221
|
-
const variable = this.
|
|
250
|
+
const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
|
|
222
251
|
const watches =
|
|
223
252
|
variable !== NULL_VAR
|
|
224
253
|
? this.watches[variable]
|
|
@@ -228,8 +257,6 @@ export class NlsatSolver {
|
|
|
228
257
|
for (const literal of clause.literals) this.atoms.decRef(literal);
|
|
229
258
|
}
|
|
230
259
|
|
|
231
|
-
// Search.
|
|
232
|
-
|
|
233
260
|
private unassignBoolVar(boolVar: number) {
|
|
234
261
|
this.bvalues[boolVar] = L_UNDEF;
|
|
235
262
|
this.levels[boolVar] = Infinity;
|
|
@@ -298,8 +325,7 @@ export class NlsatSolver {
|
|
|
298
325
|
this.setLiteralToTrue(literal, DECISION);
|
|
299
326
|
}
|
|
300
327
|
|
|
301
|
-
|
|
302
|
-
private value(literal: number) {
|
|
328
|
+
value(literal: number) {
|
|
303
329
|
const assigned = this.getAssignedValue(literal);
|
|
304
330
|
if (assigned !== L_UNDEF) return assigned;
|
|
305
331
|
const atom = this.atoms.getAtom(literal);
|
|
@@ -326,7 +352,6 @@ export class NlsatSolver {
|
|
|
326
352
|
return true;
|
|
327
353
|
}
|
|
328
354
|
|
|
329
|
-
// R_propagate: literal is true, because with the justifications of set it is infeasible.
|
|
330
355
|
private propagate(literal: number, set: IntervalSet | null, isLiteralIncluded = true) {
|
|
331
356
|
const justifications = this.ism.getJustifications(set);
|
|
332
357
|
const literals = [...justifications.literals];
|
|
@@ -340,8 +365,6 @@ export class NlsatSolver {
|
|
|
340
365
|
this.infeasible[this.xk] = this.ism.mkUnion(set, old);
|
|
341
366
|
}
|
|
342
367
|
|
|
343
|
-
// updt_eq: the equation of least degree that holds for the current variable, for the
|
|
344
|
-
// explanation to simplify with.
|
|
345
368
|
private updateEq(boolVar: number, justification: Justification) {
|
|
346
369
|
if (this.bvalues[boolVar] !== L_TRUE) return;
|
|
347
370
|
const atom = this.atoms.atoms[boolVar];
|
|
@@ -374,7 +397,9 @@ export class NlsatSolver {
|
|
|
374
397
|
this.checkpoint();
|
|
375
398
|
if (this.value(literal) === L_FALSE) continue;
|
|
376
399
|
if (this.value(literal) === L_TRUE) return true;
|
|
377
|
-
const atom = this.atoms.getAtom(literal)
|
|
400
|
+
const atom = this.atoms.getAtom(literal);
|
|
401
|
+
if (atom === null)
|
|
402
|
+
throw new SmtInvariantError("a literal of an arithmetic clause has no atom");
|
|
378
403
|
const set = this.evaluator.infeasibleIntervals(atom, (literal & 1) === 1, clause);
|
|
379
404
|
if (set === null) {
|
|
380
405
|
this.propagate(literal, null);
|
|
@@ -436,9 +461,11 @@ export class NlsatSolver {
|
|
|
436
461
|
this.xk = this.xk === NULL_VAR ? 0 : this.xk + 1;
|
|
437
462
|
}
|
|
438
463
|
|
|
439
|
-
// select_witness: a value outside the infeasible intervals, at random among the candidates.
|
|
440
464
|
private selectWitness() {
|
|
441
|
-
const
|
|
465
|
+
const set = this.infeasible[this.xk];
|
|
466
|
+
const witness =
|
|
467
|
+
(this.xk === this.maxVar ? this.ism.pickMaxInComplement(set) : null) ??
|
|
468
|
+
this.ism.pickInComplement(set, true);
|
|
442
469
|
if (!this.am.isRational(witness)) this.stats.irrationalAssignments++;
|
|
443
470
|
this.assignment[this.xk] = witness;
|
|
444
471
|
}
|
|
@@ -472,8 +499,6 @@ export class NlsatSolver {
|
|
|
472
499
|
}
|
|
473
500
|
}
|
|
474
501
|
|
|
475
|
-
// gc: drops the learned clauses that took no part in a conflict since the last collection,
|
|
476
|
-
// once they outnumber the input clauses four to one.
|
|
477
502
|
private gc() {
|
|
478
503
|
if (this.learned.length <= 4 * this.clauses.length) return;
|
|
479
504
|
this.resetWatches();
|
|
@@ -498,7 +523,6 @@ export class NlsatSolver {
|
|
|
498
523
|
this.xk = NULL_VAR;
|
|
499
524
|
}
|
|
500
525
|
|
|
501
|
-
// do_reorder
|
|
502
526
|
private reorderAtRestart() {
|
|
503
527
|
this.undoToBase();
|
|
504
528
|
this.stats.restarts++;
|
|
@@ -507,7 +531,6 @@ export class NlsatSolver {
|
|
|
507
531
|
this.applyReorder();
|
|
508
532
|
}
|
|
509
533
|
|
|
510
|
-
// try_reorder
|
|
511
534
|
private tryReorder() {
|
|
512
535
|
this.gc();
|
|
513
536
|
if (this.stats.restarts % 10 !== 0) return;
|
|
@@ -515,9 +538,6 @@ export class NlsatSolver {
|
|
|
515
538
|
this.applyReorder();
|
|
516
539
|
}
|
|
517
540
|
|
|
518
|
-
// search_check: the search, again after each model that gives an integer variable a fraction,
|
|
519
|
-
// with the lemma that the variable lies outside the open interval between the integers around
|
|
520
|
-
// its value.
|
|
521
541
|
private searchCheck() {
|
|
522
542
|
this.stats.conflicts = 0;
|
|
523
543
|
this.stats.restarts = 0;
|
|
@@ -542,7 +562,11 @@ export class NlsatSolver {
|
|
|
542
562
|
}
|
|
543
563
|
bounds.push([variable, lower]);
|
|
544
564
|
}
|
|
545
|
-
if (bounds.length === 0)
|
|
565
|
+
if (bounds.length === 0) {
|
|
566
|
+
if (this.transcendentals.isEmpty || !this.transcendentals.refine()) return result;
|
|
567
|
+
this.initSearch();
|
|
568
|
+
continue;
|
|
569
|
+
}
|
|
546
570
|
this.initSearch();
|
|
547
571
|
for (const bound of bounds) {
|
|
548
572
|
this.lemma.reset();
|
|
@@ -563,8 +587,6 @@ export class NlsatSolver {
|
|
|
563
587
|
this.assignment.length = 0;
|
|
564
588
|
}
|
|
565
589
|
|
|
566
|
-
// check: satisfiable, unsatisfiable or unknown once maxConflicts conflicts passed. The variables
|
|
567
|
-
// are reordered for the search and restored after it.
|
|
568
590
|
check() {
|
|
569
591
|
this.initSearch();
|
|
570
592
|
this.explain.isFullDimensional = this.clauses.every((clause) =>
|
|
@@ -578,6 +600,32 @@ export class NlsatSolver {
|
|
|
578
600
|
return result;
|
|
579
601
|
}
|
|
580
602
|
|
|
603
|
+
// Keeps in assumptions the ones in the core when unsatisfiable, and none otherwise.
|
|
604
|
+
checkAssumptions(assumptions: number[]) {
|
|
605
|
+
const tags = assumptions.map((literal) => {
|
|
606
|
+
const tag = --this.nextTag;
|
|
607
|
+
this.mkExternalClause([literal], tag);
|
|
608
|
+
return tag;
|
|
609
|
+
});
|
|
610
|
+
const result = this.check();
|
|
611
|
+
const core: number[] = [];
|
|
612
|
+
if (result === L_FALSE)
|
|
613
|
+
for (const tag of this.getCore()) {
|
|
614
|
+
const index = tags.indexOf(tag);
|
|
615
|
+
if (index !== -1) core.push(assumptions[index]);
|
|
616
|
+
}
|
|
617
|
+
const isKept = (clause: Clause) => {
|
|
618
|
+
const isFound = linearize([clause.assumptions]).some((tag) => tags.includes(tag));
|
|
619
|
+
if (isFound) this.delClause(clause);
|
|
620
|
+
return !isFound;
|
|
621
|
+
};
|
|
622
|
+
this.clauses = this.clauses.filter(isKept);
|
|
623
|
+
this.learned = this.learned.filter(isKept);
|
|
624
|
+
assumptions.length = 0;
|
|
625
|
+
assumptions.push(...core);
|
|
626
|
+
return result;
|
|
627
|
+
}
|
|
628
|
+
|
|
581
629
|
private isFullDimensional(literal: number) {
|
|
582
630
|
const atom = this.atoms.getAtom(literal);
|
|
583
631
|
if (atom === null) return true;
|
|
@@ -593,7 +641,6 @@ export class NlsatSolver {
|
|
|
593
641
|
}
|
|
594
642
|
}
|
|
595
643
|
|
|
596
|
-
// sort_clauses_by_degree
|
|
597
644
|
private sortClausesByDegree(clauses: Clause[]) {
|
|
598
645
|
if (clauses.length <= 1) return;
|
|
599
646
|
const degrees = clauses.map((clause) => this.getClauseDegree(clause));
|
|
@@ -604,10 +651,110 @@ export class NlsatSolver {
|
|
|
604
651
|
for (let index = 0; index < sorted.length; index++) clauses[index] = sorted[index];
|
|
605
652
|
}
|
|
606
653
|
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
654
|
+
private projectModel(cube: ScopedLiterals) {
|
|
655
|
+
const seen = new Set<number>();
|
|
656
|
+
for (const clause of this.clauses) {
|
|
657
|
+
this.checkpoint();
|
|
658
|
+
const witness = clause.literals.find((literal) => this.value(literal) === L_TRUE);
|
|
659
|
+
if (witness === undefined) throw new SmtInvariantError("nlsat's model falsifies a clause");
|
|
660
|
+
if (this.atoms.getAtom(witness) === null || seen.has(witness >> 1)) continue;
|
|
661
|
+
seen.add(witness >> 1);
|
|
662
|
+
cube.push(witness);
|
|
663
|
+
}
|
|
664
|
+
// Strict sector bounds keep every point of the projection extensible.
|
|
665
|
+
this.explain.isFullDimensional = false;
|
|
666
|
+
const projected = new ScopedLiterals(this.atoms);
|
|
667
|
+
try {
|
|
668
|
+
for (let variable = this.isInt.length - 1; variable >= 1 && cube.size > 0; variable--) {
|
|
669
|
+
this.checkpoint();
|
|
670
|
+
projected.reset();
|
|
671
|
+
this.explain.projectVariable(variable, cube.literals, projected);
|
|
672
|
+
[cube.literals, projected.literals] = [projected.literals, cube.literals];
|
|
673
|
+
}
|
|
674
|
+
} finally {
|
|
675
|
+
projected.reset();
|
|
676
|
+
}
|
|
677
|
+
}
|
|
678
|
+
|
|
679
|
+
private getCubeSup(cube: ScopedLiterals) {
|
|
680
|
+
let infeasible: IntervalSet | null = null;
|
|
681
|
+
for (const literal of cube.literals) {
|
|
682
|
+
const excluded = this.evaluator.infeasibleIntervals(
|
|
683
|
+
this.atoms.getAtom(literal)!,
|
|
684
|
+
(literal & 1) === 1,
|
|
685
|
+
null,
|
|
686
|
+
);
|
|
687
|
+
infeasible = this.ism.mkUnion(infeasible, excluded);
|
|
688
|
+
}
|
|
689
|
+
if (this.ism.isFull(infeasible))
|
|
690
|
+
throw new SmtInvariantError("nlsat's model projection is inconsistent");
|
|
691
|
+
return this.ism.queryMaxInComplement(infeasible);
|
|
692
|
+
}
|
|
693
|
+
|
|
694
|
+
checkLimit(variable: number, bound: Anum | null) {
|
|
695
|
+
if (variable !== 0 || this.invPerm[0] !== 0)
|
|
696
|
+
throw new SmtInvariantError("nlsat checks the limit of the first variable");
|
|
697
|
+
if (this.isInt.some(Boolean)) return L_UNDEF;
|
|
698
|
+
const limit = bound === null ? null : this.am.copy(bound);
|
|
699
|
+
const savedMaxVar = this.maxVar;
|
|
700
|
+
this.maxVar = variable;
|
|
701
|
+
const tag = --this.nextTag;
|
|
702
|
+
try {
|
|
703
|
+
if (limit !== null) {
|
|
704
|
+
const isRational = this.am.isRational(limit);
|
|
705
|
+
const polynomial = this.pm.fromCoeffs(this.am.getPolynomial(limit), variable);
|
|
706
|
+
const upper = isRational
|
|
707
|
+
? this.mkIneqLiteral("LT", [polynomial], [false])
|
|
708
|
+
: 2 * this.mkRootAtom("ROOT_LT", variable, this.am.getRootIndex(limit), polynomial);
|
|
709
|
+
this.mkExternalClause([upper], tag);
|
|
710
|
+
}
|
|
711
|
+
while (true) {
|
|
712
|
+
this.checkpoint();
|
|
713
|
+
const status = this.check();
|
|
714
|
+
if (status !== L_TRUE) return status;
|
|
715
|
+
const cube = new ScopedLiterals(this.atoms);
|
|
716
|
+
try {
|
|
717
|
+
this.projectModel(cube);
|
|
718
|
+
const sup = this.getCubeSup(cube);
|
|
719
|
+
if (
|
|
720
|
+
limit === null
|
|
721
|
+
? sup === null
|
|
722
|
+
: sup !== null && !sup.isAttained && this.am.compare(sup.sup, limit) === 0
|
|
723
|
+
)
|
|
724
|
+
return L_TRUE;
|
|
725
|
+
this.mkExternalClause(
|
|
726
|
+
cube.literals.map((literal) => literal ^ 1),
|
|
727
|
+
tag,
|
|
728
|
+
);
|
|
729
|
+
} finally {
|
|
730
|
+
cube.reset();
|
|
731
|
+
}
|
|
732
|
+
}
|
|
733
|
+
} finally {
|
|
734
|
+
this.retract(tag);
|
|
735
|
+
this.maxVar = savedMaxVar;
|
|
736
|
+
}
|
|
737
|
+
}
|
|
738
|
+
|
|
739
|
+
retract(tag: number, maxLemmas = Infinity) {
|
|
740
|
+
this.initSearch();
|
|
741
|
+
this.explain.reset();
|
|
742
|
+
this.lemma.reset();
|
|
743
|
+
this.lazyClause.reset();
|
|
744
|
+
this.lemmaAssumptions = null;
|
|
745
|
+
const isKept = (clause: Clause) => {
|
|
746
|
+
const isFound = linearize([clause.assumptions]).includes(tag);
|
|
747
|
+
if (isFound) this.delClause(clause);
|
|
748
|
+
return !isFound;
|
|
749
|
+
};
|
|
750
|
+
this.clauses = this.clauses.filter(isKept);
|
|
751
|
+
this.learned = this.learned.filter(isKept);
|
|
752
|
+
if (this.learned.length <= maxLemmas) return;
|
|
753
|
+
this.learned.sort((first, second) => first.literals.length - second.literals.length);
|
|
754
|
+
for (const clause of this.learned.splice(maxLemmas).reverse()) this.delClause(clause);
|
|
755
|
+
}
|
|
756
|
+
|
|
757
|
+
// Like Z3, only a falsified clause restores the assignment.
|
|
611
758
|
checkAssignment(values: readonly (Anum | undefined)[]) {
|
|
612
759
|
const saved = this.assignment.map((value) =>
|
|
613
760
|
value === undefined ? undefined : this.am.copy(value),
|
|
@@ -644,8 +791,6 @@ export class NlsatSolver {
|
|
|
644
791
|
this.assignment[variable] = value === undefined ? undefined : this.am.copy(value);
|
|
645
792
|
}
|
|
646
793
|
|
|
647
|
-
// Conflict resolution.
|
|
648
|
-
|
|
649
794
|
private processAntecedent(antecedent: number) {
|
|
650
795
|
this.checkpoint();
|
|
651
796
|
const boolVar = antecedent >> 1;
|
|
@@ -674,8 +819,6 @@ export class NlsatSolver {
|
|
|
674
819
|
this.lemmaAssumptions = mkJoin(clause.assumptions, this.lemmaAssumptions);
|
|
675
820
|
}
|
|
676
821
|
|
|
677
|
-
// resolve_lazy_justification: the explanation of the excluded line, with the negations of the
|
|
678
|
-
// literals that excluded it, as the clause to resolve with.
|
|
679
822
|
private resolveLazyJustification(boolVar: number, literals: number[], clauses: Clause[]) {
|
|
680
823
|
this.lazyClause.reset();
|
|
681
824
|
this.explain.computeConflictExplanation(literals, this.lazyClause);
|
|
@@ -690,7 +833,6 @@ export class NlsatSolver {
|
|
|
690
833
|
for (const literal of this.lemma.literals) this.marks[literal >> 1] = false;
|
|
691
834
|
}
|
|
692
835
|
|
|
693
|
-
// scoped_reset_marks
|
|
694
836
|
private releaseMarks() {
|
|
695
837
|
if (this.markCount > 0) {
|
|
696
838
|
this.markCount = 0;
|
|
@@ -698,7 +840,6 @@ export class NlsatSolver {
|
|
|
698
840
|
} else this.resetMarks();
|
|
699
841
|
}
|
|
700
842
|
|
|
701
|
-
// resolve: learns a lemma from the conflict and backjumps. False when the lemma is empty.
|
|
702
843
|
private resolve(conflict: Clause) {
|
|
703
844
|
let conflictClause = conflict;
|
|
704
845
|
while (true) {
|
|
@@ -717,8 +858,6 @@ export class NlsatSolver {
|
|
|
717
858
|
}
|
|
718
859
|
}
|
|
719
860
|
|
|
720
|
-
// The body of resolve for one conflict: null for the empty lemma, true when the conflict clause
|
|
721
|
-
// itself is the lemma and now propagates, else the learned clause.
|
|
722
861
|
private learn(conflict: Clause): Clause | true | null {
|
|
723
862
|
this.resolveClause(-1, conflict);
|
|
724
863
|
let top = this.trail.length;
|
|
@@ -749,7 +888,6 @@ export class NlsatSolver {
|
|
|
749
888
|
for (const literal of literals)
|
|
750
889
|
if (this.getAssignedValue(literal) === L_FALSE)
|
|
751
890
|
maxLevel = Math.max(maxLevel, this.levels[literal >> 1]);
|
|
752
|
-
// remove_literals_from_lvl
|
|
753
891
|
let kept = 0;
|
|
754
892
|
for (const literal of literals) {
|
|
755
893
|
const boolVar = literal >> 1;
|
|
@@ -771,18 +909,13 @@ export class NlsatSolver {
|
|
|
771
909
|
this.resetMarks();
|
|
772
910
|
const literals = this.lemma.literals;
|
|
773
911
|
if (!isDecision) {
|
|
774
|
-
|
|
775
|
-
for (const literal of literals) {
|
|
776
|
-
const variable = this.atoms.getMaxVar(literal);
|
|
777
|
-
if (variable !== NULL_VAR && (maxVar === NULL_VAR || variable > maxVar)) maxVar = variable;
|
|
778
|
-
}
|
|
779
|
-
this.undoUntilStage(maxVar);
|
|
912
|
+
this.undoUntilStage(this.atoms.getMaxVarOfLiterals(literals));
|
|
780
913
|
return this.mkClause(literals, true, this.lemmaAssumptions);
|
|
781
914
|
}
|
|
782
915
|
if (literals.every((literal) => this.atoms.getAtom(literal) === null)) {
|
|
783
916
|
const boolVar = literals[literals.length - 1] >> 1;
|
|
784
917
|
this.undoUntil(() => this.bvalues[boolVar] !== L_UNDEF);
|
|
785
|
-
} else this.undoUntilLevel(this.
|
|
918
|
+
} else this.undoUntilLevel(this.findNewLevelArithLemma(literals));
|
|
786
919
|
if (
|
|
787
920
|
literals.length === conflict.literals.length &&
|
|
788
921
|
literals.every((literal, index) => literal === conflict.literals[index])
|
|
@@ -793,9 +926,7 @@ export class NlsatSolver {
|
|
|
793
926
|
return this.mkClause(literals, true, this.lemmaAssumptions);
|
|
794
927
|
}
|
|
795
928
|
|
|
796
|
-
|
|
797
|
-
// last, else the level below the current one.
|
|
798
|
-
private findNewLevel(literals: readonly number[]) {
|
|
929
|
+
private findNewLevelArithLemma(literals: readonly number[]) {
|
|
799
930
|
let level = -1;
|
|
800
931
|
for (const literal of literals.slice(0, -1))
|
|
801
932
|
if (this.atoms.getMaxVar(literal) === this.xk)
|
|
@@ -803,17 +934,21 @@ export class NlsatSolver {
|
|
|
803
934
|
return level === -1 ? this.scopeLevel - 1 : level;
|
|
804
935
|
}
|
|
805
936
|
|
|
806
|
-
|
|
937
|
+
private isRootLiteral(literal: number) {
|
|
938
|
+
const atom = this.atoms.getAtom(literal);
|
|
939
|
+
return atom !== null && !isIneqAtom(atom);
|
|
940
|
+
}
|
|
807
941
|
|
|
808
942
|
private canReorder() {
|
|
809
|
-
return
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
)
|
|
943
|
+
return (
|
|
944
|
+
this.isReordering &&
|
|
945
|
+
this.maxVar === NULL_VAR &&
|
|
946
|
+
[...this.learned, ...this.clauses].every((clause) =>
|
|
947
|
+
clause.literals.every((literal) => !this.isRootLiteral(literal)),
|
|
948
|
+
)
|
|
813
949
|
);
|
|
814
950
|
}
|
|
815
951
|
|
|
816
|
-
// apply_reorder
|
|
817
952
|
private applyReorder() {
|
|
818
953
|
this.isReordered = false;
|
|
819
954
|
if (!this.canReorder()) return;
|
|
@@ -821,7 +956,6 @@ export class NlsatSolver {
|
|
|
821
956
|
this.isReordered = true;
|
|
822
957
|
}
|
|
823
958
|
|
|
824
|
-
// heuristic_reorder: higher maximal degree first, then more occurrences, then a random order.
|
|
825
959
|
private reorderHeuristically() {
|
|
826
960
|
const count = this.isInt.length;
|
|
827
961
|
const maxDegrees = Array.from({ length: count }, () => 0);
|
|
@@ -840,7 +974,6 @@ export class NlsatSolver {
|
|
|
840
974
|
if (isIneqAtom(atom)) atom.polynomials.forEach(collect);
|
|
841
975
|
else collect(atom.polynomial);
|
|
842
976
|
}
|
|
843
|
-
// init_shuffle
|
|
844
977
|
const shuffle = Array.from({ length: count }, (_value, index) => index);
|
|
845
978
|
const random = new RandomGen(++this.randomSeed);
|
|
846
979
|
for (let index = count; index-- > 0;) {
|
|
@@ -858,13 +991,10 @@ export class NlsatSolver {
|
|
|
858
991
|
this.reorder(permutation);
|
|
859
992
|
}
|
|
860
993
|
|
|
861
|
-
|
|
862
|
-
// the watches.
|
|
863
|
-
private reorder(permutation: readonly number[]) {
|
|
994
|
+
reorder(permutation: readonly number[]) {
|
|
864
995
|
let kept = 0;
|
|
865
996
|
for (const clause of this.learned) {
|
|
866
|
-
if (clause.literals.some((literal) => this.
|
|
867
|
-
this.delClause(clause);
|
|
997
|
+
if (clause.literals.some((literal) => this.isRootLiteral(literal))) this.delClause(clause);
|
|
868
998
|
else this.learned[kept++] = clause;
|
|
869
999
|
}
|
|
870
1000
|
this.learned.length = kept;
|
|
@@ -878,22 +1008,23 @@ export class NlsatSolver {
|
|
|
878
1008
|
const invPerm = this.invPerm.map((variable) => permutation[variable]);
|
|
879
1009
|
for (const [external, internal] of invPerm.entries()) this.perm[internal] = external;
|
|
880
1010
|
const isInt = [...this.isInt];
|
|
881
|
-
for (const [variable,
|
|
1011
|
+
for (const [variable, isIntVariable] of isInt.entries())
|
|
1012
|
+
this.isInt[permutation[variable]] = isIntVariable;
|
|
882
1013
|
this.invPerm = invPerm;
|
|
883
1014
|
const polynomials = new Set<Polynomial>();
|
|
884
1015
|
for (const atom of this.atoms.atoms) {
|
|
885
|
-
if (atom === null
|
|
1016
|
+
if (atom === null) continue;
|
|
886
1017
|
if (isIneqAtom(atom)) for (const polynomial of atom.polynomials) polynomials.add(polynomial);
|
|
887
1018
|
else polynomials.add(atom.polynomial);
|
|
888
1019
|
}
|
|
889
1020
|
this.pm.rename(permutation, polynomials);
|
|
1021
|
+
this.transcendentals.rename(permutation);
|
|
890
1022
|
this.atoms.reinitCache();
|
|
891
1023
|
this.setAssignment(assignment);
|
|
892
1024
|
this.reattachArithClauses(this.clauses);
|
|
893
1025
|
this.reattachArithClauses(this.learned);
|
|
894
1026
|
}
|
|
895
1027
|
|
|
896
|
-
// restore_order
|
|
897
1028
|
restoreOrder() {
|
|
898
1029
|
this.reorder([...this.perm]);
|
|
899
1030
|
}
|
|
@@ -904,7 +1035,7 @@ export class NlsatSolver {
|
|
|
904
1035
|
|
|
905
1036
|
private reattachArithClauses(clauses: readonly Clause[]) {
|
|
906
1037
|
for (const clause of clauses) {
|
|
907
|
-
const variable = this.
|
|
1038
|
+
const variable = this.atoms.getMaxVarOfLiterals(clause.literals);
|
|
908
1039
|
if (variable !== NULL_VAR) this.watches[variable].push(clause);
|
|
909
1040
|
}
|
|
910
1041
|
}
|