Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								51704b7b95
								
							
						 | 
						
							
							
								
								tweaking input processing
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-12-03 08:51:46 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								03f5020d0b
								
							
						 | 
						
							
							
								
								Nits
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-12-02 22:06:15 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								af5d989d6c
								
							
						 | 
						
							
							
								
								change verbosity level
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-12-02 21:51:20 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								c14c778735
								
							
						 | 
						
							
							
								
								debugging multi-objective interface and pb revisions
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-12-02 14:30:17 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								faa59ba7f9
								
							
						 | 
						
							
							
								
								debugging multi-objective interface and pb revisions
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-12-02 14:14:44 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								191efbb72f
								
							
						 | 
						
							
							
								
								use expression structure for objectives instead of custom s-expression
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-12-02 13:00:51 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								a016caa5d8
								
							
						 | 
						
							
							
								
								add expression conversion
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-12-02 09:47:59 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anh-Dung Phan
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ed8a48ac2
								
							
						 | 
						
							
							
								
								Add push/pop to box optimization
							
							
							
							
							
						 | 
						
							2013-11-26 14:16:59 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anh-Dung Phan
								
							 
						 | 
						
							
							
							
							
								
							
							
								4aa9c742ab
								
							
						 | 
						
							
							
								
								Revise optimize commands
							
							
							
							
							
						 | 
						
							2013-11-26 12:54:18 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anh-Dung Phan
								
							 
						 | 
						
							
							
							
							
								
							
							
								dbc791d385
								
							
						 | 
						
							
							
								
								Reorganize combination of objectives
							
							
							
							
							
						 | 
						
							2013-11-26 09:20:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anh-Dung Phan
								
							 
						 | 
						
							
							
							
							
								
							
							
								87a2b99091
								
							
						 | 
						
							
							
								
								Clean up
							
							
							
							
							
						 | 
						
							2013-11-25 12:16:34 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ff51e9a60
								
							
						 | 
						
							
							
								
								move model_evaluator from pdr to model, call it model_implicant
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-23 21:33:35 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								97dfb6d521
								
							
						 | 
						
							
							
								
								moving to rational coefficients
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-21 15:55:08 -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
								
							 
						 | 
						
							
							
							
							
								
							
							
								9734bab205
								
							
						 | 
						
							
							
								
								pb theory
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-17 21:10:15 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anh-Dung Phan
								
							 
						 | 
						
							
							
							
							
								
							
							
								5921628f53
								
							
						 | 
						
							
							
								
								Dump opt_solver checksat calls for profiling
							
							
							
							
							
						 | 
						
							2013-11-13 18:46:18 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anh-Dung Phan
								
							 
						 | 
						
							
							
							
							
								
							
							
								64daa2977d
								
							
						 | 
						
							
							
								
								Fix termination conditions on core_maxsat
							
							
							
							
							
						 | 
						
							2013-11-12 16:14:21 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								2349a0fcdd
								
							
						 | 
						
							
							
								
								adding core-based max-sat
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-09 12:35:20 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								dc78da4873
								
							
						 | 
						
							
							
								
								case analysis for commit
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 23:29:31 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba05f79415
								
							
						 | 
						
							
							
								
								bug fixes
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 22:40:43 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								b573b94f84
								
							
						 | 
						
							
							
								
								nits
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 21:59:38 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								21058c38fd
								
							
						 | 
						
							
							
								
								fix bounds for weighted maxsmt
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 21:26:05 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e1c186017
								
							
						 | 
						
							
							
								
								enable answer generation
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 20:55:01 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								816029c862
								
							
						 | 
						
							
							
								
								missing
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 20:04:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								c6c7093a4c
								
							
						 | 
						
							
							
								
								make max-smt solvers generic
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 18:22:07 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f53a4aa18
								
							
						 | 
						
							
							
								
								working on supporting multiple max-sat objectives
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 16:54:34 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								f350efffc7
								
							
						 | 
						
							
							
								
								working on pareto and upper/lower bound facilities
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 13:52:27 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								6caee5e3ca
								
							
						 | 
						
							
							
								
								more refactoring
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 13:16:10 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								29cc9025cb
								
							
						 | 
						
							
							
								
								renaming to optsmt
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 12:41:05 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								33be06c6dc
								
							
						 | 
						
							
							
								
								continued re-factoring
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-08 09:00:24 -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
								
							 
						 | 
						
							
							
							
							
								
							
							
								034b33b6da
								
							
						 | 
						
							
							
								
								Remove m_final from spanning tree representation
							
							
							
							
							
						 | 
						
							2013-11-06 13:30:29 -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
								
							 
						 | 
						
							
							
							
							
								
							
							
								2853b322ca
								
							
						 | 
						
							
							
								
								sketch cardinality plugin module
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-05 01:30:34 -08: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								883018b405
								
							
						 | 
						
							
							
								
								v1 of conflict driven optimization
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2013-11-03 19:27:06 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |