mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 14:49:01 +00:00
Code Activity
13595 commits 23 branches 48 tags 157 MiB
Commit graph

3142 commits

Author SHA1 Message Date
Nikolaj Bjorner 475072f5da remove theory_card 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:27:36 -08:00
Nikolaj Bjorner 0ff1b63307 remove theory_card 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:26:23 -08:00
Nikolaj Bjorner ee0abfbfe9 rename card->pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:25:02 -08:00
Nikolaj Bjorner 2b2d0e155c debugged new pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 18:03:49 -08:00
Nikolaj Bjorner 86e22c1186 add validation option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 09:44:20 -08:00
Nikolaj Bjorner c42f0d60e6 pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 05:10:30 -08:00
Nikolaj Bjorner 9734bab205 pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 21:10:15 -08:00
Nikolaj Bjorner 50cc852112 working on pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 20:15:24 -08:00
Nikolaj Bjorner 8cb959127f pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 10:41:15 -08:00
Nikolaj Bjorner f3721e5a15 pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-17 10:39:33 -08:00
Nikolaj Bjorner f6c5088cc9 pb theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-16 21:05:33 -08:00
Nikolaj Bjorner 77cdb2bcde working on pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-16 17:01:43 -08:00
Nikolaj Bjorner 06073db413 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-16 10:14:52 -08:00
Nikolaj Bjorner 41efa8a75d Merge branch 'opt' of https://git00.codeplex.com/z3 into opt 
Conflicts:
	src/smt/theory_card.cpp
 2013-11-16 10:14:29 -08:00
Anh-Dung Phan aadfe007c1 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-15 18:34:12 -08:00
Anh-Dung Phan 6ddc838628 Add a basic spanning tree 2013-11-15 18:34:05 -08:00
Nikolaj Bjorner 6da4bae840 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-15 17:31:39 -08:00
Nikolaj Bjorner 13c97d12a8 snapshot 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-15 17:31:31 -08:00
Anh-Dung Phan af8da013b5 Fix a few issues related to thread spanning tree 2013-11-15 17:17:20 -08:00
Anh-Dung Phan 761c95129b Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-15 16:59:01 -08:00
Nikolaj Bjorner 314f03c12c started new PB solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-15 16:44:08 -08:00
Anh-Dung Phan 074e851d49 Display Fu Malik statistics 2013-11-15 12:58:11 -08:00
Nikolaj Bjorner f9164f4cb1 local updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-14 20:21:33 -08:00
Nikolaj Bjorner e034331f2e working on pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-14 18:04:55 -08:00
Nikolaj Bjorner 06ae0db116 working on pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-14 18:04:05 -08:00
Anh-Dung Phan d729e89a7b Fix a minor bug on cardinality solver 2013-11-14 12:36:39 -08:00
Nikolaj Bjorner 133ba2d02a fixes to pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-13 13:41:14 -05:00
Anh-Dung Phan 66eda866ca Fix bugs on candidate list pivot rule 2013-11-11 18:23:21 -08:00
Anh-Dung Phan 0d6ffe6b31 Implement three pivot rules 2013-11-11 08:51:52 +01:00
Nikolaj Bjorner e412d6175d add pb capabilities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-09 16:19:49 -08:00
Nikolaj Bjorner 293a97bdfc working on core-maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-09 15:54:38 -08:00
Anh-Dung Phan 5a27c035e4 Add a vector of edges to handle spanning trees 2013-11-08 18:00:48 -08:00
Nikolaj Bjorner acbeed2e97 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-07 18:09:58 -08:00
Nikolaj Bjorner 401fced400 separate out file for objectives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 18:09:44 -08:00
Anh-Dung Phan ab4efe2da0 Update interface of network flows 2013-11-07 15:56:53 -08:00
Nikolaj Bjorner 759d80dfe3 fix regression 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 12:15:51 -08:00
Nikolaj Bjorner c57594d463 tested network sorting 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 10:47:12 -08:00
Nikolaj Bjorner 31e2d823c9 add cutting plane 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 01:35:25 -08:00
Nikolaj Bjorner 220b339e5e add cutting plane 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 01:30:19 -08:00
Nikolaj Bjorner d434cbea41 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-07 00:53:23 -08:00
Nikolaj Bjorner 3ee8c3efb5 pb/car constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-07 00:53:08 -08:00
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
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 a785a5a4b8 Merge branch 'unstable' into interp 2013-11-05 12:28:13 -08:00
Nikolaj Bjorner 9467806a5c debugging cardinality theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 09:39:28 -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
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 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 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
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
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 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
Anh-Dung Phan 1a32a64b96 Use constraint graphs for minimum cost flow correctly 2013-10-31 12:11:56 -07:00
Nikolaj Bjorner 72e82532b2 enabling upper bound test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 09:43:15 -07:00
Nikolaj Bjorner 5106c74b3e preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:13:24 -07:00
Nikolaj Bjorner 0b65aa83e8 preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:02:37 -07:00
Anh-Dung Phan a3a7af84c5 Minor updates 2013-10-30 18:25:39 -07:00
Anh-Dung Phan 01c3dd779b Add visualization of spanning trees 2013-10-30 16:52:37 -07:00
Anh-Dung Phan 49aba844b8 Refactor network_flow 
Use a template method for pretty printing
 2013-10-30 10:04:56 -07:00
Anh-Dung Phan a6e103dd36 Make a few variables private 2013-10-30 06:30:51 +01:00
Nikolaj Bjorner bc44bcad10 push blocking code to optimizer context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 20:26:54 -07:00
Anh-Dung Phan b67d333cf9 First complete version of Network Simplex 2013-10-29 18:32:10 -07:00
Anh-Dung Phan e715ccbc98 Minor updates 2013-10-29 15:49:53 -07:00
Anh-Dung Phan 905f230b8f Add pretty printing for network_flow 
Reuse the original graph as much as possible
 2013-10-29 14:20:29 -07:00
Anh-Dung Phan 906bbb4eeb Update Network Simplex implementation 2013-10-28 18:29:14 -07:00
Nikolaj Bjorner 72c3473400 cleanup 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 20:48:19 +08:00
Nikolaj Bjorner 9903c722af adding review notes to code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 16:24:21 +08:00
Nikolaj Bjorner 3852b3a753 working on internalizer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 15:03:39 +08:00
Anh-Dung Phan 3d943bf70d Fix a mistake in previous commit causing imcompilable code 
Also correct my alias
 2013-10-26 05:22:52 +02:00
Anh-Dung Phan 532c345fd1 Reduce difference logic solver to min cost flow 2013-10-25 17:42:03 -07:00
Anh-Dung Phan ebed5fa037 WIP on min cost flow problem 
Remarks:
1. Follow the template structure of diff_logic.h
2. Try to reuse dl_graph<Ext> with some ready-to-use graph algorithms
3. Need to add 'explanation' to 'GExt' in order to instantiate
dl_graph<_>
 2013-10-24 17:58:15 -07:00
Phan Anh Dung be81e77c70 Some progress on Network Simplex 2013-10-24 09:50:12 +02:00
Phan Anh Dung 1ff373072d Add objective functions to difference logic solver 2013-10-24 08:57:21 +02:00
Nikolaj Bjorner 7c8fbbb06a fixing bug with optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-24 12:03:05 +08:00
Nikolaj Bjorner 11010086be fixing bug with optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-24 11:57:30 +08:00
Anh-Dung Phan 6919f335a1 Sketch a skeleton of Difference Logic optimizer 2013-10-22 16:28:03 -07:00
Anh-Dung Phan 3441fc2942 A few changes based on previous reviews 
Tested the optimization procedure with:
- unbounded objectives
- bounded with rational solutions
- bounded with irrational solutions
 2013-10-21 17:25:34 -07:00
Nikolaj Bjorner 3996f58a8e tidy & todo notes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-19 12:22:56 -07:00
Phan Anh Dung 53f78f7d19 Replace the use of optional<rational> by inf_eps_rational<rational> 
Also handle composite objectives correctly.
 2013-10-19 06:03:21 +02:00
Anh-Dung Phan a44044fb15 A rudimentary version of MathSAT optimization 
Remarks:
(1) The core procedure accepts maximization only
(2) Add lazy initialization to min_maximize_cmd
(3) The procedure isn't working with composite objective yet.
 2013-10-18 18:00:24 -07:00
Ken McMillan 3a0947b3ba merged with unstable 2013-10-18 17:26:41 -07:00
Nikolaj Bjorner 898609a3ef cleanup macro usage 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 20:50:33 -07:00
Nikolaj Bjorner cfedbe3dfd add opt_solver layer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 17:33:43 -07:00
Christoph M. Wintersteiger 3d910028bf fixed potential performance problem with fully interpreted sorts in the quantifier instantiation. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-09-27 16:55:05 +01:00
Nikolaj Bjorner 2e7f5303eb address incompleteness bug in axiomatization of int2bv 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-23 04:56:38 +03:00
Nikolaj Bjorner fd1f4b9191 fix bugs reported by Anvesh 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-23 04:07:08 +03:00
Nikolaj Bjorner 5be4365b47 redo edit 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-15 16:53:52 -07:00
Nikolaj Bjorner c54929e59f cycle through domain size before giving up 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-15 04:52:21 -07:00
Nikolaj Bjorner 21b27cd2d1 patching crash in data-type factory when fresh values are not produced 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-15 04:37:05 -07:00
Nikolaj Bjorner 419f99c329 fix bug found by Ethan: fresh values for bit-vectors loops if the domain of bit-vectors is truly small 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-13 15:30:56 -07:00
Nikolaj Bjorner 9e61820125 re-organizing muz 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-08-28 21:49:53 -07:00
Nikolaj Bjorner 6c5f7741b2 more on polynorm 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-08-14 11:55:23 -07:00
Nikolaj Bjorner d9e3881560 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-27 12:00:09 -05:00
Nikolaj Bjorner 619bd91ddb fix bug in ctx-solver-simplify reported @ http://z3.codeplex.com/workitem/51 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-06-27 11:59:40 -05:00
Leonardo de Moura 544dfde454 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-06-27 09:30:33 -07:00
Leonardo de Moura 5b7201a911 Fix minor problem 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-06-27 09:30:25 -07:00
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
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
Ken McMillan a78564145b hooked up array.weak and array.extension params 2013-06-14 16:46:13 -07:00
Ken McMillan 886128c989 hooked up array.weak and array.extension params 2013-06-14 16:33:51 -07:00
Leonardo de Moura 38d1f30dba Apply patch submitted by David Cok 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-06-05 14:11:11 -07:00
Leonardo de Moura 095ba806ab Apply patch submitted by David Cok 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-06-05 14:06:53 -07: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 76a269c85a clean up parity computation 
Signed-off-by: unknown <nbjorner@NIKOLAJ-ZEN.redmond.corp.microsoft.com>
 2013-06-01 17:14:18 -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
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
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
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
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 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
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
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 21b0a4fcbb testing utvpi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-04-30 11:53:10 -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 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 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 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
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
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
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 9abcde9a35 Fix typos 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-03-25 14:42:18 -07:00
Nikolaj Bjorner bbe93ef610 fix build warning, make context simplifier traverse subterms 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-03-24 18:26:22 -07:00
Nikolaj Bjorner b8b73077a9 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-03-18 21:46:48 -07:00
Nikolaj Bjorner 7e9f4e264d working on separating horn simplificaiton 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-03-18 21:46:42 -07:00
Leonardo de Moura fed2ad2300 Fix nontermination bug 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-03-18 08:23:33 -07:00
Leonardo de Moura 39b9da7118 Fix bug in smt_model_finder, it was producing the incorrect instantiation set. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-03-13 19:02:48 -07:00
Leonardo de Moura 0af4384882 Fix more issues unintepreted sort tests. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-02-15 16:31:49 -08:00
Leonardo de Moura 39d5b850e8 Fix bug reported at http://stackoverflow.com/questions/14307692/unknown-when-using-defs 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-01-13 12:59:39 -08:00
Nikolaj Bjorner f8f23382dc bug fix: unsound pruning of assumptions. remove deprecated reduce() feature from smt_kernel 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-01-03 17:36:21 -08:00
Leonardo de Moura 7d97f407c2 Remove non-ascii characters 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-20 11:22:03 -08:00
Leonardo de Moura d92efeb0c5 Make ast_manager::get_family_id(symbol const &) side-effect free. The version with side-effects is now called ast_manager::mk_family_id 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-18 17:14:25 -08:00
Leonardo de Moura 607fab486c Fix incorrect uses of set_cancel() 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-17 18:48:10 -08:00
Leonardo de Moura 8c211dd4fc Fix bug reported by Philippe Suter, see RELEASE_NOTES 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-17 14:07:21 -08:00
Leonardo de Moura 143b829488 Fix literal duplication bug that was introduced after v4.3.1 release 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-17 13:42:01 -08:00
Leonardo de Moura e0f4d870fd Removed auxiliary constants created by the nnf tactic from Z3 models. Fixed model.compact parameter propagation problem. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-13 14:03:58 -08:00
Leonardo de Moura 5b6842fbc5 cleaning defined_names 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-13 12:37:03 -08:00
Leonardo de Moura 6348dab24a removed dead code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-12 09:10:47 -08:00
Nikolaj Bjorner 89ddb5eac4 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2012-12-11 20:49:49 -08:00
Leonardo de Moura 8198e62cbd solver factories, cleanup solver API, simplified strategic solver, added combined solver 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-11 17:47:27 -08:00
Nikolaj Bjorner b6459a8a92 add solver object to get_implied_equalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-12-11 10:53:21 -08:00
Leonardo de Moura 33234a4162 Fixed issue http://z3.codeplex.com/workitem/10 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-09 12:23:35 -08:00
Leonardo de Moura cba449b75e more parameter issues 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-07 15:16:46 -08:00
Leonardo de Moura a07b459fdf Added is_unique_value. Its semantics is equal to the old is_value method. The contract for is_value changed. See comments at ast.h for more information. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-07 12:53:51 -08:00
Leonardo de Moura bd0366eef7 Fixed problems in the new parameter setting. Many thanks to Nuno Lopes for sending a benchmark that exposed the problem, a noticing the discrepancy between unstable and master branches. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-07 11:09:14 -08:00
Leonardo de Moura e055e0b47c Fixed other parameter setting problems 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-07 10:41:50 -08:00
Leonardo de Moura 68b97024e2 added missing option 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-06 08:54:00 -08:00
Leonardo de Moura 3a5e71afef Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2012-12-05 16:22:16 -08:00
Leonardo de Moura 1a11196211 fixing bug introduced today 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-05 16:21:53 -08:00
Leonardo de Moura 5e4d1151eb fixing clang compilation problems 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-05 15:20:16 -08:00
Nikolaj Bjorner 188aea3fb1 fix test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-12-05 13:48:27 -08:00
Nikolaj Bjorner 53cb389398 fixing unit tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-12-05 13:05:14 -08:00
Nikolaj Bjorner 3b51597dbe fixing unit tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-12-05 12:05:07 -08:00
Nikolaj Bjorner 3bf86e1a49 fixing unit tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-12-05 12:02:08 -08:00
Nikolaj Bjorner aeb3857391 fixing unit tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-12-05 12:01:03 -08:00
Leonardo de Moura 3736c5ea3b removed template specialization overkill 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-05 08:56:19 -08:00
Leonardo de Moura 5379130c8c eliminated m_proof_mode from smt_params, ast_manager has this information 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-05 08:35:03 -08:00
Leonardo de Moura 7d24cd4ae3 merged 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-04 11:18:10 -08:00
Leonardo de Moura ff999773b2 adjusting verbose msgs 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-04 11:17:24 -08:00
Leonardo de Moura 9754ccf8a1 fixing problems with the new parameter framework 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-04 11:16:42 -08:00
Leonardo de Moura 8191cc1951 fixed problems with logger and invalid assertion 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-03 18:44:27 -08:00
Leonardo de Moura 54e452a1af chasing bug in the Java bindings 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-03 16:58:44 -08:00
Leonardo de Moura 6d7d205e13 fixed more problems in the new param framework 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-03 15:02:34 -08:00
Leonardo de Moura d634c945bf renamed validate_model --> model_validate 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-03 13:44:39 -08:00
Leonardo de Moura 847c5f9691 fixing problems 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-03 11:55:24 -08:00
Leonardo de Moura 773f82a44c connected smt_params with new parameter infrastructure 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-02 14:47:34 -08:00
Leonardo de Moura 5057257e40 removed unnecessary README 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-02 13:18:33 -08:00
Leonardo de Moura 6107e8d9ce moved old params files 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-02 10:47:04 -08:00
Leonardo de Moura ffb7e26c75 removed front-end-params 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-02 10:05:29 -08:00
Leonardo de Moura 288a96610f ported VCC trace streams 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-02 09:08:47 -08:00
Leonardo de Moura 02e763bb6b env params 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-01 20:56:40 -08:00
Leonardo de Moura 29cf179364 more reorg 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-01 17:03:14 -08:00
Leonardo de Moura 9374a4e20a removed ini_file 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-01 16:30:39 -08:00
Leonardo de Moura 589f096e6e working on new parameter framework 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-12-01 15:54:34 -08:00
Leonardo de Moura 6195ed7c66 checkpoint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-30 18:16:02 -08:00
Leonardo de Moura 124c0339c1 merged 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-30 13:17:41 -08:00
Leonardo de Moura cf28cbab0a saved params work 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-29 17:19:12 -08:00
Nikolaj Bjorner 646ace6842 fix bugs uncovered from running non-Horn SDV samples 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-11-29 14:56:09 -08:00
Leonardo de Moura 3ca41c6202 fixed recently introduced bug 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-28 16:46:19 -08:00
Nikolaj Bjorner 521d975c84 additional array handling routines 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-11-26 14:18:20 -08:00
Leonardo de Moura 026c81ba29 Simplified asserted_formulas. From now on, we should use tactics for qe, der, solve, etc. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-22 16:20:02 -08:00
Leonardo de Moura 5e7436cb50 Removed (some) dead parameters. Added doxygen documentation for the whole code base. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-22 10:06:24 -08:00
Leonardo de Moura 3e50a65dfc isolating elim_term_ite inside smt module 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-17 17:12:30 -08:00
Leonardo de Moura c5b91aef68 Fixed bug reported by Heizmann at codeplex 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-07 07:52:07 -08:00
Leonardo de Moura c1587dc37d fixed some warnings reported by clang++ 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-02 17:28:27 -07:00
Leonardo de Moura b70687acc9 cleanning solver initialization, and fixing named assertion support 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-02 16:35:08 -07:00
Leonardo de Moura e2f6a65aa2 added support for named assertions 2012-11-02 14:00:43 -07:00
Leonardo de Moura e1eb3ee8ee fixed bug in solver_na2as 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-02 11:36:59 -07:00
Leonardo de Moura d545f187f8 working on named assertions support 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-02 08:28:34 -07:00
Leonardo de Moura 230382d4c9 default_solver --> smt_solver 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-01 21:52:27 -07:00
Leonardo de Moura cadd35bf7a checkpoint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-01 21:44:35 -07:00
Leonardo de Moura c9722a1313 removing dead code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-01 12:21:14 -07:00
Leonardo de Moura 4c98b567e1 old_params ==> front_end_params. Isolated abstract solver interface 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-01 11:28:14 -07:00
Leonardo de Moura 7cdf5e493b moved smt tactic to smt folder 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-11-01 08:48:54 -07:00
Leonardo de Moura e2f3f9abd7 removed dead code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-31 14:58:21 -07:00
Leonardo de Moura 6d8b8a762c Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2012-10-31 14:22:00 -07:00
Leonardo de Moura 1ebfcfc2cb removing fat 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-31 14:21:22 -07:00
Nikolaj Bjorner 9748b6ed11 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2012-10-31 13:25:42 -07:00
Nikolaj Bjorner c4cb66bbfa fix bugs in inliner and usage of unbound variable fix, reported by Arie Gurfinkel 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-10-31 13:23:24 -07:00
Leonardo de Moura 683687b153 more cleanup 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-31 10:54:59 -07:00
Leonardo de Moura d8f627c6c8 Fixed warnings produced by gcc 4.6.3 when compiling in debug mode 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-30 23:43:00 -07:00
Nikolaj Bjorner f44631ce73 fix bugs encountered by regression tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2012-10-30 16:13:27 -07:00
Leonardo de Moura 759504880a isolated proto_model obsolete code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-29 20:15:33 -07:00
Leonardo de Moura 2a295d9466 removed dead script 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-25 22:04:43 -07:00
Leonardo de Moura fab47f5f7d checkpoint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-25 15:45:57 -07:00
Leonardo de Moura f57d4b1b19 reorganizing the code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-25 11:28:03 -07:00
Leonardo de Moura 4cf211acd4 moving tactics to tactic folder 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-24 14:15:15 -07:00
Leonardo de Moura 4f6b34bc7b removing last refs to assertion_set 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-24 14:04:33 -07:00
Leonardo de Moura 3da69a4f1b Integrated structured branch into unstable branch (the official 'working in progress' branch) 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-24 13:19:19 -07:00
Leonardo de Moura 641db30660 Isolating reg_decl_plugins 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-24 11:27:50 -07:00
Leonardo de Moura 9e299b88c4 reorganizing the code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-23 21:53:34 -07:00
Leonardo de Moura efff6db567 checkpoint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-23 12:12:59 -07:00
Leonardo de Moura e7e5d4c5bb missing files... 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-22 06:01:04 -07:00
Leonardo de Moura 80b2df3621 checkpoint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-21 20:46:41 -07:00
Leonardo de Moura 6fd63cd05a checkpoint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-21 20:04:34 -07:00
Leonardo de Moura add684d8e9 checkpoint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-21 13:32:12 -07:00
Leonardo de Moura 492484c5aa Reorganizing the code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-20 22:03:58 -07:00
Leonardo de Moura 6bdb009c3e Reorganizing the code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2012-10-20 20:42:28 -07:00