| 
								
								
									 Nikolaj Bjorner | e44db06bb7 | update conflict resolution Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2013-11-20 16:14:29 -08:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 61385c8489 | a.ctx -> self.ctx, thanks gario Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2013-11-20 09:54:37 -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 |  | 
				
					
						| 
								
								
									 Anh-Dung Phan | c837f62863 | Use quick explain for unsat core in Fu Malik algorithm by default | 2013-11-15 16:58:42 -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 |  | 
				
					
						| 
								
								
									 Ken McMillan | 8320144af0 | fixed bug in duality logging | 2013-11-15 11:24:02 -08:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 31495bb9d9 | bugfix for float rounding to integral values for cases where ebits >= sbits Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2013-11-15 17:19:41 +00:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | f9164f4cb1 | local updates Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2013-11-14 20:21:33 -08:00 |  | 
				
					
						| 
								
								
									 Anh-Dung Phan | 0acf331ed1 | Merge conflicts | 2013-11-14 19:07:23 -08:00 |  | 
				
					
						| 
								
								
									 Anh-Dung Phan | 4be11f24e1 | Instrument fu_malik to use the new SAT solver (WIP) | 2013-11-14 19:02:15 -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 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | c96f7b5a51 | bugfixes for float to float conversion Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2013-11-14 20:13:37 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | b77d408128 | bugfix for FPA rounding when ebits is very small. | 2013-11-14 19:11:19 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | bb8373151d | Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2013-11-14 19:09:30 +00:00 |  | 
				
					
						| 
								
								
									 Ken McMillan | 9cba5d7c85 | working on quantifiers in interpolation | 2013-11-14 10:18:44 -08:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 6a2f987fb7 | optimizations for float to float conversions Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2013-11-14 16:56:13 +00:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | d8d77d943c | Merge branch 'opt' of https://git01.codeplex.com/z3 into opt | 2013-11-14 08:51:13 -08:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 34af198816 | missing file Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2013-11-14 08:51:01 -08:00 |  | 
				
					
						| 
								
								
									 Anh-Dung Phan | 5921628f53 | Dump opt_solver checksat calls for profiling | 2013-11-13 18:46:18 -08:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 2d3f6ca71d | add pb constraints to API Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2013-11-13 17:15:41 -08:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | d1937b2032 | add PB operators to C-based API Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2013-11-13 17:09:10 -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 | 64daa2977d | Fix termination conditions on core_maxsat | 2013-11-12 16:14:21 -08:00 |  |