3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Commit graph

1880 commits

Author SHA1 Message Date
Anh-Dung Phan
bc9bfe7f97 Use templates on spanning trees 2013-11-07 07:33:25 +01:00
Anh-Dung Phan
55e91c099f Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-06 18:34:28 -08:00
Anh-Dung Phan
676e38ad0b Minor updates 2013-11-06 18:34:09 -08:00
Anh-Dung Phan
f7fdf134fd Create a separate class for spanning tree
Remarks:

1. Templates should be in header files only

2. Should pass in svector<_> instead of returning a local one
2013-11-06 17:42:09 -08:00
Anh-Dung Phan
034b33b6da Remove m_final from spanning tree representation 2013-11-06 13:30:29 -08:00
Nikolaj Bjorner
05b37b2f07 working on cardinality tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-06 12:40:56 -08:00
Nikolaj Bjorner
2f04918c39 working on cardinality tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-06 12:33:09 -08:00
Ken McMillan
33f941aaec interpolation fix 2013-11-06 12:20:55 -08:00
Ken McMillan
0696a7ef50 interpolation fix 2013-11-06 11:41:17 -08:00
Ken McMillan
b008d036dd trying to fix proof mode issue 2013-11-05 17:38:50 -08:00
Nikolaj Bjorner
e84c5e7e90 adding simple sorting network
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-05 16:53:35 -08:00
Nikolaj Bjorner
cf75a7743e network update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-05 16:18:21 -08:00
Nikolaj Bjorner
bd33e466c2 network update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-05 16:10:51 -08:00
Ken McMillan
fa05116e66 fixed vc++ compaibility issues 2013-11-05 14:45:44 -08:00
Ken McMillan
f83bca11a0 added interpolation options 2013-11-05 14:20:22 -08:00
Ken McMillan
9f78c454c9 removed foci instructions 2013-11-05 13:58:44 -08:00
Ken McMillan
d8972d4b17 removed commented-out code 2013-11-05 13:35:37 -08:00
Ken McMillan
a785a5a4b8 Merge branch 'unstable' into interp 2013-11-05 12:28:13 -08:00
Ken McMillan
49c72abb2d new interpolation fixes; re-added fixedpoint-push/pop 2013-11-05 12:17:09 -08:00
Nikolaj Bjorner
9467806a5c debugging cardinality theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-05 09:39:28 -08:00
Nikolaj Bjorner
27f3f7b735 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-05 01:30:54 -08:00
Nikolaj Bjorner
2853b322ca sketch cardinality plugin module
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-05 01:30:34 -08:00
Anh-Dung Phan
8b776569e0 Add fix_depth 2013-11-05 07:30:42 +01:00
Nikolaj Bjorner
acb26d0cf9 review of network flow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-04 16:00:50 -08:00
Nikolaj Bjorner
89989627d0 add blast method for ite terms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-04 13:33:02 -08:00
Leonardo de Moura
063f6fe15f fix assertion violations (reported by Christoph Wintersteiger) at sage\app8\bench_2174.smt2, sage\app9\bench_1450.smt2, sage\app9\bench_1546.smt2
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-11-04 12:26:20 -08:00
Leonardo de Moura
88675ec728 fix assertion violations (reported by Christoph Wintersteiger) at sage/bench_1300.smt2 and sage/bench/2861.smt2
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-11-04 12:24:25 -08:00
Leonardo de Moura
825b72719c fix https://z3.codeplex.com/workitem/62
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-11-04 11:57:29 -08:00
Leonardo de Moura
8b10e13251 fix bug in factor_tactic
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
2013-11-04 11:02:53 -08:00
Anh-Dung Phan
53d365bc44 Debug Network Simplex implementation 2013-11-04 09:12:25 +01:00
Nikolaj Bjorner
883018b405 v1 of conflict driven optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-03 19:27:06 -08:00
Nikolaj Bjorner
a26bd69a5e missing new files
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-03 14:55:48 -08:00
Nikolaj Bjorner
a0d52e835b missing new files
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-03 14:55:39 -08:00
Nikolaj Bjorner
c0de1e34ac working on upper bound optimziation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-03 14:54:42 -08:00
Nikolaj Bjorner
e5698119d7 debugging infinite upper bound checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-01 17:27:24 -07:00
Nikolaj Bjorner
b35ed169b1 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-01 17:26:48 -07:00
Nikolaj Bjorner
3c6f0c737a debugging infinite upper bound checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-01 17:26:27 -07:00
Ken McMillan
7ca6c744fd added binary interpolation 2013-11-01 15:58:59 -07:00
Anh-Dung Phan
926f2e0834 Add more object invariants 2013-11-01 14:50:17 -07:00
Nikolaj Bjorner
2a907ea52a fix objective value regression in simplex maximation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-01 12:45:26 -07:00
Ken McMillan
ac212ec54c fixing interpolation bugs 2013-11-01 11:03:55 -07:00
Anh-Dung Phan
736d43c084 Block lower bound of difference logic objectives 2013-11-01 08:05:29 +01:00
Nikolaj Bjorner
87141f4cb3 fix bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-31 22:09:52 -07:00
Nikolaj Bjorner
6ca0c7c6c7 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 21:32:18 -07:00
Nikolaj Bjorner
6baa469073 local updates to opt_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-31 21:32:11 -07:00
Nikolaj Bjorner
ae3a69b32e Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 18:51:28 -07:00
Anh-Dung Phan
195df69a1b Use optional<_> for infinite check 2013-10-31 18:34:40 -07:00
Nikolaj Bjorner
cfac32c57d add outline of object invariant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-31 17:21:10 -07:00
Anh-Dung Phan
a66a14dbf0 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 16:41:42 -07:00
Anh-Dung Phan
29622229cb Add lower bound case for edge_state 2013-10-31 13:03:24 -07:00