tla-ts 0.0.9 → 0.0.10-dev.06b481ee0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +30 -1
- package/dist/compile.cjs +23 -0
- package/dist/compile.js +23 -0
- package/dist/deciders.cjs +41 -37
- package/dist/deciders.js +48 -44
- package/dist/index.cjs +1 -1
- package/dist/index.d.cts +122 -12
- package/dist/index.d.ts +122 -12
- package/dist/index.js +1 -1
- package/dist/parallel-worker.cjs +1 -1
- package/dist/parallel-worker.js +1 -1
- package/dist/prove-worker.cjs +1 -1
- package/dist/prove-worker.js +1 -1
- package/dist/prove.cjs +2746 -410
- package/dist/prove.js +2745 -409
- package/dist/run.cjs +144 -31
- package/dist/run.js +144 -31
- package/dist/tlapm.cjs +2 -2
- package/dist/tlapm.js +2 -2
- package/dist/transfer.cjs +134 -104
- package/dist/transfer.js +134 -104
- package/dist/worker.cjs +7 -7
- package/dist/worker.js +7 -7
- package/package.json +3 -1
- package/src/ast.ts +56 -60
- package/src/bags.ts +128 -110
- package/src/builtins.ts +31 -77
- package/src/bundled-modules.ts +1 -8
- package/src/check-failure.ts +118 -0
- package/src/check-trace.ts +320 -0
- package/src/check.ts +1156 -888
- package/src/cli/options.ts +12 -32
- package/src/cli/run.ts +0 -2
- package/src/cli/runtime-invariants.ts +100 -0
- package/src/cli/shared.ts +19 -12
- package/src/cli/tlapm.ts +433 -82
- package/src/cli/tlc-arguments.ts +652 -0
- package/src/cli/tlc-output.ts +701 -0
- package/src/cli/tlc-usage.ts +360 -0
- package/src/cli/tlc.ts +330 -659
- 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 +217 -82
- package/src/config.ts +140 -109
- package/src/coverage.ts +1019 -0
- package/src/dependencies.ts +101 -66
- package/src/dfid.ts +683 -0
- package/src/environment-config.ts +315 -0
- package/src/environment.ts +263 -370
- package/src/errors.ts +107 -57
- package/src/evaluate.ts +898 -369
- package/src/exit-codes.ts +63 -13
- package/src/fingerprints.ts +75 -11
- package/src/index.ts +3 -0
- package/src/instances.ts +137 -22
- package/src/java-hash.ts +21 -0
- package/src/java-overrides.ts +6 -21
- package/src/json-reader.ts +455 -0
- package/src/json.ts +252 -139
- package/src/levels.ts +231 -154
- package/src/lexer.ts +83 -101
- package/src/liveness-checker.ts +743 -322
- package/src/liveness.ts +230 -133
- package/src/obligations/action.ts +17 -44
- package/src/obligations/anonymize.ts +120 -95
- package/src/obligations/enabled-axioms.ts +218 -0
- package/src/obligations/equality.ts +1 -3
- package/src/obligations/expression.ts +37 -26
- package/src/obligations/format.ts +0 -10
- package/src/obligations/generate.ts +66 -64
- package/src/obligations/index.ts +39 -20
- package/src/obligations/levels.ts +27 -18
- package/src/obligations/module.ts +28 -55
- package/src/obligations/normalize.ts +31 -41
- package/src/obligations/operators.ts +0 -3
- package/src/obligations/pragma.ts +52 -24
- package/src/obligations/printer.ts +94 -63
- package/src/obligations/proof.ts +3 -6
- package/src/obligations/regroup.ts +0 -5
- package/src/obligations/simplify.ts +57 -63
- package/src/obligations/source.ts +121 -95
- package/src/obligations/subexpression.ts +49 -28
- package/src/obligations/substitution.ts +1 -5
- package/src/obligations/temporal.ts +12 -20
- package/src/obligations/tuples.ts +2 -10
- package/src/parallel-worker.ts +36 -60
- package/src/parallel.ts +64 -73
- package/src/parser.ts +1184 -531
- package/src/pcal/ast.ts +53 -86
- package/src/pcal/parse.ts +144 -219
- package/src/pcal/tokenize.ts +91 -131
- package/src/pcal/translate.ts +83 -130
- package/src/pcal/validate.ts +48 -68
- package/src/pretty-print.ts +7 -8
- package/src/prover/decide-pool.ts +8 -13
- package/src/prover/deciders.ts +12 -13
- package/src/prover/first-order.ts +0 -11
- package/src/prover/isabelle/decide.ts +3 -31
- package/src/prover/isabelle/encode.ts +82 -64
- package/src/prover/isabelle/isar/attrib.ts +250 -0
- package/src/prover/isabelle/isar/context.ts +335 -0
- package/src/prover/isabelle/isar/induct.ts +382 -0
- package/src/prover/isabelle/isar/inner-syntax.ts +262 -117
- package/src/prover/isabelle/isar/method.ts +510 -226
- package/src/prover/isabelle/isar/proof.ts +570 -23
- package/src/prover/isabelle/isar/rule-cases.ts +226 -0
- package/src/prover/isabelle/isar/theory.ts +488 -88
- package/src/prover/isabelle/isar/toplevel.ts +331 -0
- package/src/prover/isabelle/isar/type-check.ts +99 -38
- package/src/prover/isabelle/provers/blast/blast.ts +16 -105
- package/src/prover/isabelle/provers/blast/branch.ts +0 -33
- package/src/prover/isabelle/provers/blast/prove.ts +0 -36
- package/src/prover/isabelle/provers/blast/rules.ts +5 -45
- package/src/prover/isabelle/provers/blast/state.ts +1 -29
- package/src/prover/isabelle/provers/blast/term.ts +8 -37
- package/src/prover/isabelle/provers/clasimp.ts +1 -15
- package/src/prover/isabelle/provers/classical.ts +58 -61
- package/src/prover/isabelle/provers/hypsubst.ts +29 -54
- package/src/prover/isabelle/pure/bicompose.ts +24 -39
- package/src/prover/isabelle/pure/consts.ts +0 -8
- package/src/prover/isabelle/pure/conv.ts +2 -18
- package/src/prover/isabelle/pure/drule.ts +95 -45
- package/src/prover/isabelle/pure/envir.ts +2 -53
- package/src/prover/isabelle/pure/goal.ts +1 -9
- package/src/prover/isabelle/pure/interrupt.ts +0 -5
- package/src/prover/isabelle/pure/list.ts +0 -3
- package/src/prover/isabelle/pure/logic.ts +1 -16
- package/src/prover/isabelle/pure/name.ts +1 -10
- package/src/prover/isabelle/pure/net.ts +2 -60
- package/src/prover/isabelle/pure/object-logic.ts +15 -16
- package/src/prover/isabelle/pure/pattern.ts +1 -20
- package/src/prover/isabelle/pure/raw-simplifier.ts +16 -63
- package/src/prover/isabelle/pure/rewriter.ts +34 -77
- package/src/prover/isabelle/pure/search.ts +2 -11
- package/src/prover/isabelle/pure/seq.ts +0 -11
- package/src/prover/isabelle/pure/simplifier.ts +27 -16
- package/src/prover/isabelle/pure/table.ts +2 -33
- package/src/prover/isabelle/pure/tactic.ts +11 -23
- package/src/prover/isabelle/pure/tactical.ts +47 -48
- package/src/prover/isabelle/pure/term-ord.ts +1 -7
- package/src/prover/isabelle/pure/term.ts +4 -47
- package/src/prover/isabelle/pure/thm.ts +26 -48
- package/src/prover/isabelle/pure/type.ts +1 -16
- package/src/prover/isabelle/pure/unify.ts +19 -31
- package/src/prover/isabelle/pure/variable.ts +2 -8
- package/src/prover/isabelle/tla/classical-setup.ts +17 -25
- package/src/prover/isabelle/tla/context.ts +65 -26
- package/src/prover/isabelle/tla/logic-data.ts +1 -1
- package/src/prover/isabelle/tla/logic.ts +53 -32
- package/src/prover/isabelle/tla/simpdata.ts +45 -44
- package/src/prover/isabelle/tools/intuitionistic.ts +28 -21
- package/src/prover/ocaml.ts +4 -7
- package/src/prover/prep/action.ts +33 -66
- package/src/prover/prep/enabled-axioms.ts +22 -20
- package/src/prover/prep/fingerprint.ts +2 -21
- package/src/prover/prep/level-comparison.ts +8 -12
- package/src/prover/prep/md5.ts +26 -31
- package/src/prover/prep/methods.ts +189 -86
- package/src/prover/prep/normalize.ts +42 -37
- package/src/prover/prove-worker.ts +0 -2
- package/src/prover/prove.ts +398 -133
- package/src/prover/ptl/decide.ts +96 -56
- package/src/prover/ptl/encode.ts +15 -38
- package/src/prover/ptl/sat.ts +24 -32
- package/src/prover/ptl/tableau.ts +40 -28
- package/src/prover/smt/arithmetic.ts +310 -0
- package/src/prover/smt/axioms.ts +12 -15
- package/src/prover/smt/context.ts +60 -32
- package/src/prover/smt/data.ts +517 -401
- package/src/prover/smt/encode.ts +155 -85
- package/src/prover/smt/extensionality.ts +5 -13
- package/src/prover/smt/flatten.ts +7 -28
- package/src/prover/smt/format.ts +33 -14
- package/src/prover/smt/instances.ts +7 -11
- package/src/prover/smt/layout.ts +91 -0
- package/src/prover/smt/rewrite.ts +1021 -658
- package/src/prover/smt/simplify.ts +441 -0
- package/src/prover/smt/solver/ackermannize-bv-tactic.ts +61 -0
- package/src/prover/smt/solver/ackr-helper.ts +179 -0
- package/src/prover/smt/solver/ackr-model-converter.ts +105 -0
- package/src/prover/smt/solver/act-cache.ts +0 -16
- package/src/prover/smt/solver/add-bounds-tactic.ts +59 -0
- package/src/prover/smt/solver/aig-tactic.ts +52 -0
- package/src/prover/smt/solver/aig.ts +889 -0
- package/src/prover/smt/solver/arith-rewriter.ts +626 -56
- package/src/prover/smt/solver/arith-terms.ts +121 -0
- package/src/prover/smt/solver/array-decl-plugin.ts +175 -0
- package/src/prover/smt/solver/array-rewriter.ts +319 -0
- package/src/prover/smt/solver/array.ts +1 -3
- package/src/prover/smt/solver/asserted-formulas.ts +241 -99
- package/src/prover/smt/solver/ast-lt.ts +165 -21
- package/src/prover/smt/solver/ast-util.ts +160 -7
- package/src/prover/smt/solver/ast.ts +1480 -184
- package/src/prover/smt/solver/auf-solver.ts +30 -56
- package/src/prover/smt/solver/bit-blast-tactic.ts +608 -0
- package/src/prover/smt/solver/bit-blaster.ts +871 -0
- package/src/prover/smt/solver/blast-term-ite.ts +47 -0
- package/src/prover/smt/solver/bound-manager.ts +196 -0
- package/src/prover/smt/solver/bound-simplifier.ts +598 -0
- package/src/prover/smt/solver/bv-bound-chk.ts +492 -0
- package/src/prover/smt/solver/bv-decl-plugin.ts +341 -0
- package/src/prover/smt/solver/bv-divrem-bounds.ts +95 -0
- package/src/prover/smt/solver/bv-rewriter.ts +1901 -0
- package/src/prover/smt/solver/bv1-blast.ts +214 -0
- package/src/prover/smt/solver/bv2fpa-converter.ts +174 -0
- package/src/prover/smt/solver/bv2int-rewriter.ts +544 -0
- package/src/prover/smt/solver/bv2real-rewriter.ts +533 -0
- package/src/prover/smt/solver/card2bv.ts +127 -0
- package/src/prover/smt/solver/case-split-queue.ts +0 -10
- package/src/prover/smt/solver/cg-table.ts +39 -42
- package/src/prover/smt/solver/check-logic.ts +330 -0
- package/src/prover/smt/solver/clause.ts +0 -27
- package/src/prover/smt/solver/cofactor-elim-term-ite.ts +293 -0
- package/src/prover/smt/solver/conflict-resolution.ts +78 -11
- package/src/prover/smt/solver/context.ts +600 -187
- package/src/prover/smt/solver/ctx-simplify.ts +34 -52
- package/src/prover/smt/solver/ctx-solver-simplify.ts +122 -0
- package/src/prover/smt/solver/datatype-decl-plugin.ts +580 -0
- package/src/prover/smt/solver/datatype-rewriter.ts +82 -0
- package/src/prover/smt/solver/demodulator.ts +786 -0
- package/src/prover/smt/solver/dependent-expr-state.ts +93 -0
- package/src/prover/smt/solver/der.ts +39 -30
- package/src/prover/smt/solver/diff-neq.ts +205 -0
- package/src/prover/smt/solver/distribute-forall.ts +57 -0
- package/src/prover/smt/solver/dom-simplify.ts +511 -0
- package/src/prover/smt/solver/dt2bv-tactic.ts +296 -0
- package/src/prover/smt/solver/dyn-ack.ts +0 -11
- package/src/prover/smt/solver/e-matching.ts +9 -41
- package/src/prover/smt/solver/elim-bounds.ts +89 -0
- package/src/prover/smt/solver/elim-small-bv-tactic.ts +129 -0
- package/src/prover/smt/solver/elim-term-ite-tactic.ts +48 -0
- package/src/prover/smt/solver/elim-uncnstr.ts +542 -0
- package/src/prover/smt/solver/enode.ts +100 -23
- package/src/prover/smt/solver/eq2bv-tactic.ts +218 -0
- package/src/prover/smt/solver/euf/arith-axioms.ts +403 -0
- package/src/prover/smt/solver/euf/arith-internalize.ts +653 -0
- package/src/prover/smt/solver/euf/arith-solver.ts +889 -0
- package/src/prover/smt/solver/euf/array-axioms.ts +527 -0
- package/src/prover/smt/solver/euf/array-internalize.ts +428 -0
- package/src/prover/smt/solver/euf/array-solver.ts +306 -0
- package/src/prover/smt/solver/euf/bv-ackerman.ts +162 -0
- package/src/prover/smt/solver/euf/bv-internalize.ts +748 -0
- package/src/prover/smt/solver/euf/bv-solver.ts +449 -0
- package/src/prover/smt/solver/euf/dt-solver.ts +618 -0
- package/src/prover/smt/solver/euf/egraph.ts +901 -0
- package/src/prover/smt/solver/euf/euf-solver.ts +1204 -0
- package/src/prover/smt/solver/euf/fpa-solver.ts +317 -0
- package/src/prover/smt/solver/euf/mam.ts +1046 -0
- package/src/prover/smt/solver/euf/q-ematch.ts +829 -0
- package/src/prover/smt/solver/euf/q-mbi.ts +587 -0
- package/src/prover/smt/solver/euf/q-model-fixer.ts +296 -0
- package/src/prover/smt/solver/euf/q-solver.ts +361 -0
- package/src/prover/smt/solver/euf/th-solver.ts +328 -0
- package/src/prover/smt/solver/euf/th-solvers.ts +30 -0
- package/src/prover/smt/solver/expr-ref.ts +0 -5
- package/src/prover/smt/solver/expr-safe-replace.ts +26 -7
- package/src/prover/smt/solver/expr2polynomial.ts +271 -0
- package/src/prover/smt/solver/factor.ts +163 -0
- package/src/prover/smt/solver/fd-solver.ts +734 -0
- package/src/prover/smt/solver/fingerprints.ts +15 -26
- package/src/prover/smt/solver/fix-dl-var.ts +147 -0
- package/src/prover/smt/solver/flat-literals.ts +0 -9
- package/src/prover/smt/solver/fm-tactic.ts +884 -0
- package/src/prover/smt/solver/fpa-decl-plugin.ts +618 -0
- package/src/prover/smt/solver/fpa-rewriter.ts +639 -0
- package/src/prover/smt/solver/fpa2bv-converter.ts +2251 -0
- package/src/prover/smt/solver/fpa2bv-rewriter.ts +349 -0
- package/src/prover/smt/solver/fpa2bv-tactic.ts +73 -0
- package/src/prover/smt/solver/goal.ts +179 -28
- package/src/prover/smt/solver/goal2nlsat.ts +216 -0
- package/src/prover/smt/solver/guard-set.ts +219 -0
- package/src/prover/smt/solver/hash.ts +0 -9
- package/src/prover/smt/solver/hashtable.ts +30 -23
- package/src/prover/smt/solver/inf-eps.ts +63 -0
- package/src/prover/smt/solver/inj-axiom.ts +101 -0
- package/src/prover/smt/solver/internalizer.ts +113 -133
- package/src/prover/smt/solver/lackr.ts +381 -0
- package/src/prover/smt/solver/lbool.ts +0 -2
- package/src/prover/smt/solver/lia2card.ts +268 -0
- package/src/prover/smt/solver/lia2pb.ts +154 -0
- package/src/prover/smt/solver/literal.ts +0 -4
- package/src/prover/smt/solver/logic-tactics.ts +355 -0
- package/src/prover/smt/solver/lp/bound-propagator.ts +7 -26
- package/src/prover/smt/solver/lp/constraints.ts +1 -8
- package/src/prover/smt/solver/lp/containers.ts +18 -31
- package/src/prover/smt/solver/lp/core-solver.ts +35 -37
- package/src/prover/smt/solver/lp/cross-nested.ts +4 -21
- package/src/prover/smt/solver/lp/dep-intervals.ts +6 -24
- package/src/prover/smt/solver/lp/dependency.ts +0 -5
- package/src/prover/smt/solver/lp/dioph-eq.ts +8 -103
- package/src/prover/smt/solver/lp/explanation.ts +0 -6
- package/src/prover/smt/solver/lp/gomory.ts +8 -22
- package/src/prover/smt/solver/lp/hnf-cutter.ts +16 -23
- package/src/prover/smt/solver/lp/hnf.ts +10 -28
- package/src/prover/smt/solver/lp/int-cube.ts +17 -39
- package/src/prover/smt/solver/lp/int-solver.ts +3 -35
- package/src/prover/smt/solver/lp/lar-solver.ts +70 -83
- package/src/prover/smt/solver/lp/lar-term.ts +0 -5
- package/src/prover/smt/solver/lp/lp-settings.ts +6 -16
- package/src/prover/smt/solver/lp/maximize-term.ts +76 -52
- package/src/prover/smt/solver/lp/nex-creator.ts +7 -30
- package/src/prover/smt/solver/lp/nex.ts +2 -7
- package/src/prover/smt/solver/lp/nla-backoff.ts +0 -5
- package/src/prover/smt/solver/lp/nla-basics.ts +48 -30
- package/src/prover/smt/solver/lp/nla-core.ts +92 -136
- package/src/prover/smt/solver/lp/nla-divisions.ts +31 -43
- package/src/prover/smt/solver/lp/nla-emonics.ts +3 -21
- package/src/prover/smt/solver/lp/nla-factorization.ts +0 -4
- package/src/prover/smt/solver/lp/nla-grobner.ts +177 -149
- package/src/prover/smt/solver/lp/nla-horner.ts +2 -12
- package/src/prover/smt/solver/lp/nla-intervals.ts +1 -12
- package/src/prover/smt/solver/lp/nla-monomial-bounds.ts +15 -42
- package/src/prover/smt/solver/lp/nla-monotone.ts +1 -6
- package/src/prover/smt/solver/lp/nla-order.ts +0 -13
- package/src/prover/smt/solver/lp/nla-patcher.ts +3 -7
- package/src/prover/smt/solver/lp/nla-powers.ts +220 -0
- package/src/prover/smt/solver/lp/nla-tangents.ts +0 -10
- package/src/prover/smt/solver/lp/nla-throttle.ts +0 -6
- package/src/prover/smt/solver/lp/nla-transcendentals.ts +324 -0
- package/src/prover/smt/solver/lp/nla-types.ts +0 -12
- package/src/prover/smt/solver/lp/nla-var-eqs.ts +4 -26
- package/src/prover/smt/solver/lp/nra-solver.ts +164 -147
- package/src/prover/smt/solver/lp/numeric-pair.ts +0 -4
- package/src/prover/smt/solver/lp/pdd-interval.ts +6 -5
- package/src/prover/smt/solver/lp/pdd-simplifier.ts +61 -34
- package/src/prover/smt/solver/lp/pdd-solver.ts +74 -72
- package/src/prover/smt/solver/lp/pdd.ts +730 -358
- package/src/prover/smt/solver/lp/random-updater.ts +0 -9
- package/src/prover/smt/solver/lp/static-matrix.ts +8 -19
- package/src/prover/smt/solver/lp/union-find.ts +5 -5
- package/src/prover/smt/solver/macro-finder.ts +530 -0
- package/src/prover/smt/solver/mam-compiler.ts +129 -139
- package/src/prover/smt/solver/mam-interpreter.ts +0 -21
- package/src/prover/smt/solver/max-bv-sharing-tactic.ts +17 -0
- package/src/prover/smt/solver/max-cliques.ts +105 -0
- package/src/prover/smt/solver/maxcore.ts +310 -0
- package/src/prover/smt/solver/maximize-ac-sharing.ts +8 -21
- package/src/prover/smt/solver/maxlex.ts +115 -0
- package/src/prover/smt/solver/maxsmt-base.ts +106 -0
- package/src/prover/smt/solver/maxsmt.ts +92 -0
- package/src/prover/smt/solver/mbp/mbp-arith.ts +467 -0
- package/src/prover/smt/solver/mbp/mbp-basic-tg.ts +101 -0
- package/src/prover/smt/solver/mbp/mbp-plugin.ts +287 -0
- package/src/prover/smt/solver/mbp/mbp-qel.ts +48 -0
- package/src/prover/smt/solver/mbp/mbp-solve-plugin.ts +271 -0
- package/src/prover/smt/solver/mbp/mbp-term-graph.ts +606 -0
- package/src/prover/smt/solver/model-based-opt.ts +844 -0
- package/src/prover/smt/solver/model-checker.ts +20 -63
- package/src/prover/smt/solver/model-evaluator.ts +192 -40
- package/src/prover/smt/solver/model-finder.ts +14 -32
- package/src/prover/smt/solver/model-generator.ts +104 -46
- package/src/prover/smt/solver/model-macro-solver.ts +60 -114
- package/src/prover/smt/solver/model-printer.ts +214 -0
- package/src/prover/smt/solver/mpf.ts +709 -0
- package/src/prover/smt/solver/mus.ts +50 -0
- package/src/prover/smt/solver/muz/dl-context.ts +382 -0
- package/src/prover/smt/solver/muz/dl-mk-bit-blast.ts +97 -0
- package/src/prover/smt/solver/muz/dl-mk-coi-filter.ts +167 -0
- package/src/prover/smt/solver/muz/dl-mk-elim-term-ite.ts +125 -0
- package/src/prover/smt/solver/muz/dl-mk-interp-tail-simplifier.ts +299 -0
- package/src/prover/smt/solver/muz/dl-mk-rule-inliner.ts +455 -0
- package/src/prover/smt/solver/muz/dl-mk-slice.ts +340 -0
- package/src/prover/smt/solver/muz/dl-mk-subsumption-checker.ts +163 -0
- package/src/prover/smt/solver/muz/dl-rule-set.ts +273 -0
- package/src/prover/smt/solver/muz/dl-rule-transformer.ts +123 -0
- package/src/prover/smt/solver/muz/dl-rule.ts +495 -0
- package/src/prover/smt/solver/muz/hnf.ts +201 -0
- package/src/prover/smt/solver/muz/horn-subsume-model-converter.ts +176 -0
- package/src/prover/smt/solver/muz/horn-tactic.ts +214 -0
- package/src/prover/smt/solver/muz/rule-properties.ts +359 -0
- package/src/prover/smt/solver/muz/spacer-context.ts +1404 -0
- package/src/prover/smt/solver/muz/spacer-dl-interface.ts +52 -0
- package/src/prover/smt/solver/muz/spacer-generalizers.ts +241 -0
- package/src/prover/smt/solver/muz/spacer-manager.ts +127 -0
- package/src/prover/smt/solver/muz/spacer-pdr.ts +219 -0
- package/src/prover/smt/solver/muz/spacer-prop-solver.ts +333 -0
- package/src/prover/smt/solver/muz/spacer-util.ts +282 -0
- package/src/prover/smt/solver/muz/substitution.ts +203 -0
- package/src/prover/smt/solver/nla2bv-tactic.ts +285 -0
- package/src/prover/smt/solver/nlqsat.ts +484 -0
- package/src/prover/smt/solver/nlsat/algebraic.ts +357 -236
- package/src/prover/smt/solver/nlsat/atoms.ts +73 -54
- package/src/prover/smt/solver/nlsat/evaluator.ts +16 -22
- package/src/prover/smt/solver/nlsat/explain.ts +429 -275
- package/src/prover/smt/solver/nlsat/interval-set.ts +9 -51
- package/src/prover/smt/solver/nlsat/levelwise.ts +477 -344
- package/src/prover/smt/solver/nlsat/mpbq.ts +47 -14
- package/src/prover/smt/solver/nlsat/polynomial.ts +2385 -832
- package/src/prover/smt/solver/nlsat/solver.ts +297 -156
- package/src/prover/smt/solver/nlsat/transcendental-eval.ts +310 -0
- package/src/prover/smt/solver/nlsat/transcendentals.ts +391 -0
- package/src/prover/smt/solver/nlsat/types.ts +0 -9
- package/src/prover/smt/solver/nlsat/upolynomial-factorization.ts +9 -51
- package/src/prover/smt/solver/nlsat/upolynomial.ts +49 -109
- package/src/prover/smt/solver/nlsat-tactic.ts +82 -0
- package/src/prover/smt/solver/nnf.ts +112 -61
- package/src/prover/smt/solver/normalize-bounds.ts +53 -0
- package/src/prover/smt/solver/occf.ts +97 -0
- package/src/prover/smt/solver/opt-context.ts +801 -0
- package/src/prover/smt/solver/opt-nlsat.ts +386 -0
- package/src/prover/smt/solver/opt-pareto.ts +301 -0
- package/src/prover/smt/solver/opt-preprocess.ts +101 -0
- package/src/prover/smt/solver/opt-solver.ts +312 -0
- package/src/prover/smt/solver/opt-value.ts +55 -0
- package/src/prover/smt/solver/optsmt.ts +692 -0
- package/src/prover/smt/solver/parallel-tactic.ts +299 -0
- package/src/prover/smt/solver/pattern-inference.ts +21 -26
- package/src/prover/smt/solver/pb-rewriter.ts +281 -0
- package/src/prover/smt/solver/pb2bv-tactic.ts +540 -0
- package/src/prover/smt/solver/poly-rewriter.ts +261 -79
- package/src/prover/smt/solver/probes.ts +577 -0
- package/src/prover/smt/solver/propagate-values.ts +37 -30
- package/src/prover/smt/solver/proto-model.ts +650 -66
- package/src/prover/smt/solver/pull-quant.ts +28 -23
- package/src/prover/smt/solver/purify-arith.ts +632 -0
- package/src/prover/smt/solver/push-app-ite.ts +37 -0
- package/src/prover/smt/solver/qe-arith-plugin.ts +1096 -0
- package/src/prover/smt/solver/qe-lite-der.ts +2 -31
- package/src/prover/smt/solver/qe-lite-fm.ts +4 -28
- package/src/prover/smt/solver/qe-lite.ts +41 -51
- package/src/prover/smt/solver/qe-mbp.ts +270 -0
- package/src/prover/smt/solver/qe.ts +1499 -0
- package/src/prover/smt/solver/qel.ts +25 -0
- package/src/prover/smt/solver/qi-queue.ts +0 -16
- package/src/prover/smt/solver/qsat.ts +829 -0
- package/src/prover/smt/solver/quant-hoist.ts +196 -0
- package/src/prover/smt/solver/quant-tactics.ts +17 -74
- package/src/prover/smt/solver/quantifier-analyzer.ts +26 -47
- package/src/prover/smt/solver/quantifier-manager.ts +22 -32
- package/src/prover/smt/solver/quasi-macros.ts +243 -0
- package/src/prover/smt/solver/random-gen.ts +0 -2
- package/src/prover/smt/solver/rational.ts +45 -8
- package/src/prover/smt/solver/recfun-decl-plugin.ts +262 -0
- package/src/prover/smt/solver/recfun-rewriter.ts +107 -0
- package/src/prover/smt/solver/reduce-args.ts +225 -0
- package/src/prover/smt/solver/reduce-bv-size.ts +119 -0
- package/src/prover/smt/solver/ref-vector.ts +0 -6
- package/src/prover/smt/solver/relevancy.ts +2 -16
- package/src/prover/smt/solver/rewriter-tpl.ts +59 -135
- package/src/prover/smt/solver/rewriter.ts +507 -144
- package/src/prover/smt/solver/rlimit.ts +46 -24
- package/src/prover/smt/solver/sat/asymm-branch.ts +325 -0
- package/src/prover/smt/solver/sat/big.ts +177 -0
- package/src/prover/smt/solver/sat/clause-use-list.ts +71 -0
- package/src/prover/smt/solver/sat/clause.ts +203 -0
- package/src/prover/smt/solver/sat/cleaner.ts +94 -0
- package/src/prover/smt/solver/sat/config.ts +122 -0
- package/src/prover/smt/solver/sat/consequences.ts +203 -0
- package/src/prover/smt/solver/sat/elim-eqs.ts +142 -0
- package/src/prover/smt/solver/sat/goal2sat.ts +579 -0
- package/src/prover/smt/solver/sat/inc-sat-solver.ts +464 -0
- package/src/prover/smt/solver/sat/model-converter.ts +136 -0
- package/src/prover/smt/solver/sat/pb-constraint.ts +268 -0
- package/src/prover/smt/solver/sat/pb-solver.ts +1596 -0
- package/src/prover/smt/solver/sat/probing.ts +170 -0
- package/src/prover/smt/solver/sat/sat-tactic.ts +53 -0
- package/src/prover/smt/solver/sat/sat2goal.ts +189 -0
- package/src/prover/smt/solver/sat/scc.ts +142 -0
- package/src/prover/smt/solver/sat/simplifier.ts +1618 -0
- package/src/prover/smt/solver/sat/solver.ts +2107 -0
- package/src/prover/smt/solver/sat/var-queue.ts +117 -0
- package/src/prover/smt/solver/sat/watch-list.ts +140 -0
- package/src/prover/smt/solver/search-tree.ts +284 -0
- package/src/prover/smt/solver/seq-axioms.ts +995 -0
- package/src/prover/smt/solver/seq-decl-plugin.ts +819 -0
- package/src/prover/smt/solver/seq-derive.ts +1298 -0
- package/src/prover/smt/solver/seq-eq-approx.ts +236 -0
- package/src/prover/smt/solver/seq-eq-solver.ts +439 -0
- package/src/prover/smt/solver/seq-factory.ts +89 -0
- package/src/prover/smt/solver/seq-monadic.ts +730 -0
- package/src/prover/smt/solver/seq-range-predicate.ts +235 -0
- package/src/prover/smt/solver/seq-re-rewriter.ts +1171 -0
- package/src/prover/smt/solver/seq-re-util.ts +758 -0
- package/src/prover/smt/solver/seq-regex-bisim.ts +144 -0
- package/src/prover/smt/solver/seq-regex-live.ts +200 -0
- package/src/prover/smt/solver/seq-rewriter.ts +2404 -0
- package/src/prover/smt/solver/seq-skolem.ts +294 -0
- package/src/prover/smt/solver/seq-subset.ts +165 -0
- package/src/prover/smt/solver/seq-view-witness.ts +353 -0
- package/src/prover/smt/solver/smt-consequences.ts +297 -0
- package/src/prover/smt/solver/smt-kernel.ts +124 -0
- package/src/prover/smt/solver/smt-logics.ts +66 -0
- package/src/prover/smt/solver/smt-setup.ts +589 -0
- package/src/prover/smt/solver/smt2-printer.ts +765 -0
- package/src/prover/smt/solver/smtlib-parser.ts +3546 -406
- package/src/prover/smt/solver/smtlib-script.ts +2134 -0
- package/src/prover/smt/solver/solve-eqs.ts +928 -0
- package/src/prover/smt/solver/solver.ts +135 -40
- package/src/prover/smt/solver/sort.ts +1 -5
- package/src/prover/smt/solver/static-features.ts +314 -0
- package/src/prover/smt/solver/sticky-generations.ts +0 -6
- package/src/prover/smt/solver/tactic.ts +2141 -0
- package/src/prover/smt/solver/term-enumeration.ts +205 -0
- package/src/prover/smt/solver/theory-array.ts +1240 -0
- package/src/prover/smt/solver/theory-bv.ts +1210 -0
- package/src/prover/smt/solver/theory-char.ts +355 -0
- package/src/prover/smt/solver/theory-datatype.ts +598 -0
- package/src/prover/smt/solver/theory-finite-set.ts +30 -0
- package/src/prover/smt/solver/theory-fpa.ts +389 -0
- package/src/prover/smt/solver/theory-lra-axioms.ts +55 -25
- package/src/prover/smt/solver/theory-lra-bounds.ts +31 -11
- package/src/prover/smt/solver/theory-lra-final-check.ts +60 -91
- package/src/prover/smt/solver/theory-lra-internalize.ts +96 -53
- package/src/prover/smt/solver/theory-lra-model.ts +23 -53
- package/src/prover/smt/solver/theory-lra-propagate.ts +34 -42
- package/src/prover/smt/solver/theory-lra-state.ts +7 -28
- package/src/prover/smt/solver/theory-lra.ts +189 -9
- package/src/prover/smt/solver/theory-pb.ts +951 -0
- package/src/prover/smt/solver/theory-polymorphism.ts +58 -0
- package/src/prover/smt/solver/theory-recfun.ts +307 -0
- package/src/prover/smt/solver/theory-seq-regex.ts +867 -0
- package/src/prover/smt/solver/theory-seq-solve.ts +1373 -0
- package/src/prover/smt/solver/theory-seq-state.ts +852 -0
- package/src/prover/smt/solver/theory-seq.ts +961 -0
- package/src/prover/smt/solver/theory-without-terms.ts +24 -0
- package/src/prover/smt/solver/theory.ts +189 -0
- package/src/prover/smt/solver/tseitin-cnf.ts +486 -0
- package/src/prover/smt/solver/var-subst.ts +37 -39
- package/src/prover/smt/table.ts +3 -10
- package/src/prover/smt/types.ts +146 -0
- package/src/prover/tlapm/cache.ts +74 -48
- package/src/prover/tlapm/ocaml-marshal.ts +19 -21
- package/src/prover/tlapm/tlapm.ts +21 -20
- package/src/prover/tlapm-library.ts +3208 -0
- package/src/prover/verdict.ts +9 -2
- package/src/prover/zenon/check/check.ts +1 -11
- package/src/prover/zenon/check/definitions.ts +5 -15
- package/src/prover/zenon/check/equality.ts +0 -8
- package/src/prover/zenon/check/functions.ts +0 -4
- package/src/prover/zenon/check/keys.ts +0 -7
- package/src/prover/zenon/check/propositional.ts +0 -3
- package/src/prover/zenon/check/records.ts +1 -6
- package/src/prover/zenon/check/relations.ts +2 -14
- package/src/prover/zenon/check/rewrites.ts +2 -21
- package/src/prover/zenon/check/sets.ts +40 -61
- package/src/prover/zenon/check/terms.ts +1 -19
- package/src/prover/zenon/check/tla.ts +0 -6
- package/src/prover/zenon/decide.ts +10 -19
- package/src/prover/zenon/encode.ts +0 -9
- package/src/prover/zenon/eqrel.ts +2 -15
- package/src/prover/zenon/equality-rules.ts +24 -6
- package/src/prover/zenon/expr.ts +29 -28
- package/src/prover/zenon/index-table.ts +33 -61
- package/src/prover/zenon/isar-case.ts +9 -21
- package/src/prover/zenon/isar.ts +37 -67
- package/src/prover/zenon/limits.ts +0 -4
- package/src/prover/zenon/llproof.ts +2 -22
- package/src/prover/zenon/mltoll.ts +66 -106
- package/src/prover/zenon/node.ts +20 -15
- package/src/prover/zenon/ocaml.ts +1 -17
- package/src/prover/zenon/parse.ts +9 -13
- package/src/prover/zenon/phrase.ts +2 -14
- package/src/prover/zenon/proof.ts +0 -11
- package/src/prover/zenon/propositional-rules.ts +0 -7
- package/src/prover/zenon/rules.ts +3 -8
- package/src/prover/zenon/search.ts +11 -35
- package/src/prover/zenon/tla/functions.ts +59 -33
- package/src/prover/zenon/tla/llproof.ts +67 -78
- package/src/prover/zenon/tla/records.ts +57 -35
- package/src/prover/zenon/tla/rewrites.ts +12 -21
- package/src/prover/zenon/tla/sets.ts +88 -59
- package/src/prover/zenon/tla/terms.ts +0 -8
- package/src/prover/zenon/tla/tla.ts +66 -66
- package/src/randomization.ts +81 -35
- package/src/resolve.ts +1132 -430
- package/src/runtime.ts +33 -23
- package/src/sany/builtins.ts +11 -14
- package/src/sany/generation.ts +383 -0
- package/src/sany/generator-def-entries.ts +210 -0
- package/src/sany/generator-definitions.ts +688 -0
- package/src/sany/generator-expressions.ts +1108 -0
- package/src/sany/generator-proofs.ts +665 -0
- package/src/sany/generator.ts +192 -2764
- package/src/sany/levels.ts +5 -35
- package/src/sany/lexer.ts +61 -80
- package/src/sany/linter.ts +0 -10
- package/src/sany/modules.ts +5 -7
- package/src/sany/nodes.ts +6 -44
- package/src/sany/parse-error.ts +39 -117
- package/src/sany/report.ts +32 -69
- package/src/sany/selectors.ts +60 -82
- package/src/sany/source.ts +1 -17
- package/src/sany/xml.ts +37 -120
- package/src/search.ts +913 -227
- package/src/simulate.ts +765 -0
- package/src/spec-description.ts +198 -104
- package/src/standard-definitions.ts +4 -4
- package/src/standard-modules.ts +302 -99
- package/src/state-graph.ts +52 -33
- package/src/subexpressions.ts +578 -166
- package/src/substitution-levels.ts +7 -7
- package/src/successors.ts +299 -108
- package/src/symmetry.ts +37 -28
- package/src/tableau.ts +29 -26
- package/src/tlc/fingerprint.ts +267 -79
- package/src/tlc/jar-data.ts +122 -6
- package/src/tlc/messages.ts +127 -56
- package/src/tlc/order.ts +53 -72
- package/src/tlc/random.ts +38 -49
- package/src/tlc/replay.ts +579 -230
- package/src/tlc/summary.ts +64 -60
- package/src/tlc/tlc-operators.ts +83 -47
- package/src/tlc/tlcext-operators.ts +205 -127
- package/src/tlc/trace-spec.ts +235 -0
- package/src/tlc/value-stream.ts +139 -0
- package/src/tlc/version.ts +1 -4
- package/src/trace-liveness.ts +529 -0
- package/src/transfer.ts +22 -25
- package/src/typed-tier.ts +6556 -0
- package/src/typescript/actions.ts +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 +945 -526
- 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,24 +1,27 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
// lemmas become clauses.
|
|
4
|
-
import { OP_ADD, OP_GE, OP_LE, OP_MUL, OP_TO_REAL, SORT_BOOL, SORT_INT, SORT_REAL } from "./ast";
|
|
5
|
-
import { FC_CONTINUE, FC_DONE, FC_GIVEUP } from "./context";
|
|
1
|
+
import { OP_POWER, OP_POWER0 } from "./ast";
|
|
2
|
+
import { FC_CONTINUE, FC_DONE, FC_GIVEUP } from "./theory";
|
|
6
3
|
import { TheoryJustification } from "./enode";
|
|
7
4
|
import { L_FALSE, L_TRUE, L_UNDEF } from "./lbool";
|
|
8
5
|
import { getVar, Literal, negate } from "./literal";
|
|
9
|
-
import {
|
|
6
|
+
import { Rational } from "./rational";
|
|
7
|
+
import { mkBoundAtom, mkTermEqSides } from "./arith-terms";
|
|
10
8
|
import { KIND_EQ, KIND_GE, KIND_GT, KIND_LT, KIND_NE } from "./lp/constraints";
|
|
11
|
-
import { Explanation } from "./lp/explanation";
|
|
9
|
+
import type { Explanation } from "./lp/explanation";
|
|
12
10
|
import { IntSolver } from "./lp/int-solver";
|
|
13
11
|
import type { LarTerm } from "./lp/lar-term";
|
|
14
|
-
import { NlaCore } from "./lp/nla-core";
|
|
15
|
-
import { Ineq, Lemma } from "./lp/nla-types";
|
|
12
|
+
import type { NlaCore } from "./lp/nla-core";
|
|
13
|
+
import type { Ineq, Lemma } from "./lp/nla-types";
|
|
16
14
|
import { TheoryLraModel } from "./theory-lra-model";
|
|
17
15
|
|
|
18
16
|
export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
19
17
|
private lia = new IntSolver(this.solver);
|
|
20
18
|
|
|
21
|
-
|
|
19
|
+
// Level 2 also runs nlsat's full check.
|
|
20
|
+
override numFinalCheckLevels() {
|
|
21
|
+
return 2;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
override finalCheckEh(level: number) {
|
|
22
25
|
const context = this.context;
|
|
23
26
|
if (this.propagateCore()) return FC_CONTINUE;
|
|
24
27
|
this.isModelInitialized = false;
|
|
@@ -37,19 +40,52 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
37
40
|
let result = FC_DONE;
|
|
38
41
|
const nlaStatus = this.checkNla(level);
|
|
39
42
|
if (nlaStatus === FC_CONTINUE) return FC_CONTINUE;
|
|
40
|
-
// Nonlinear bound optimization may invalidate integer feasibility.
|
|
41
43
|
if (nlaStatus === FC_DONE && !this.nla?.isUsingNraModel && solver.hasInfInt())
|
|
42
44
|
return FC_CONTINUE;
|
|
43
45
|
if (nlaStatus === FC_GIVEUP) result = FC_GIVEUP;
|
|
44
46
|
if (this.assumeEqs()) return FC_CONTINUE;
|
|
45
47
|
if (this.unsupportedTerms.length > 0) this.initVariableValues();
|
|
46
|
-
|
|
47
|
-
|
|
48
|
+
for (const term of this.unsupportedTerms) {
|
|
49
|
+
if (!context.isRelevant(term)) continue;
|
|
50
|
+
const status = this.evalUnsupported(term);
|
|
51
|
+
if (status === FC_CONTINUE) return FC_CONTINUE;
|
|
52
|
+
if (status === FC_GIVEUP) result = FC_GIVEUP;
|
|
53
|
+
}
|
|
54
|
+
return result;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
private evalUnsupported(term: number) {
|
|
58
|
+
const manager = this.manager;
|
|
59
|
+
const op = manager.getOp(term);
|
|
60
|
+
if (op === OP_POWER0) return FC_DONE;
|
|
61
|
+
if (op !== OP_POWER) return FC_GIVEUP;
|
|
62
|
+
const base = manager.getArg(term, 0);
|
|
63
|
+
const exponent = manager.getArg(term, 1);
|
|
64
|
+
const isZero = (expr: number) =>
|
|
65
|
+
manager.isNumeral(expr) && manager.getRationalValue(expr).isZero();
|
|
66
|
+
if (isZero(base) && isZero(exponent)) return FC_DONE;
|
|
67
|
+
const nla = this.nla;
|
|
68
|
+
if (nla === undefined) return FC_GIVEUP;
|
|
69
|
+
const status = nla.checkPower(
|
|
70
|
+
this.getLpVar(term),
|
|
71
|
+
this.getLpVar(base),
|
|
72
|
+
this.getLpVar(exponent),
|
|
73
|
+
);
|
|
74
|
+
if (status === L_TRUE) return FC_DONE;
|
|
75
|
+
if (status === L_FALSE) {
|
|
76
|
+
this.addLemmas(nla);
|
|
77
|
+
return FC_CONTINUE;
|
|
78
|
+
}
|
|
79
|
+
return FC_GIVEUP;
|
|
48
80
|
}
|
|
49
81
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
82
|
+
private getLpVar(expr: number) {
|
|
83
|
+
const thVar = this.mkVar(expr);
|
|
84
|
+
this.solver.registerExistingTerms();
|
|
85
|
+
return this.registerVar(thVar);
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
protected checkNla(level: number) {
|
|
53
89
|
if (this.context.checkCanceled()) return FC_GIVEUP;
|
|
54
90
|
const nla = this.nla;
|
|
55
91
|
if (nla === undefined || !nla.hasRelevantMonomial()) return FC_DONE;
|
|
@@ -61,7 +97,6 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
61
97
|
return status === L_TRUE ? FC_DONE : FC_GIVEUP;
|
|
62
98
|
}
|
|
63
99
|
|
|
64
|
-
// check_idiv_bounds: the lemmas of the bounded divisions.
|
|
65
100
|
private checkIdivBounds() {
|
|
66
101
|
const nla = this.nla;
|
|
67
102
|
if (nla === undefined) return true;
|
|
@@ -70,7 +105,6 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
70
105
|
return nla.lemmas.length === 0;
|
|
71
106
|
}
|
|
72
107
|
|
|
73
|
-
// propagate_nla and incremental_propagate_nla: the bounds nla derives for monomials.
|
|
74
108
|
protected propagateNla(isIncremental: boolean) {
|
|
75
109
|
const nla = this.nla;
|
|
76
110
|
if (nla === undefined) return;
|
|
@@ -91,13 +125,13 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
91
125
|
this.context.setTrueFirstFlag(getVar(literal));
|
|
92
126
|
}
|
|
93
127
|
for (const lemma of nla.lemmas) this.falseCaseOfCheckNla(lemma);
|
|
128
|
+
if (!this.isPropagatingEqs()) return;
|
|
94
129
|
for (const equality of nla.fixedEqualities)
|
|
95
130
|
this.addEquality(equality.lpVar, equality.value, equality.explanation);
|
|
96
131
|
for (const equality of nla.equalities)
|
|
97
132
|
this.addEq(equality.first, equality.second, equality.explanation, false);
|
|
98
133
|
}
|
|
99
134
|
|
|
100
|
-
// add_equality: a column fixed to a value, equal to the variable of the value's numeral.
|
|
101
135
|
private addEquality(column: number, value: Rational, explanation: Explanation) {
|
|
102
136
|
const thVar = value.equals(Rational.one)
|
|
103
137
|
? this.oneVar
|
|
@@ -108,9 +142,7 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
108
142
|
this.addEq(this.registerVar(thVar), column, explanation, true);
|
|
109
143
|
}
|
|
110
144
|
|
|
111
|
-
// mk_literal: the literal of an inequality of nla, over a bound or equality atom.
|
|
112
145
|
private mkNlaLiteral(ineq: Ineq) {
|
|
113
|
-
// scoped_auxiliary: the bounds of the atom are auxiliary constraints.
|
|
114
146
|
const constraints = this.solver.constraints;
|
|
115
147
|
constraints.isAuxiliaryMode = true;
|
|
116
148
|
const literal = this.mkNlaLiteralCore(ineq);
|
|
@@ -130,23 +162,16 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
130
162
|
return kind === KIND_LT || kind === KIND_GT ? negate(literal) : literal;
|
|
131
163
|
}
|
|
132
164
|
|
|
133
|
-
// mk_eq: the atom term = offset.
|
|
134
165
|
private mkTermEq(term: LarTerm, offset: Rational) {
|
|
135
166
|
const manager = this.manager;
|
|
136
|
-
const
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
const left = this.coeffsToApp(coeffs, isInt);
|
|
140
|
-
const right = manager.mkNumeralOfSort(offset, isInt ? SORT_INT : SORT_REAL);
|
|
141
|
-
if (left === right) return manager.trueExpr;
|
|
142
|
-
const atom = manager.mkEq(left, right);
|
|
167
|
+
const sides = mkTermEqSides(manager, this.solver, term, offset, (thVar) => this.getExpr(thVar));
|
|
168
|
+
if (sides[0] === sides[1]) return manager.trueExpr;
|
|
169
|
+
const atom = manager.mkEq(sides[0], sides[1]);
|
|
143
170
|
this.context.internalize(atom, true);
|
|
144
171
|
this.context.markAsRelevant(atom);
|
|
145
172
|
return atom;
|
|
146
173
|
}
|
|
147
174
|
|
|
148
|
-
// false_case_of_check_nla and set_conflict_or_lemma: the lemma as a theory axiom, unless one of
|
|
149
|
-
// its literals is already true.
|
|
150
175
|
private falseCaseOfCheckNla(lemma: Lemma) {
|
|
151
176
|
const context = this.context;
|
|
152
177
|
const literals = lemma.ineqs.map((ineq) => negate(this.mkNlaLiteral(ineq)));
|
|
@@ -164,7 +189,6 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
164
189
|
context.mkThAxiom(clause);
|
|
165
190
|
}
|
|
166
191
|
|
|
167
|
-
// check_lia: whether the integer solver found the integer columns integral.
|
|
168
192
|
private isLiaSat() {
|
|
169
193
|
if (this.context.checkCanceled()) return false;
|
|
170
194
|
const move = this.lia.check();
|
|
@@ -175,7 +199,7 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
175
199
|
const atom = this.mkBound(this.lia.term, move.offset, !move.isUpper);
|
|
176
200
|
this.context.assign(
|
|
177
201
|
this.context.getLiteral(atom),
|
|
178
|
-
new TheoryJustification(this.coreLiterals, []),
|
|
202
|
+
new TheoryJustification(this.id, this.coreLiterals, []),
|
|
179
203
|
);
|
|
180
204
|
} else if (move.kind === "conflict") {
|
|
181
205
|
this.explanation.clear();
|
|
@@ -185,68 +209,13 @@ export abstract class TheoryLraFinalCheck extends TheoryLraModel {
|
|
|
185
209
|
return move.kind === "sat";
|
|
186
210
|
}
|
|
187
211
|
|
|
188
|
-
|
|
189
|
-
private mkBound(lpTerm: LarTerm, inputOffset: Rational, inputIsLower: boolean) {
|
|
190
|
-
const manager = this.manager;
|
|
212
|
+
private mkBound(lpTerm: LarTerm, offset: Rational, isLower: boolean) {
|
|
191
213
|
const context = this.context;
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
let isLower = inputIsLower;
|
|
195
|
-
let lcm = offset.den;
|
|
196
|
-
const isInt = coeffs.every((entry) => this.isIntVar(entry[0]));
|
|
197
|
-
if (isInt) {
|
|
198
|
-
for (const entry of coeffs) lcm = getLcm(lcm, entry[1].den);
|
|
199
|
-
if (lcm !== 1n) {
|
|
200
|
-
const scale = Rational.of(lcm);
|
|
201
|
-
offset = offset.mul(scale);
|
|
202
|
-
coeffs = coeffs.map((entry) => [entry[0], entry[1].mul(scale)]);
|
|
203
|
-
}
|
|
204
|
-
let gcd = 0n;
|
|
205
|
-
for (const entry of coeffs) gcd = getGcd(gcd, entry[1].num);
|
|
206
|
-
if (gcd !== 0n && gcd !== 1n) {
|
|
207
|
-
const divisor = Rational.of(gcd);
|
|
208
|
-
coeffs = coeffs.map((entry) => [entry[0], entry[1].div(divisor)]);
|
|
209
|
-
offset = isLower ? offset.div(divisor).ceil() : offset.div(divisor).floor();
|
|
210
|
-
}
|
|
211
|
-
}
|
|
212
|
-
if (coeffs.length > 0 && coeffs[0][1].isNegative()) {
|
|
213
|
-
offset = offset.neg();
|
|
214
|
-
isLower = !isLower;
|
|
215
|
-
coeffs = coeffs.map((entry) => [entry[0], entry[1].neg()]);
|
|
216
|
-
}
|
|
217
|
-
const sort = isInt ? SORT_INT : SORT_REAL;
|
|
218
|
-
const term = this.coeffsToApp(coeffs, isInt);
|
|
219
|
-
const atom = manager.mkApp(
|
|
220
|
-
isLower ? OP_GE : OP_LE,
|
|
221
|
-
[term, manager.mkNumeralOfSort(offset, sort)],
|
|
222
|
-
SORT_BOOL,
|
|
214
|
+
const atom = mkBoundAtom(this.manager, this.solver, lpTerm, offset, isLower, (thVar) =>
|
|
215
|
+
this.getExpr(thVar),
|
|
223
216
|
);
|
|
224
217
|
context.internalize(atom, true);
|
|
225
218
|
context.markAsRelevant(atom);
|
|
226
219
|
return atom;
|
|
227
220
|
}
|
|
228
|
-
|
|
229
|
-
// coeffs2app: the sum of the expressions of theory variables times coefficients, with Int
|
|
230
|
-
// expressions of a Real sum coerced to Real.
|
|
231
|
-
private coeffsToApp(coeffs: [number, Rational][], isInt: boolean) {
|
|
232
|
-
const manager = this.manager;
|
|
233
|
-
const sort = isInt ? SORT_INT : SORT_REAL;
|
|
234
|
-
const summands = coeffs
|
|
235
|
-
.filter((entry) => !entry[1].isZero())
|
|
236
|
-
.map((entry) => {
|
|
237
|
-
const original = this.getExpr(entry[0]);
|
|
238
|
-
const expr =
|
|
239
|
-
!isInt && manager.isInt(original)
|
|
240
|
-
? manager.mkApp(OP_TO_REAL, [original], SORT_REAL)
|
|
241
|
-
: original;
|
|
242
|
-
return entry[1].equals(Rational.one)
|
|
243
|
-
? expr
|
|
244
|
-
: manager.mkApp(OP_MUL, [manager.mkNumeralOfSort(entry[1], sort), expr], sort);
|
|
245
|
-
});
|
|
246
|
-
return summands.length === 0
|
|
247
|
-
? manager.mkNumeralOfSort(Rational.zero, sort)
|
|
248
|
-
: summands.length === 1
|
|
249
|
-
? summands[0]
|
|
250
|
-
: manager.mkApp(OP_ADD, summands, sort);
|
|
251
|
-
}
|
|
252
221
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
// Ported from Z3 (src/smt/theory_lra.cpp), MIT license, see z3-license.txt. How theory_lra
|
|
2
|
-
// internalizes terms: a term becomes a column of the lp solver, a linear sum becomes a term column,
|
|
3
|
-
// nonlinear products and divisions go to nla, and numerals are fixed columns.
|
|
4
1
|
import {
|
|
5
2
|
FAMILY_ARITH,
|
|
3
|
+
KIND_APP,
|
|
6
4
|
OP_ADD,
|
|
5
|
+
OP_ATAN2,
|
|
7
6
|
OP_DIV,
|
|
8
7
|
OP_DIV0,
|
|
9
8
|
OP_IDIV,
|
|
@@ -12,6 +11,9 @@ import {
|
|
|
12
11
|
OP_MOD0,
|
|
13
12
|
OP_MUL,
|
|
14
13
|
OP_NUM,
|
|
14
|
+
OP_PI,
|
|
15
|
+
OP_POWER,
|
|
16
|
+
OP_REM,
|
|
15
17
|
OP_SUB,
|
|
16
18
|
OP_TO_INT,
|
|
17
19
|
OP_TO_REAL,
|
|
@@ -19,7 +21,7 @@ import {
|
|
|
19
21
|
SORT_INT,
|
|
20
22
|
SORT_REAL,
|
|
21
23
|
} from "./ast";
|
|
22
|
-
import {
|
|
24
|
+
import { getExtendedNumeral } from "./ast-util";
|
|
23
25
|
import { BoolVar, getVar, Literal } from "./literal";
|
|
24
26
|
import { Rational } from "./rational";
|
|
25
27
|
import { RefVector } from "./ref-vector";
|
|
@@ -27,15 +29,17 @@ import { type ConstraintKind, KIND_GE, KIND_LE } from "./lp/constraints";
|
|
|
27
29
|
import { NULL_LPVAR } from "./lp/lar-solver";
|
|
28
30
|
import { NlaCore } from "./lp/nla-core";
|
|
29
31
|
import type { Division } from "./lp/nla-divisions";
|
|
32
|
+
import { TRANSCENDENTAL_OPS } from "./nlsat/transcendental-eval";
|
|
30
33
|
import { TheoryLraAxioms } from "./theory-lra-axioms";
|
|
31
34
|
|
|
32
|
-
// api_bound: an atom v <= value or v >= value, with its constraints when true and when false.
|
|
33
35
|
export interface ApiBound {
|
|
34
36
|
readonly boolVar: BoolVar;
|
|
35
37
|
readonly thVar: number;
|
|
36
38
|
readonly column: number;
|
|
37
39
|
readonly isInt: boolean;
|
|
38
40
|
readonly value: Rational;
|
|
41
|
+
// The infinitesimal of the true literal's bound, value + eps*delta.
|
|
42
|
+
readonly eps: Rational;
|
|
39
43
|
readonly isLower: boolean;
|
|
40
44
|
readonly constraintTrue: number;
|
|
41
45
|
readonly constraintFalse: number;
|
|
@@ -48,7 +52,8 @@ interface Scope {
|
|
|
48
52
|
numVars: number;
|
|
49
53
|
}
|
|
50
54
|
|
|
51
|
-
|
|
55
|
+
const MAX_POWER_DEGREE = 10n;
|
|
56
|
+
|
|
52
57
|
interface LinearizedSum {
|
|
53
58
|
vars: number[];
|
|
54
59
|
coeffs: Rational[];
|
|
@@ -62,36 +67,31 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
62
67
|
protected realOneVar = NULL_LPVAR;
|
|
63
68
|
protected realZeroVar = NULL_LPVAR;
|
|
64
69
|
|
|
65
|
-
// The literal of each inequality constraint, and null for a definition.
|
|
66
70
|
protected constraintSources: (Literal | null)[] = [];
|
|
67
71
|
|
|
68
72
|
protected bounds: ApiBound[][] = [];
|
|
69
73
|
protected unassignedBounds: number[] = [];
|
|
70
74
|
protected isNewDef = false;
|
|
71
75
|
|
|
72
|
-
// m_internalize_states: the terms of each nesting depth of internalize_def and mk_var_bound, which
|
|
73
|
-
// hold references until the next one at that depth resets them.
|
|
74
76
|
private internalizeStates: RefVector[] = [];
|
|
75
77
|
|
|
76
78
|
protected internalizeHead = 0;
|
|
77
79
|
protected scopes: Scope[] = [];
|
|
78
80
|
protected value2var = new Map<string, number>();
|
|
79
81
|
|
|
80
|
-
// m_not_handled: terms that the theory treats as uninterpreted, so a model may not satisfy them.
|
|
81
|
-
// Their arguments have variables, as the factors of an nla monomial do.
|
|
82
82
|
protected unsupportedTerms: number[] = [];
|
|
83
83
|
|
|
84
84
|
protected underspecifiedTerms: number[] = [];
|
|
85
85
|
protected nla: NlaCore | undefined;
|
|
86
86
|
|
|
87
|
-
// init: the constants 1 and 0, integer and then real, each in a scope of its own. The context
|
|
88
|
-
// runs it once, when it registers the theory.
|
|
89
87
|
init() {
|
|
90
88
|
const manager = this.manager;
|
|
89
|
+
this.solver.settings.isPropagatingEqs = this.context.config.isArithPropagatingEqs;
|
|
91
90
|
this.oneVar = this.addConst(manager.mkNumeral(1n));
|
|
92
91
|
this.realOneVar = this.addConst(manager.mkRealNumeral(Rational.one));
|
|
93
92
|
this.zeroVar = this.addConst(manager.mkNumeral(0n));
|
|
94
93
|
this.realZeroVar = this.addConst(manager.mkRealNumeral(Rational.zero));
|
|
94
|
+
this.solver.settings.setRandomSeed(this.context.params.randomSeed ?? 0);
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
private addConst(expr: number) {
|
|
@@ -104,20 +104,16 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
104
104
|
return column;
|
|
105
105
|
}
|
|
106
106
|
|
|
107
|
-
|
|
108
|
-
return node.thVar >= 0 && this.varEnodes[node.thVar] === node;
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
private mkVar(expr: number) {
|
|
107
|
+
protected mkVar(expr: number) {
|
|
112
108
|
const node = this.getInternalizedEnode(expr);
|
|
113
|
-
if (this.isAttachedToVar(node)) return node.
|
|
109
|
+
if (this.isAttachedToVar(node)) return node.getThVar(this.id);
|
|
114
110
|
const thVar = this.varEnodes.length;
|
|
115
111
|
this.varEnodes.push(node);
|
|
116
112
|
while (this.bounds.length <= thVar) {
|
|
117
113
|
this.bounds.push([]);
|
|
118
114
|
this.unassignedBounds.push(0);
|
|
119
115
|
}
|
|
120
|
-
this.context.attachThVar(node, thVar);
|
|
116
|
+
this.context.attachThVar(node, this, thVar);
|
|
121
117
|
return thVar;
|
|
122
118
|
}
|
|
123
119
|
|
|
@@ -126,7 +122,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
126
122
|
return column !== NULL_LPVAR ? column : this.solver.addVar(thVar, this.isIntVar(thVar));
|
|
127
123
|
}
|
|
128
124
|
|
|
129
|
-
// mk_enode: the arguments, which become relevant, then the term.
|
|
130
125
|
protected mkEnode(expr: number) {
|
|
131
126
|
const context = this.context;
|
|
132
127
|
for (let index = 0; index < this.manager.getNumArgs(expr); index++) {
|
|
@@ -149,14 +144,11 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
149
144
|
}
|
|
150
145
|
}
|
|
151
146
|
|
|
152
|
-
// found_unsupported: the list of unsupported terms is on the trail.
|
|
153
147
|
protected foundUnsupported(expr: number) {
|
|
154
148
|
this.unsupportedTerms.push(expr);
|
|
155
149
|
this.context.pushTrail(() => this.unsupportedTerms.pop());
|
|
156
150
|
}
|
|
157
151
|
|
|
158
|
-
// found_underspecified: a division by a term or by zero equals the division by zero it stands
|
|
159
|
-
// for, which the model interprets freely.
|
|
160
152
|
private foundUnderspecified(expr: number) {
|
|
161
153
|
const manager = this.manager;
|
|
162
154
|
const context = this.context;
|
|
@@ -165,7 +157,9 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
165
157
|
const op = manager.getOp(expr);
|
|
166
158
|
const zero = manager.mkNumeral(0n);
|
|
167
159
|
const dividend =
|
|
168
|
-
op === OP_MOD
|
|
160
|
+
op === OP_MOD || op === OP_REM
|
|
161
|
+
? manager.mkApp(op, [manager.getArg(expr, 0), zero], SORT_INT)
|
|
162
|
+
: expr;
|
|
169
163
|
const byZero =
|
|
170
164
|
op === OP_DIV
|
|
171
165
|
? manager.mkApp(OP_DIV0, manager.getArgs(expr), SORT_REAL)
|
|
@@ -197,7 +191,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
197
191
|
return thVar;
|
|
198
192
|
}
|
|
199
193
|
|
|
200
|
-
// internalize_mul: a product of terms is a variable whose arguments have variables.
|
|
201
194
|
private internalizeMul(expr: number) {
|
|
202
195
|
this.internalizeArgs(expr);
|
|
203
196
|
const hasVar = this.context.isEInternalized(expr) && this.isAttachedExpr(expr);
|
|
@@ -214,19 +207,53 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
214
207
|
return thVar;
|
|
215
208
|
}
|
|
216
209
|
|
|
217
|
-
|
|
210
|
+
private getPowerDegree(power: number) {
|
|
211
|
+
const manager = this.manager;
|
|
212
|
+
if (manager.kinds[manager.getArg(power, 0)] !== KIND_APP) return undefined;
|
|
213
|
+
const degree = getExtendedNumeral(manager, manager.getArg(power, 1));
|
|
214
|
+
return degree !== undefined &&
|
|
215
|
+
degree.isInt() &&
|
|
216
|
+
degree.num > 0n &&
|
|
217
|
+
degree.num <= MAX_POWER_DEGREE
|
|
218
|
+
? Number(degree.num)
|
|
219
|
+
: undefined;
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
private internalizePower(power: number, degree: number) {
|
|
223
|
+
this.internalizeArgs(power);
|
|
224
|
+
const hasVar = this.context.isEInternalized(power) && this.isAttachedExpr(power);
|
|
225
|
+
this.mkEnode(power);
|
|
226
|
+
const thVar = this.mkVar(power);
|
|
227
|
+
if (hasVar) return thVar;
|
|
228
|
+
const base = this.manager.getArg(power, 0);
|
|
229
|
+
this.internalizeTermCore(base);
|
|
230
|
+
const baseVar = this.mkVar(base);
|
|
231
|
+
const vars = Array.from({ length: degree }, () => this.registerVar(baseVar));
|
|
232
|
+
const nla = this.ensureNla();
|
|
233
|
+
this.solver.registerExistingTerms();
|
|
234
|
+
nla.addMonic(this.registerVar(thVar), vars);
|
|
235
|
+
return thVar;
|
|
236
|
+
}
|
|
237
|
+
|
|
218
238
|
private ensureNla() {
|
|
219
239
|
if (this.nla !== undefined) return this.nla;
|
|
220
240
|
const nla = new NlaCore(this.solver, this.manager.limit);
|
|
221
241
|
for (let index = 0; index < this.scopes.length; index++) nla.push();
|
|
222
242
|
nla.isRelevant = (lpVar) =>
|
|
223
243
|
this.context.isRelevant(this.getExpr(this.solver.getExternal(lpVar)));
|
|
244
|
+
nla.grobner.updateParams();
|
|
245
|
+
nla.addMulDefHook = (vars) => this.addMulDef(vars);
|
|
224
246
|
this.nla = nla;
|
|
225
247
|
return nla;
|
|
226
248
|
}
|
|
227
249
|
|
|
228
|
-
|
|
229
|
-
|
|
250
|
+
private addMulDef(vars: readonly number[]) {
|
|
251
|
+
const isInt = vars.every((lpVar) => this.isIntVar(this.solver.getExternal(lpVar)));
|
|
252
|
+
const product = this.manager.mkFreshConst("mul!", isInt ? SORT_INT : SORT_REAL);
|
|
253
|
+
this.mkEnode(product);
|
|
254
|
+
return this.registerVar(this.mkVar(product));
|
|
255
|
+
}
|
|
256
|
+
|
|
230
257
|
private registerDivision(quotient: number, remainder: number): Division {
|
|
231
258
|
const register = (expr: number) => {
|
|
232
259
|
this.internalizeTermCore(expr);
|
|
@@ -244,7 +271,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
244
271
|
return this.manager.isNumeral(expr) && !this.manager.getRationalValue(expr).isZero();
|
|
245
272
|
}
|
|
246
273
|
|
|
247
|
-
// arith_util::is_bounded: a numeral, a mod by a numeral, or a div by a numeral of a bounded term.
|
|
248
274
|
private isBounded(expr: number): boolean {
|
|
249
275
|
const manager = this.manager;
|
|
250
276
|
const op = manager.getOp(expr);
|
|
@@ -258,7 +284,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
258
284
|
return node !== undefined && this.isAttachedToVar(node);
|
|
259
285
|
}
|
|
260
286
|
|
|
261
|
-
// scoped_internalize_state: the terms of the next depth, reset. The caller decrements the head.
|
|
262
287
|
protected pushInternalizeState() {
|
|
263
288
|
const terms = (this.internalizeStates[this.internalizeHead] ??= new RefVector(this.manager));
|
|
264
289
|
this.internalizeHead++;
|
|
@@ -266,7 +291,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
266
291
|
return terms;
|
|
267
292
|
}
|
|
268
293
|
|
|
269
|
-
// linearize: the theory variables of a weighted sum of terms, with their coefficients.
|
|
270
294
|
private linearize(terms: RefVector, coeffs: Rational[]) {
|
|
271
295
|
const manager = this.manager;
|
|
272
296
|
const context = this.context;
|
|
@@ -287,10 +311,8 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
287
311
|
toEnsureEnode.push(term);
|
|
288
312
|
const op = manager.getOp(term);
|
|
289
313
|
if (op === OP_ADD) {
|
|
290
|
-
for (let argIndex = 0; argIndex < manager.getNumArgs(term); argIndex++)
|
|
291
|
-
|
|
292
|
-
push(arg, coeffs[index]);
|
|
293
|
-
}
|
|
314
|
+
for (let argIndex = 0; argIndex < manager.getNumArgs(term); argIndex++)
|
|
315
|
+
push(manager.getArg(term, argIndex), coeffs[index]);
|
|
294
316
|
if (terms.size !== index + 1) {
|
|
295
317
|
terms.set(index, terms.items[terms.size - 1]);
|
|
296
318
|
coeffs[index] = coeffs[coeffs.length - 1];
|
|
@@ -320,6 +342,9 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
320
342
|
} else if (op === OP_MUL) {
|
|
321
343
|
addVar(index, this.internalizeMul(term));
|
|
322
344
|
index++;
|
|
345
|
+
} else if (op === OP_POWER && this.getPowerDegree(term) !== undefined) {
|
|
346
|
+
addVar(index, this.internalizePower(term, this.getPowerDegree(term)!));
|
|
347
|
+
index++;
|
|
323
348
|
} else if (op === OP_NUM) {
|
|
324
349
|
addVar(index, this.internalizeNumeral(term, manager.getRationalValue(term)));
|
|
325
350
|
index++;
|
|
@@ -340,16 +365,14 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
340
365
|
const isFirst = !context.isEInternalized(term);
|
|
341
366
|
this.internalizeArgs(term);
|
|
342
367
|
this.mkEnode(term);
|
|
343
|
-
|
|
368
|
+
const thVar = this.mkVar(term);
|
|
369
|
+
addVar(index, thVar);
|
|
344
370
|
index++;
|
|
345
371
|
if (isFirst) {
|
|
346
372
|
if (op === OP_DIV) {
|
|
347
373
|
const divisor = context.rewriter.rewrite(manager.getArg(term, 1));
|
|
348
374
|
if (!this.isNonzeroNumeral(divisor)) this.foundUnderspecified(term);
|
|
349
|
-
|
|
350
|
-
const arg = manager.getArg(term, argIndex);
|
|
351
|
-
toEnsureVar.push(arg);
|
|
352
|
-
}
|
|
375
|
+
manager.pushArgs(term, toEnsureVar);
|
|
353
376
|
} else if (op === OP_IDIV) {
|
|
354
377
|
if (!this.isNonzeroNumeral(manager.getArg(term, 1))) this.foundUnderspecified(term);
|
|
355
378
|
const remainder = manager.mkApp(OP_MOD, manager.getArgs(term), SORT_INT);
|
|
@@ -367,7 +390,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
367
390
|
} else if (op === OP_MOD) {
|
|
368
391
|
const isNonzeroDivisor = this.isNonzeroNumeral(manager.getArg(term, 1));
|
|
369
392
|
if (!isNonzeroDivisor) this.foundUnderspecified(term);
|
|
370
|
-
// Without relevancy, Z3 makes the axioms before it registers the division with nla.
|
|
371
393
|
if (!context.relevancy.isEnabled)
|
|
372
394
|
this.mkIdivModAxioms(manager.getArg(term, 0), manager.getArg(term, 1));
|
|
373
395
|
if (this.nla !== undefined && isNonzeroDivisor) {
|
|
@@ -384,17 +406,41 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
384
406
|
context.internalize(quotient, false);
|
|
385
407
|
nla.divisions.addDivisibility(this.registerDivision(quotient, term));
|
|
386
408
|
}
|
|
409
|
+
} else if (op === OP_REM) {
|
|
410
|
+
if (!this.isNonzeroNumeral(manager.getArg(term, 1))) this.foundUnderspecified(term);
|
|
387
411
|
} else if (op === OP_IDIV0 || op === OP_MOD0) {
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
412
|
+
manager.pushArgs(term, toEnsureVar);
|
|
413
|
+
} else if (TRANSCENDENTAL_OPS.has(op)) {
|
|
414
|
+
const nla = this.ensureNla();
|
|
415
|
+
const arg = manager.getArg(term, 0);
|
|
416
|
+
this.internalizeTermCore(arg);
|
|
417
|
+
const argVar = this.mkVar(arg);
|
|
418
|
+
nla.transcendentals.add(
|
|
419
|
+
TRANSCENDENTAL_OPS.get(op)!,
|
|
420
|
+
this.registerVar(argVar),
|
|
421
|
+
this.registerVar(thVar),
|
|
422
|
+
);
|
|
423
|
+
toEnsureVar.push(arg);
|
|
424
|
+
} else if (op === OP_ATAN2) {
|
|
425
|
+
const nla = this.ensureNla();
|
|
426
|
+
const y = manager.getArg(term, 0);
|
|
427
|
+
const x = manager.getArg(term, 1);
|
|
428
|
+
this.internalizeTermCore(y);
|
|
429
|
+
this.internalizeTermCore(x);
|
|
430
|
+
const yVar = this.mkVar(y);
|
|
431
|
+
const xVar = this.mkVar(x);
|
|
432
|
+
nla.transcendentals.addAtan2(
|
|
433
|
+
this.registerVar(yVar),
|
|
434
|
+
this.registerVar(xVar),
|
|
435
|
+
this.registerVar(thVar),
|
|
436
|
+
);
|
|
437
|
+
toEnsureVar.push(y, x);
|
|
438
|
+
} else if (op === OP_PI) {
|
|
439
|
+
this.ensureNla().transcendentals.addPi(this.registerVar(thVar));
|
|
392
440
|
} else if (op !== OP_TO_INT && op !== OP_DIV0) {
|
|
441
|
+
if (op === OP_POWER) this.ensureNla();
|
|
393
442
|
this.foundUnsupported(term);
|
|
394
|
-
|
|
395
|
-
const arg = manager.getArg(term, argIndex);
|
|
396
|
-
toEnsureVar.push(arg);
|
|
397
|
-
}
|
|
443
|
+
manager.pushArgs(term, toEnsureVar);
|
|
398
444
|
}
|
|
399
445
|
if (!context.relevancy.isEnabled && op !== OP_MOD) this.relevantEh(term);
|
|
400
446
|
}
|
|
@@ -411,7 +457,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
411
457
|
return { vars, coeffs: coeffs.slice(0, vars.length) };
|
|
412
458
|
}
|
|
413
459
|
|
|
414
|
-
// init_left_side: the coefficients of the variables summed, in the order of the variables.
|
|
415
460
|
private initLeftSide(vars: number[], coeffs: Rational[]) {
|
|
416
461
|
const sums = new Map<number, Rational>();
|
|
417
462
|
vars.forEach((thVar, index) =>
|
|
@@ -427,7 +472,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
427
472
|
return leftSide;
|
|
428
473
|
}
|
|
429
474
|
|
|
430
|
-
// internalize_def: the variable of a term, with a column for its linear combination.
|
|
431
475
|
protected internalizeDef(expr: number) {
|
|
432
476
|
const terms = this.pushInternalizeState();
|
|
433
477
|
terms.push(expr);
|
|
@@ -436,7 +480,6 @@ export abstract class TheoryLraInternalize extends TheoryLraAxioms {
|
|
|
436
480
|
return thVar;
|
|
437
481
|
}
|
|
438
482
|
|
|
439
|
-
// internalize_linearized_def: term - v = 0, unless the term is its own variable.
|
|
440
483
|
private internalizeLinearizedDef(expr: number, linearized: LinearizedSum) {
|
|
441
484
|
const thVar = this.mkVar(expr);
|
|
442
485
|
if (
|