mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-03 21:09:11 +00:00
Code Activity
11600 commits 49 branches 53 tags 182 MiB
Commit graph

2548 commits

Author SHA1 Message Date
Nikolaj Bjorner
e44db06bb7 update conflict resolution 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-20 16:14:29 -08:00
Nikolaj Bjorner
33895d522b fix and enable learning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-19 20:47:16 -08:00
Nikolaj Bjorner
696db3a6a4 debug conflict 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-19 17:25:19 -08:00
Nikolaj Bjorner
96921355cc pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-19 00:54:30 -08:00
Nikolaj Bjorner
1a8ff9cea4 working on pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 22:41:06 -08:00
Nikolaj Bjorner
efecb9b6c0 working on pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-18 21:51:56 -08:00
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