Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								55863b4bb5
								
							
						 | 
						
							
							
								
								fix build problems, fix scoping
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-23 14:05:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								27fa7077a6
								
							
						 | 
						
							
							
								
								fix compiler warnings/errors reported by Robert White
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-23 09:22:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								a5ec46b167
								
							
						 | 
						
							
							
								
								Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-04-23 08:23:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								23a74b3c26
								
							
						 | 
						
							
							
								
								fix assertions reported by Christoph
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-23 08:07:37 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								859013e9c9
								
							
						 | 
						
							
							
								
								bvsls opt engine bugfix/debugging
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2014-04-22 19:13:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								d67b5226f0
								
							
						 | 
						
							
							
								
								fix compiler errors reported by Robert White
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-22 16:59:40 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								3003049df8
								
							
						 | 
						
							
							
								
								fix bug in bcd2
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-22 15:41:11 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								d118f07e37
								
							
						 | 
						
							
							
								
								fix maximize name in C++ API
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-22 14:48:05 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								beaa50e0d8
								
							
						 | 
						
							
							
								
								fixing sls
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-21 18:07:02 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f66e46c67
								
							
						 | 
						
							
							
								
								move sls functionality to solver
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-19 20:50:44 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f5ed8ff11
								
							
						 | 
						
							
							
								
								coallesce common code
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-19 20:27:39 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								b300041075
								
							
						 | 
						
							
							
								
								resetting SLS engine between calls, moved statistics collection to engine
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-19 16:52:57 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff154a09b3
								
							
						 | 
						
							
							
								
								sls
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-19 12:12:51 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								032e2618f6
								
							
						 | 
						
							
							
								
								refactor
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-19 11:58:57 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								5ead06bcef
								
							
						 | 
						
							
							
								
								adding SLS solver layer
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-18 10:29:52 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								e3b346df6f
								
							
						 | 
						
							
							
								
								working on bcd2
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-18 08:04:18 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae1656a92c
								
							
						 | 
						
							
							
								
								working on bcd2
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-17 15:37:03 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								7237be768b
								
							
						 | 
						
							
							
								
								fixing bugs in refactored code exposed from White's example
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-17 11:06:43 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								c84ab2fc01
								
							
						 | 
						
							
							
								
								tidy
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-14 22:12:22 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								e32666927b
								
							
						 | 
						
							
							
								
								tidy
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-14 21:59:39 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								91dc527635
								
							
						 | 
						
							
							
								
								tidy
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-14 21:18:18 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac31e3856e
								
							
						 | 
						
							
							
								
								refactor weighted maxsmt
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-14 16:25:52 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								00f45579cc
								
							
						 | 
						
							
							
								
								refactor weighted maxsmt
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-14 16:24:23 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								64106af5ec
								
							
						 | 
						
							
							
								
								bvsls_opt_engine fixes
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2014-04-14 17:48:09 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								71af72eed4
								
							
						 | 
						
							
							
								
								bugfix for bvsls_opt_engine
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2014-04-14 15:24:47 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								1db7e0a149
								
							
						 | 
						
							
							
								
								fix compiler warnings reported by Robert White
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-04-02 15:54:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								7fd6549a40
								
							
						 | 
						
							
							
								
								another sls example
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-31 23:32:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								deb325b8c2
								
							
						 | 
						
							
							
								
								Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-03-31 23:31:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								f321f19b20
								
							
						 | 
						
							
							
								
								adding bcd2
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-31 23:30:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d896e5a9a
								
							
						 | 
						
							
							
								
								bvsls_opt_engine bugfix
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2014-03-31 17:58:19 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								3bc31b6603
								
							
						 | 
						
							
							
								
								bvsls integration with opt::wmaxsmt
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2014-03-31 17:41:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								d67f1f36c4
								
							
						 | 
						
							
							
								
								refactor weighted theory solver into own file
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-29 16:54:12 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d23b2b813
								
							
						 | 
						
							
							
								
								speed up parsing of large Datalog files, remove pinned
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 18:26:42 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								efe2a70f6f
								
							
						 | 
						
							
							
								
								integrating SLS
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 14:30:36 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d7f208ce6
								
							
						 | 
						
							
							
								
								add bvsls module as backend to weighted maxsat
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 13:32:31 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								a26e299390
								
							
						 | 
						
							
							
								
								Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-03-28 17:46:32 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								c068db16e8
								
							
						 | 
						
							
							
								
								first attempts at getting to the bvsls from opt_context.
							
							
							
							
							
						 | 
						
							2014-03-28 17:46:26 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc577a431a
								
							
						 | 
						
							
							
								
								C++ API
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 09:39:14 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								13e454ad63
								
							
						 | 
						
							
							
								
								adding C++ API for optimization
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 09:29:21 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								776f1dc631
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-03-28 08:52:37 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f7c9607ea
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
							
							
							
							
							
						 | 
						
							2014-03-28 08:52:04 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c95bb4dd9
								
							
						 | 
						
							
							
								
								add 'distinct' to C++ API
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 08:51:50 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								9916439913
								
							
						 | 
						
							
							
								
								Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-03-28 08:35:02 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								a6d7d23bb5
								
							
						 | 
						
							
							
								
								fix compilation warnings
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 08:34:54 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac7fffa9cb
								
							
						 | 
						
							
							
								
								fix bug exposed by example by Robert White
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2014-03-28 08:34:31 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								97e549d946
								
							
						 | 
						
							
							
								
								Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-03-28 15:28:12 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8ee58b301
								
							
						 | 
						
							
							
								
								bvsls bugfix
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2014-03-28 15:28:02 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								efe5df1e90
								
							
						 | 
						
							
							
								
								Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-03-28 15:27:20 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f5d2e010d
								
							
						 | 
						
							
							
								
								bvsls refactoring
							
							
							
							
							
							
							
							Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> 
							
						 | 
						
							2014-03-28 15:26:52 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								864bef8e2c
								
							
						 | 
						
							
							
								
								Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt
							
							
							
							
							
						 | 
						
							2014-03-28 15:08:17 +00:00 | 
						
						
							
							
							
							
								
							
							
						 |