3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 14:49:01 +00:00
Commit graph

1180 commits

Author SHA1 Message Date
Nikolaj Bjorner 324dc5869d fix substitution bug in qe, working on boogie trace
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-25 13:07:28 -05:00
Christoph M. Wintersteiger 67aaec872a Java API: status bugfix. Thanks to user Bauna for reporting this
issue (#50).

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-25 18:27:53 +01:00
Christoph M. Wintersteiger 56b41a0065 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
+ FPA2BV sqrt fix

Conflicts:
	src/tactic/fpa/fpa2bv_converter.cpp

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-25 16:34:38 +01:00
Christoph M. Wintersteiger 74792eeec4 FPA: compilation bugfixes 2013-06-25 15:06:13 +01:00
Christoph M. Wintersteiger a9c4470a6b Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-25 14:53:28 +01:00
Leonardo de Moura efb6b2453e Move AssemblyInfo.cs AssemblyInfo. Update mk_util.py to generate AssemblyInfo.cs instead of modifying it.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-24 15:37:49 -07:00
Leonardo de Moura 205520ed6c Move AssemblyInfo.cs AssemblyInfo. Update mk_util.py to generate AssemblyInfo.cs instead of modifying it.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-24 15:34:42 -07:00
Christoph M. Wintersteiger 127402c10b FPA: fpa2bv fma bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-24 16:33:09 +01:00
Christoph M. Wintersteiger 9581055f97 FPA: debug output disabled
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-24 13:30:36 +01:00
Christoph M. Wintersteiger 13206f2fe7 FPA: FMA bugfixes.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-24 13:29:04 +01:00
Nikolaj Bjorner 5b5a474b54 experiment with point-based generalization method
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-21 16:23:37 -07:00
Christoph M. Wintersteiger 9489c9b08b Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-21 21:16:12 +01:00
Christoph M. Wintersteiger 0b6250253a FPA2BV: added sqrt function
(Currently, there are a few corner cases where it doesn't round correctly.)

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-21 21:16:03 +01:00
Leonardo de Moura 42898f3276 Fix bug reported by Florian <corzilius@cs.rwth-aachen.de>
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-21 10:31:11 -07:00
Leonardo de Moura a60b53bfd8 Fix compilation errors/warnings when using GCC
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-20 17:52:20 -07:00
Leonardo de Moura f5f04e583b Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-20 17:48:57 -07:00
Leonardo de Moura 185f125f7a Fix problem reported at http://stackoverflow.com/questions/17215640/getting-concrete-values-from-a-model-containing-array-ext
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-20 17:48:43 -07:00
Leonardo de Moura cd485f03dd Add trace msg
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-20 17:02:15 -07:00
Ken McMillan 1578a7fd95 Merge branch 'interp' of https://git01.codeplex.com/z3 into interp 2013-06-18 12:29:58 -07:00
Ken McMillan 0f13ec6e42 adding timeout to duality 2013-06-18 12:28:20 -07:00
Ken McMillan c448b2a430 Merge branch 'interp' of https://git01.codeplex.com/z3 into interp 2013-06-17 18:07:23 -07:00
Ken McMillan 64acd9cac0 fixed some bugs with quantifiers in rule bodies 2013-06-17 18:04:23 -07:00
Ken McMillan 7a85c8951e Merge branch 'interp' of https://git01.codeplex.com/z3 into interp 2013-06-14 16:46:41 -07:00
Ken McMillan a78564145b hooked up array.weak and array.extension params 2013-06-14 16:46:13 -07:00
Ken McMillan 782ffc32e8 Merge branch 'interp' of https://git01.codeplex.com/z3 into interp 2013-06-14 16:34:41 -07:00
Ken McMillan 886128c989 hooked up array.weak and array.extension params 2013-06-14 16:33:51 -07:00
Christoph M. Wintersteiger ecceb0accc FPA: debug output disabled.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-14 20:16:02 +01:00
Christoph M. Wintersteiger 92c1b25978 FPA: bugfix for float to float conversion (subnormal numbers).
Thanks to Gabriele Paganelli for reporting this bug!

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-14 20:14:00 +01:00
Christoph M. Wintersteiger 76c59cb85c MPF conversion bugfix.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-14 17:22:25 +01:00
Christoph M. Wintersteiger 1a26c9726b .NET API: bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-14 13:15:48 +01:00
Leonardo de Moura 894fd8b967 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-13 13:45:55 -07:00
Leonardo de Moura 40b1137b30 Fix issue https://z3.codeplex.com/workitem/47
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-13 13:45:14 -07:00
Leonardo de Moura 2c8b314a15 Fix issue https://z3.codeplex.com/workitem/48
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-13 13:34:20 -07:00
Nikolaj Bjorner 6184c5fdbc reorder attibutes to match initialization order
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-11 15:29:22 -04:00
Ken McMillan a4584f4eaa Merge branch 'interp' of https://git01.codeplex.com/z3 into interp 2013-06-10 14:46:40 -07:00
Ken McMillan 30a4627a1e fixed problem with nullary background constants in duality 2013-06-10 14:46:15 -07:00
Nikolaj Bjorner 0210156bf0 add convex interior generalizer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-10 10:51:56 -04:00
Ken McMillan a6d61e3404 Merge branch 'interp' of https://git01.codeplex.com/z3 into interp 2013-06-07 16:17:16 -07:00
Ken McMillan c21cd6ffa5 fixed model completion problem in duality 2013-06-07 16:16:56 -07:00
Ken McMillan b78752ef04 Merge branch 'interp' of https://git01.codeplex.com/z3 into interp 2013-06-07 11:51:33 -07:00
Ken McMillan adb1f95e0a small fixes in duality 2013-06-07 11:51:22 -07:00
Ken McMillan 40fe1f6e99 adjusting stratified inlining in duality 2013-06-07 11:50:01 -07:00
Christoph M. Wintersteiger 455618bb2b FPA: added is_nan
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-07 18:34:31 +01:00
Christoph M. Wintersteiger d7639557d2 FPA: added rewriting and fpa2bv conversion rules for new operations.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-07 18:03:46 +01:00
Christoph M. Wintersteiger 123d3ec3a7 New FPA operators added.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-07 17:55:29 +01:00
Christoph M. Wintersteiger e5c720de29 FPA: bugfix for abs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-07 17:36:34 +01:00
Christoph M. Wintersteiger 724f2af8c7 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-07 17:34:38 +01:00
Leonardo de Moura 2b59f2ecc2 Fix issue https://z3.codeplex.com/workitem/37
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-06 18:29:29 -07:00
Leonardo de Moura f4f1c63abb Fix issue https://z3.codeplex.com/workitem/38
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-06 13:20:43 -07:00
Ken McMillan 97a7ae1589 add profiling option 2013-06-05 18:01:05 -07:00
Ken McMillan c3eae9bf2a working on incremental stratified inlining in duality 2013-06-05 17:02:13 -07:00
Leonardo de Moura 110fa0b7fb Fix issue http://z3.codeplex.com/workitem/45
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-06-05 13:50:22 -07:00
Christoph M. Wintersteiger d301bd35a9 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-05 14:36:18 +01:00
Ken McMillan 418f148ecf working on incremental stratified inlining in duality 2013-06-04 18:22:54 -07:00
Nikolaj Bjorner b6d9d8a601 fix bugs reported by Nuno Lopes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-04 12:55:35 -07:00
Nikolaj Bjorner aa0d921240 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-03 11:48:21 -07:00
Nikolaj Bjorner bd064bf5d0 enable UTVPI by default
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-03 11:46:13 -07:00
Christoph M. Wintersteiger 093fe945bc FPA: min/max/fma bugfixes + partial quantifier support
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-03 18:19:45 +01:00
Christoph M. Wintersteiger 7c32df93a4 SLS tactic: compilation fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-06-03 18:17:41 +01:00
Nikolaj Bjorner 56bfc06c4f fix reference count bugs in overflow/underflow APIs for bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-02 20:55:15 -07:00
Nikolaj Bjorner d569027e36 fix reference count bugs in overflow/underflow APIs for bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-02 20:54:01 -07:00
Nikolaj Bjorner 89d8970d41 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-02 12:03:01 -07:00
Nikolaj Bjorner ec121db5c1 addressing race condition on interrupts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-06-02 12:02:35 -07:00
Nikolaj Bjorner 76a269c85a clean up parity computation
Signed-off-by: unknown <nbjorner@NIKOLAJ-ZEN.redmond.corp.microsoft.com>
2013-06-01 17:14:18 -07:00
Ken McMillan 9890b3bb5c changing model format in duality to support boogie 2013-05-31 18:00:50 -07:00
Ken McMillan ca38158966 fix bug in getting decision count in duality 2013-05-31 17:52:51 -07:00
Nikolaj Bjorner c0895e5548 remove hassel table from unstable: does not compile under other plantforms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-31 17:48:19 -07:00
Leonardo de Moura b670f0bb69 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-05-30 10:55:19 -07:00
Leonardo de Moura 37215b03bc Remove redundant register_on_timeout_proc
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-05-29 18:18:24 -07:00
Nikolaj Bjorner 60c4973c1d fix crash in proof generation in BMC
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-29 17:56:23 -07:00
Ken McMillan dfae0c5109 output background model in duality counterexamples 2013-05-29 16:40:47 -07:00
Nuno Lopes 9a66696639 merge hassel table code from branch
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-29 14:35:32 -07:00
Ken McMillan ee4b9d46f1 fix labels bug in duality 2013-05-27 19:22:47 -07:00
Ken McMillan b27abc501e set proof mode by default to avoid crash on pop if we set it later in duality 2013-05-27 19:22:19 -07:00
Leonardo de Moura fbbbfad564 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-05-27 17:49:29 -07:00
Leonardo de Moura c6f4cdab0f Fix bug reported at https://z3.codeplex.com/workitem/41
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-05-27 17:49:03 -07:00
Nikolaj Bjorner 7c12ab4716 fix some compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-25 14:40:57 -07:00
Nikolaj Bjorner ccf10d0abe fix crash in PDR engine when transformations don't produce output predicates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-25 14:38:02 -07:00
Leonardo de Moura 09945dc2cb Fix compilation error with gcc
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-05-23 08:07:19 -07:00
Ken McMillan 058c8d2083 fixing labels in duality 2013-05-22 15:42:25 -07:00
Ken McMillan 9d611997b3 fixing labels in duality 2013-05-22 15:18:50 -07:00
Ken McMillan 193e255387 Merge /home/mcmillan/pc/Code/z3_interp into interp 2013-05-22 13:31:24 -07:00
Ken McMillan 7905f48e88 status reporting issue 2013-05-22 13:23:37 -07:00
Nuno Lopes dc91a754dd improve clp solver
- run default rule transformations
 - sort a predicate's rules by number of queries in the body to bias search

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-21 10:48:55 -07:00
Nikolaj Bjorner 56dedec740 fix build break include uint_set.h
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-18 10:02:53 -07:00
Nuno Lopes aea667d09b fix a one-too-many in my previous commit
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-17 12:17:35 -07:00
Nuno Lopes d1999b3424 AIG exporter: create latches lazily
properly check for constants

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-17 09:46:30 -07:00
Christoph M. Wintersteiger 5d1339beec .NET/Java: API doc update for Context constructor.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-17 13:43:32 +01:00
Nikolaj Bjorner ef2a9994a9 fix UTVPI model generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-16 19:58:14 -07:00
Nikolaj Bjorner 69b7c3ede7 fixing parity bug in model generation for UTVPI
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-16 15:36:27 -07:00
Nuno Lopes 6560fc0a2c add experimental Horn clause to AIG (AAG format) converter.
Clauses should be over booleans only (or bit-blasted with fixedpoint.bit_blast=true).
We will crash if that's not the case.
Only linear clauses supported for now

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-16 09:58:31 -07:00
Nuno Lopes 100e396618 fix typo in my previous commit
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-15 13:33:42 -07:00
Nuno Lopes 5efdc58194 horn clause bit blasting: propagate output predicates for predicates without rules (most likely an UNSAT prog)
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-15 13:17:00 -07:00
Nuno Lopes e6c8149873 horn rule bit blaster: fix propagation of output predicates when arity == 0
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-15 10:50:46 -07:00
Nuno Lopes 878d57d139 minor code simplification
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-15 09:23:57 -07:00
Nuno Lopes 7fc93b94f5 remove unimplemented method
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-14 08:54:04 -07:00
Nikolaj Bjorner ac6488a195 relax pre-processing to untangle non-horn formulas, based on Eldarica/linear benchmarks
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-13 13:21:45 -07:00
Nikolaj Bjorner e35fd58968 add rewriting option to simplify store equalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-13 11:43:30 -07:00
Nikolaj Bjorner 5eed106ffe fix parameters in utvpi and make Karr invariants use backward propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-12 17:02:25 -07:00
Ken McMillan 65fbef4133 fix for compiler weirdness 2013-05-10 12:16:24 -07:00
Leonardo de Moura c8c5f30b49 Add new C++ APIs for creating forall/exists expressions.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-05-09 21:30:31 -07:00
Ken McMillan 477754c386 fixed bug in label output in duality 2013-05-09 14:24:22 -07:00
Ken McMillan dc793907a5 added rule names to duality output 2013-05-09 13:31:17 -07:00
Ken McMillan b935e1e71a still adding labels to duality 2013-05-07 11:04:10 -07:00
Christoph M. Wintersteiger 787a65be29 FPA: bugfix for QFPA -> QBV conversion.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-07 18:27:47 +01:00
Christoph M. Wintersteiger b65adc10da FPA: bugfix for quantified FP -> quantified BV conversion.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-07 17:58:43 +01:00
Nikolaj Bjorner a7269f56f9 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-05-06 01:41:51 +02:00
Nikolaj Bjorner 622484929f postpone rule flushing dependent on engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-06 01:33:40 +02:00
Ken McMillan 389c2018df working on duality 2013-05-03 17:30:07 -07:00
Ken McMillan 2f8b7bfa18 adding labels to duality 2013-05-03 17:29:13 -07:00
Christoph M. Wintersteiger 121e83b6b7 FPA: bugfixes for UF in model converter for fpa2bv.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-03 17:54:30 +01:00
Christoph M. Wintersteiger 8f60a936d2 FPA: Added support for float-UF to BV-UF translation.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-03 15:57:42 +01:00
Christoph M. Wintersteiger be19c2a3a8 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-05-02 15:24:16 +01:00
Christoph M. Wintersteiger 00d5dea9a5 FPA: added support for rewriting quantified floats to quantified bit-vectors.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-02 15:24:07 +01:00
Nuno Lopes 78db1d0f86 fix build of unit tests
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-05-01 16:13:24 -07:00
Nikolaj Bjorner 0959be0acc Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-05-01 19:57:19 +01:00
Nikolaj Bjorner 717f131942 fix warnings and errors from the mint64 build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-01 19:54:40 +01:00
Christoph M. Wintersteiger 7053b7636b Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-05-01 14:11:21 +01:00
Christoph M. Wintersteiger e50a9e8dbf MPF: fused-mul-add fixes. Sometimes this is still off by a bit.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-01 14:10:50 +01:00
Christoph M. Wintersteiger 65af658fd7 FPA: min/max special cases fixed.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-05-01 14:08:53 +01:00
Nikolaj Bjorner 7cb9e7381d fix build errors on ubuntu and gcc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-05-01 02:35:57 -07:00
Ken McMillan e939dd2bc5 still integrating duality 2013-04-30 13:07:49 -07:00
Nikolaj Bjorner 5098089ee1 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-30 13:07:38 -07:00
Nikolaj Bjorner b4d0216728 try to fix gcc build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-30 13:06:59 -07:00
Nikolaj Bjorner 351cea1439 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-30 11:53:56 -07:00
Nikolaj Bjorner 21b0a4fcbb testing utvpi
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-30 11:53:10 -07:00
Nuno Lopes f40df22ccc enable COI transformation in datalog mode
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-30 10:29:41 -07:00
Ken McMillan feb5360999 integrating duality 2013-04-28 16:29:55 -07:00
Nikolaj Bjorner fbe4af6336 add backward propagation transformation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-28 13:39:26 -07:00
Nikolaj Bjorner be64e4b238 add special procedures for UTVPI and horn arithmetic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-28 13:37:03 -07:00
Nikolaj Bjorner e6d6c55df0 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-28 13:20:49 -07:00
Nikolaj Bjorner 4471d929f7 fix linking error in debug mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-28 13:20:31 -07:00
Nikolaj Bjorner 160a448823 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-28 12:51:58 -07:00
Nikolaj Bjorner 3ac7cbe1c5 fix build breaker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-28 12:51:33 -07:00
Nikolaj Bjorner 8abdefef6d Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-28 12:48:10 -07:00
Nikolaj Bjorner 9158fb17c1 add special procedures for UTVPI and horn arithmetic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-28 12:47:55 -07:00
Nikolaj Bjorner 3f45782814 tidy up clp_context a bit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-26 17:22:06 -07:00
Nikolaj Bjorner 80f2b70e78 fix header information
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-26 16:12:52 -07:00
Nikolaj Bjorner d1938ce972 add simple bounded CLP backend
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-26 16:11:07 -07:00
Nikolaj Bjorner 65b52ba3e9 add simple bounded CLP backend
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-26 16:10:46 -07:00
Nikolaj Bjorner 8038c719fb optimize rule preprocessing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-26 14:40:20 -07:00
Nikolaj Bjorner b644fb9875 optimize rule processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-26 12:02:19 -07:00
Nikolaj Bjorner c58b4f9a53 optimize rule processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-26 11:43:06 -07:00
Nikolaj Bjorner 83add2bd9b fix bugs reported by Filip Konecny <filip.konecny@epfl.ch> in PDR
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-25 13:39:11 -07:00
Nikolaj Bjorner 780ad7cc17 fix seg-fault caused by neglecting to inherit output predicate in slice
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-25 09:30:51 -07:00
Nikolaj Bjorner 4f9247a28a Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-24 20:04:01 -07:00
Nuno Lopes f58e8e961d fix the build
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-23 14:59:19 -07:00
Nuno Lopes 9c230941cc [datalog] improve performance of smt2 frontend
- delay calls to make_annotations and process_costs untill needed
 - remove debug exception handler in join()

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-23 12:01:50 -07:00
Nuno Lopes 1917c909d8 delete garbage
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-23 11:28:09 -07:00
Nuno Lopes 12b092c45f [datalog] restore the old (linear) cycle breaker
force the compiler to use all preds as global deltas for correctness.  This is a temporary fix.

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-23 11:27:27 -07:00
Nuno Lopes 08eb85fe3d minor cleanup
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-23 10:02:44 -07:00
Nikolaj Bjorner 6250a29602 resolved conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 10:02:37 -07:00
Nikolaj Bjorner a1277a57ae resolved conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 10:01:50 -07:00
Nikolaj Bjorner d849dbf21f remove pointer comparisons/hash
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 09:58:30 -07:00
Nikolaj Bjorner eead1bbc48 missing else
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 09:24:39 -07:00
Nikolaj Bjorner e1d5f484f1 simplify result from tactics, remove unused features from difference logic solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-23 08:46:46 -07:00
Nuno Lopes db653a6e68 [datalog] merge changes from the hassel branch
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-22 09:05:27 -07:00
Nikolaj Bjorner 4ceb228583 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-21 18:17:56 -07:00
Nikolaj Bjorner 0fbdd37e89 working on horn difference logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-21 18:17:49 -07:00
Nuno Lopes 7ce88d4da9 fix a few compilation warnings
- remove unused variables and class fields
 - add support for gcc 4.5 & clang's __builtin_unreachable
 - fix 2 bugs related to strict aliasing
 - remove a few unused function parameters

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-21 14:36:39 -07:00
Nikolaj Bjorner 17f0377c06 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-20 21:20:20 -07:00
Ken McMillan 8488ca24d2 first commit of duality 2013-04-20 18:18:45 -07:00
Nuno Lopes 0673f645c9 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-18 11:23:33 -07:00
Nuno Lopes 63ece8278d [datalog] improve compilation to reuse total tables, and to reduce cloning/deallocs.
this gives up to 40% in memory reduction and 10% speedup in test cases with many rules

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-18 11:23:21 -07:00
Nikolaj Bjorner 2afcc493e0 remove reference count debugging, add substitution to C++ header
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-18 10:18:26 -07:00
Nikolaj Bjorner c78a2f5d20 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-17 16:50:51 -07:00
Nuno Lopes ec2726ac66 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-16 15:14:28 -07:00
Nuno Lopes 0b0e5b6912 add some constness
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-16 15:14:16 -07:00
Nikolaj Bjorner 7e4c9a7f75 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-16 13:55:00 -07:00
Nikolaj Bjorner de5f1ebe9f cleanup front end parameters to datalog engine
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-16 13:54:41 -07:00
Nuno Lopes 51d3db8105 [dl] remove 2 uneeded fields from sparse_table::rename_fn
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-16 10:48:57 -07:00
Nuno Lopes adc8224dba use svector instead of vector where appropriate
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-16 09:02:40 -07:00
Nuno Lopes 38823d6c79 [PDR] fix expansion of BV literals
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-16 08:16:02 -07:00
Nuno Lopes 1f5097cdaa [datalog] fix stratum cycle break for rules with multiple looping dependecies
e.g.
a -> b
b-> a
a -> a

this change makes the cycle breaker quadratic on the number of predicates. This should be revisited later

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-15 16:53:25 -07:00
Ken McMillan 71275652a7 added simp of interpolants before print 2013-04-15 14:37:08 -07:00
Ken McMillan 6495d7b88c fixed so produce-interpolants option is not needed for compute-interpolant 2013-04-15 12:22:04 -07:00
Nikolaj Bjorner 58229f4c8e Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-11 17:47:16 -07:00
Nikolaj Bjorner a054b099c1 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-11 13:44:30 -07:00
Nikolaj Bjorner 18ea547cea compiler optimization and fixes to unit tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-11 13:44:23 -07:00
Nuno Lopes cb31a294c8 use unsigned_vector where appropriate
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-11 08:50:04 -07:00
Nikolaj Bjorner f988f8753a Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-10 20:06:28 -07:00
Nikolaj Bjorner cdb90968e3 minor fixes to rel_context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-10 20:06:21 -07:00
Leonardo de Moura dc77141dce Fix warning messages
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-10 19:14:10 -07:00
Leonardo de Moura 440f8b0df4 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-10 19:03:34 -07:00
Leonardo de Moura f6f59ad6bc Fix memory allocation problems in RCF module
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-10 19:03:25 -07:00
Nuno Lopes 2685c605e5 [datalog] fix a few bugs related with output predicates
(by me & Nikolaj)

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-10 16:37:47 -07:00
Nuno Lopes 14172d3fae fix crash in dl_interp_tail_simplifier when no transformation is performed
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-10 14:49:07 -07:00
Ken McMillan e651f45bc0 added sequences to get-interpolant and compute-interpolant 2013-04-09 15:52:30 -07:00
Nikolaj Bjorner 6a36116b5c stash 2013-04-09 10:16:37 -07:00
Nikolaj Bjorner 312e052788 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-09 10:15:38 -07:00
Nikolaj Bjorner 9456f16a4c overhaul urle_set
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-09 10:15:20 -07:00
Leonardo de Moura d5a14c0b51 Fix problem reported at http://stackoverflow.com/questions/15882140/z3-smt2-in-get-z3-version/15882868#comment22637420_15882868
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-09 08:49:04 -07:00
Leonardo de Moura d26f0e1c28 Fix bug in the SAT solver.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-09 08:42:14 -07:00
Leonardo de Moura 8627f6f1d5 Remove dead code
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-08 18:02:28 -07:00
Leonardo de Moura f57b9fa7d3 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-08 18:00:51 -07:00
Leonardo de Moura 93297fa9e7 Fix bug in purify_arith reported at https://z3.codeplex.com/workitem/32
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-08 18:00:43 -07:00
Nuno Lopes 90c808bde9 [datalog] fix memory leak in union instructions
the source operand was never cleaned up

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-08 17:14:43 -07:00
Leonardo de Moura 75ad174567 Initialize int64_min constant when using GMP
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-08 15:02:51 -07:00
Leonardo de Moura 3d34aa7f01 Fix is_int64 bug in mpz when compiling with GMP
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-08 14:50:17 -07:00
Leonardo de Moura 03c1b24dea Fix get_int64 and is_int64 methods in mpz. Fix INT64_MAX constant definition.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-08 14:25:25 -07:00
Nikolaj Bjorner 8f46179def reorganization of rule_set structure
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-08 13:50:56 -07:00
Nuno Lopes 1ef17cbe67 add dl_context::has_facts(pred)
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-05 18:12:58 -07:00
Nuno Lopes 5f298b6965 spread some static love
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-05 18:02:41 -07:00
Christoph M. Wintersteiger 5915533170 FPA: bugfix for corner-case sign of division
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-04-05 15:27:05 +01:00
Christoph M. Wintersteiger 26efb3c7f1 FPA bugfixes for denormal numbers.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-04-05 12:45:28 +01:00
Nikolaj Bjorner 5ef0fdc9c8 dealing with build warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-04 21:39:20 -07:00
Nikolaj Bjorner 65dff93e93 fix more compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-03 17:11:33 -07:00
Nikolaj Bjorner 282173773f Merge branch 'dl_transforms' into unstable 2013-04-03 17:06:47 -07:00
Nikolaj Bjorner 359d2326f8 stash
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-03 17:06:45 -07:00
Nikolaj Bjorner f8476a1c87 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-04-03 17:03:29 -07:00
Nikolaj Bjorner afd83f41b8 fix compiler warnings and errors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-03 17:03:07 -07:00
Nikolaj Bjorner 0b7a270883 debug quantifier transforms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-03 16:53:09 -07:00
Leonardo de Moura 1c96a7d52f Add option smt.bv.enable_int2bv in the new parameter setting framework. This is the new name for the old parameter :bv-enable-int2bv-propagation. This modification addresses an issue reported at http://stackoverflow.com/questions/15798984/bv-enable-int2bv-propagation-option.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-04-03 15:51:09 -07:00
Nikolaj Bjorner 2a745d5224 adding model convertion to quantifier transformation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-03 14:46:58 -07:00
Nuno Lopes 67e9d74653 constify a few functions
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-04-03 09:44:31 -07:00
Nikolaj Bjorner 99cdf3d742 Merge branch 'unstable' of https://git01.codeplex.com/z3 into dl_transforms 2013-04-02 20:34:02 -07:00
Nikolaj Bjorner 477e8cc46a debugging quantifier instantiation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-02 20:33:22 -07:00
Nikolaj Bjorner cda29bc03b add abstraction and instantiation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-02 15:29:52 -07:00
Nikolaj Bjorner 3d486c4c98 add abstraction and instantiation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-02 15:28:45 -07:00
Nikolaj Bjorner 155f629d96 Merge branch 'dl_transforms' of https://git01.codeplex.com/z3 into unstable 2013-04-02 15:27:00 -07:00
Christoph M. Wintersteiger 4c353ec720 FPA: bugfix for model completion. Thanks to Levent Erkok.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2013-04-02 13:45:42 +01:00
Nikolaj Bjorner cbb4c12191 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
Conflicts:
	src/muz_qe/dl_mk_karr_invariants.cpp
2013-04-01 14:57:15 -07:00
Nikolaj Bjorner 65e64d1006 loop counting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-01 09:54:32 -07:00
Nikolaj Bjorner 2e0c5f5042 loop counting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-01 09:15:23 -07:00
Nikolaj Bjorner fbb59453c3 add loop counter v1
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-04-01 09:10:34 -07:00
Nikolaj Bjorner a2207bc35c stash 2013-04-01 07:52:55 -07:00
Nikolaj Bjorner 4138e17b3f extract karr invariants as a Datalog relation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-31 16:40:10 -07:00
Nikolaj Bjorner cd48a5164e fix bug in hilbert_basis reset method. Missing reset of m_iseq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-29 17:05:17 -07:00
Nikolaj Bjorner 435c6dd365 convert mega-bytes to bytes in env_params
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-29 09:05:36 -07:00
Nikolaj Bjorner 0590101e6f Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-03-29 08:53:50 -07:00
Nikolaj Bjorner 6ed266e4de debugging karr invariants
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-29 08:53:46 -07:00
Nikolaj Bjorner 06e3b6cfb8 remove model converter from transformer operators. Rely on reference in context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-29 08:13:07 -07:00
U-REDMOND\kenmcmil 7a0d49cb32 porting to windows 2013-03-28 11:18:20 -07:00
Nikolaj Bjorner ce7d6a16d0 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-03-27 15:55:44 -07:00
U-REDMOND\kenmcmil 28266786f3 porting to windows 2013-03-27 12:17:52 -07:00
Nuno Lopes 96f4606a7f Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-03-27 10:39:15 -07:00
Nuno Lopes 1cece1c1fb Datalog improvements:
- add cancel status
 - display statistics on cancel
(by me & Nikolaj)

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-03-27 10:38:50 -07:00
Nikolaj Bjorner c9109132da test hilbert-basis with fdds and checked integers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-26 17:33:44 -07:00
Nikolaj Bjorner 5c4003b4e5 test hilbert-basis with fdds and checked integers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-26 17:31:59 -07:00
Nikolaj Bjorner 00e79e6b6b test hilbert-basis with fdds and checked integers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-03-26 17:31:11 -07:00
Ken McMillan 78848f3ddd working on smt2 and api 2013-03-26 17:25:54 -07:00
Leonardo de Moura b417ca657d Fix set_interruptable usage
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-03-25 16:52:08 -07:00
Leonardo de Moura 7e9715f3e6 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-03-25 15:43:04 -07:00
Nuno Lopes 25a41d48dc speedup bit_vector::num_words()
Proof of equivalence w.r.t. previous code: http://rise4fun.com/Z3/aiLV

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-03-25 15:41:52 -07:00
Leonardo de Moura 4385b51c84 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-03-25 15:41:02 -07:00
Leonardo de Moura f32eaee62e Replace std::sort with std::stable_sort when the given relation is just a partial order. This change avoids discrepancies when using different implmentations of std::sort.
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-03-25 15:40:52 -07:00
Nuno Lopes da83a6b28c dl_bit_blasting: run simplifier before bit-blasting, in order to comply with its precondition
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-03-25 14:48:22 -07:00
Leonardo de Moura 9abcde9a35 Fix typos
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-03-25 14:42:18 -07:00
Nuno Lopes df35da1acf rule_manager::mk(): default initialization of m_proof to null
Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-03-25 10:48:48 -07:00
Nuno Lopes b427958b9e qe_lite> fix crash in is_var_eq()
(by me & Nikolaj)

Signed-off-by: Nuno Lopes <t-nclaud@microsoft.com>
2013-03-25 09:53:11 -07:00