3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Commit graph

2981 commits

Author SHA1 Message Date
Nikolaj Bjorner
dca0fb77c2 use same defaults as unstable branch for difference logic configuration
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-02 15:22:32 -07:00
Ken McMillan
b6787fe5a9 merge 2015-04-02 13:13:10 -07:00
Ken McMillan
d42e3ce651 possible header problem for std::less 2015-04-02 13:10:23 -07:00
Nikolaj Bjorner
d01c3491a6 simplify with caching, but without expanding number of asserted formulas. Bug reported by Heizmann, codeplex issue 197
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-02 10:28:30 -07:00
Christoph M. Wintersteiger
b47851d7da Made GetInterpolant and ComputeInterpolant public in Java and .NET.
Fixes Codeplex discussion #616450
2015-04-02 16:51:30 +01:00
Nikolaj Bjorner
6b995c4077 disable wrong fix for simplification
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-02 02:56:40 -07:00
Nikolaj Bjorner
e944f89505 fix bug introduced when clearing state between calls to Pareto/Box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-02 02:36:01 -07:00
Nikolaj Bjorner
fc36d861a7 update default to maxres for MaxSAT, reset pareto and box state on every constraint update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-01 19:32:50 -07:00
Nikolaj Bjorner
9978cba5a8 Codeplex issue 191: inconsistent results from PDR engine. The report exposed bugs in the implementation of the priority queue leaving unexplored leaves durin search. The priority queue has now been revised to address the exposed bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 16:27:15 -07:00
Nikolaj Bjorner
f8d04118d8 switch models for multiple box objectives. Feature request at codeplex issue 194, George Karpenov. Usage model is same as Pareto fronts you call check-sat multiple times until retrieving unsat
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 16:21:56 -07:00
Nikolaj Bjorner
52619b9dbb pull unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 14:57:11 -07:00
Nikolaj Bjorner
9c55be14fb change print parameters to use hyphen instead of namespace dots
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 10:56:40 -07:00
Christoph M. Wintersteiger
1d9c9bcf7a Made the InterpolationContext public.
Fixes #20
2015-03-31 19:51:42 +02:00
Christoph M. Wintersteiger
99ea0a8c19 Bugfix for mpf is_normal.
Fixes #17
2015-03-30 08:02:57 +01:00
Christoph M. Wintersteiger
5911f788c3 Improved translation from reals to floats (fp.to_real).
Fixes #14
2015-03-29 14:39:47 +01:00
Christoph M. Wintersteiger
0ed16c09f9 Bugfix for fp.isNegative.
Fixes #13
2015-03-29 13:57:11 +01:00
Christoph M. Wintersteiger
690eb8eaca Bugfix for fp.isSubnormal.
Fixes #10
2015-03-29 13:31:44 +01:00
Christoph M. Wintersteiger
fc84461e31 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-03-26 14:49:45 +00:00
Christoph M. Wintersteiger
9cbf45f689 Added int to float conversion. 2015-03-26 14:48:55 +00:00
Nikolaj Bjorner
10cdbb881f enable canceling simplex on interrupt, investigating PDR inconsistency
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-25 12:13:57 -07:00
Nikolaj Bjorner
39892aae10 cache datatype util in context to avoid performance bug, codeplex issue 195
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-03-25 11:46:17 -07:00
Nikolaj Bjorner
3c5897eea0 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-03-25 11:25:12 -07:00
Nikolaj Bjorner
2aa91eee70 cache datatype util in context to avoid performance bug, codeplex issue 195
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-03-25 11:24:47 -07:00
Christoph M. Wintersteiger
a792790882 Fixed performance problems with enumeration sorts (Codeplex #190). 2015-03-25 18:08:56 +00:00
Christoph M. Wintersteiger
1c77ad00c3 Added accessors to enumeration sorts. Thanks to codeplex user steimann for suggesting this.
(http://z3.codeplex.com/workitem/195)

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-24 21:42:05 +00:00
Christoph M. Wintersteiger
b76d588c28 Renamed the soft_timeout option to just timeout.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-21 16:10:30 +00:00
Ken McMillan
be709802cd merging interpolation fix (issue 182) 2015-03-20 17:46:01 -07:00
Ken McMillan
47d33452c6 interpolation fix (issue 182) 2015-03-20 17:39:45 -07:00
Christoph M. Wintersteiger
ed81e3b9d8 Bugfix for BV-SLS initialization
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-20 17:07:32 +00:00
Nikolaj Bjorner
4145b92136 use of regions for AUX lemmas from pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 11:52:07 -07:00
Nikolaj Bjorner
f47cc70236 use of regions for AUX lemmas from pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 11:48:52 -07:00
Nuno Lopes
4ed062d54a fix missing memset in my previous commit
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-11 11:04:33 +00:00
Nikolaj Bjorner
695ce643f5 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-03-11 00:45:09 -07:00
Nikolaj Bjorner
755a259ea0 fix codeplex issue 188
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 00:44:56 -07:00
Nikolaj Bjorner
51267f3aba take into account that bound from optimization may create atom that clashes with inequality bound from term
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 00:26:49 -07:00
nikolajbjorner
fe6af38d97 debugging assertion violation
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-03-10 20:57:01 -07:00
Nuno Lopes
44e647e72b add reallocate() function and use it in bit_vector and vector containers
give a speedup of 1-4%

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-10 16:53:47 +00:00
Christoph M. Wintersteiger
55ca6ce44b Resurrected the dack* options.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-04 19:15:22 +00:00
Christoph M. Wintersteiger
858ce1158d Bugfix in model translation (ast_manager mismatch after par-or). Thanks to stackoverflow user user297886 for reporting this issue.
http://stackoverflow.com/questions/28852722/segmentation-fault-while-using-par-or-tactic
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-04 18:30:06 +00:00
Nuno Lopes
89c43676d5 save memory in the sat solver to tentatively speed things up.
I get a slight speedup on my benchmarks. There's still one extra sign extend, which will be removed in a follow-up patch

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-02 09:50:35 +00:00
Nuno Lopes
e64760abbd fix the build with VS
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-02 09:18:15 +00:00
Nikolaj Bjorner
8bcd6edd08 temporary build fix
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-01 15:19:57 -08:00
Nuno Lopes
8029e31ddd add compiler attributes to allocation functions
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-02-28 17:31:50 +00:00
nikolajbjorner
3bf22964dd Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-02-27 11:09:05 -08:00
nikolajbjorner
3ca3c948cf add bit-vector extract shortcuts to C++ API
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-27 11:08:49 -08:00
Nuno Lopes
71d31c1267 minor optimization to reset() methods in smt::ketnel and smt::quantifier_manager
Signed-off-by: Nuno Lopes <a-nlopes@MSRC-4051274.europe.corp.microsoft.com>
2015-02-27 11:48:14 +00:00
Nikolaj Bjorner
696a1a453a Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-02-24 17:34:52 -08:00
Nikolaj Bjorner
64e2011d42 fix crash in explanation generation. Codeplex issue 181
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-24 17:34:38 -08:00
Nikolaj Bjorner
dffb0ff844 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2015-02-24 17:04:01 -08:00
Nikolaj Bjorner
b8fbc32689 fix crash in explanation generation. Codeplex issue 181
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-24 17:03:34 -08:00