Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								41a242fab1
								
							
						 | 
						
							
							
								
								Merge branch 'upstream-master' into develop
							
							
							
							
							
							
							
							Conflicts:
	src/smt/params/smt_params.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_case_split_queue.cpp
	src/smt/smt_context.h
	src/smt/smt_setup.cpp
	src/smt/smt_setup.h 
							
						 | 
						
							2017-05-03 17:03:13 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								1177be6391
								
							
						 | 
						
							
							
								
								add common utility to set up seq
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-05-02 20:52:39 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								52dfdedb9b
								
							
						 | 
						
							
							
								
								Merge pull request #1000 from mtrberzi/theory_str-smt-setup
							
							
							
							
							
							
							
							smt_setup for strings/sequences 
							
						 | 
						
							2017-05-02 20:44:23 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								92755b0185
								
							
						 | 
						
							
							
								
								smt_setup framework, all hooks to theory_str are redirected to theory_seq
							
							
							
							
							
						 | 
						
							2017-05-02 17:16:35 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								a418f0c30b
								
							
						 | 
						
							
							
								
								fix spacing
							
							
							
							
							
						 | 
						
							2017-05-02 15:52:35 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6d527c5d5
								
							
						 | 
						
							
							
								
								remove trace code from theory_arith
							
							
							
							
							
						 | 
						
							2017-05-02 15:39:15 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								15cb2d7dba
								
							
						 | 
						
							
							
								
								cleanup
							
							
							
							
							
						 | 
						
							2017-05-02 14:08:48 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8d069ba46
								
							
						 | 
						
							
							
								
								refactor: add asserts, use case split strategy param
							
							
							
							
							
						 | 
						
							2017-05-02 13:06:08 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b4792955d
								
							
						 | 
						
							
							
								
								theory-aware branching heuristic
							
							
							
							
							
						 | 
						
							2017-05-02 10:43:40 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								6cd1f877b8
								
							
						 | 
						
							
							
								
								params for theory aware branching
							
							
							
							
							
						 | 
						
							2017-05-02 10:39:32 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								0862949e66
								
							
						 | 
						
							
							
								
								Merge branch 'upstream-master' into develop
							
							
							
							
							
							
							
							Conflicts:
	src/smt/params/smt_params.cpp
	src/smt/params/smt_params.h
	src/smt/smt_context.cpp
	src/smt/smt_context.h 
							
						 | 
						
							2017-05-01 21:33:23 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								48e37b0e16
								
							
						 | 
						
							
							
								
								pass qhead
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-05-01 16:54:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								8ba78081ec
								
							
						 | 
						
							
							
								
								fix build break
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-05-01 16:41:17 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								61e0fc9099
								
							
						 | 
						
							
							
								
								Merge pull request #995 from mtrberzi/theory-case-split
							
							
							
							
							
							
							
							Theory case split heuristic (for theory_str) 
							
						 | 
						
							2017-05-01 15:27:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								16a5e944d7
								
							
						 | 
						
							
							
								
								use reference for case split sets
							
							
							
							
							
						 | 
						
							2017-05-01 18:25:54 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								b86d472eaf
								
							
						 | 
						
							
							
								
								simplify theory case split handling
							
							
							
							
							
						 | 
						
							2017-05-01 18:22:49 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								d14f2af5ae
								
							
						 | 
						
							
							
								
								deal with subtraction that manages to sneak in. Issue  #996
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-05-01 15:22:06 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								3bce61e0d4
								
							
						 | 
						
							
							
								
								fix warning
							
							
							
							
							
						 | 
						
							2017-05-01 10:43:33 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f56d128b0
								
							
						 | 
						
							
							
								
								add theory case split support to smt_context
							
							
							
							
							
						 | 
						
							2017-05-01 10:34:43 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								f655e1976e
								
							
						 | 
						
							
							
								
								add params for theory case split
							
							
							
							
							
						 | 
						
							2017-05-01 10:18:38 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								4468816d32
								
							
						 | 
						
							
							
								
								fix unused variables
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-29 19:00:15 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3f720c2bf
								
							
						 | 
						
							
							
								
								fix unused variables
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-29 18:58:34 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								3152833893
								
							
						 | 
						
							
							
								
								fix unused variables
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-29 18:55:47 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa868e058e
								
							
						 | 
						
							
							
								
								fix bound bug #991
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-29 17:39:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								8205b45839
								
							
						 | 
						
							
							
								
								initial integration of opt
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-27 19:13:00 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								d16b20d62b
								
							
						 | 
						
							
							
								
								Merge branch 'upstream-master' into develop
							
							
							
							
							
						 | 
						
							2017-04-26 17:21:10 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								dedc130e98
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/Z3Prover/z3
							
							
							
							
							
						 | 
						
							2017-04-25 10:30:16 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd8b0186d6
								
							
						 | 
						
							
							
								
								make SMT consequence finding work with compound terms and formulas
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-25 10:30:10 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fececaad9
								
							
						 | 
						
							
							
								
								fix str/seq parameter config
							
							
							
							
							
						 | 
						
							2017-04-24 21:47:31 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								48b62d34b7
								
							
						 | 
						
							
							
								
								make sure consequence generation works with interpreted atoms/terms
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-24 18:08:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								54e28a4fe7
								
							
						 | 
						
							
							
								
								string/sequence static features test
							
							
							
							
							
						 | 
						
							2017-04-24 21:02:22 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								3fe49137d0
								
							
						 | 
						
							
							
								
								fix trace typos
							
							
							
							
							
						 | 
						
							2017-04-24 19:25:35 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								8ce93b4ee5
								
							
						 | 
						
							
							
								
								unify tracing in theory_str to 'str' tag
							
							
							
							
							
						 | 
						
							2017-04-24 15:39:25 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								c46f95a629
								
							
						 | 
						
							
							
								
								remove unused parameter from smt_context
							
							
							
							
							
						 | 
						
							2017-04-24 12:39:55 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e8a4e2a01
								
							
						 | 
						
							
							
								
								Merge branch 'upstream-master' into develop
							
							
							
							
							
							
							
							Conflicts:
	src/smt/smt_context.cpp 
							
						 | 
						
							2017-04-24 12:28:16 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								d052155f6e
								
							
						 | 
						
							
							
								
								parallelizing ccc
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-23 14:46:46 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								5068d2083d
								
							
						 | 
						
							
							
								
								tidy
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-22 11:36:03 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								367cc4b77f
								
							
						 | 
						
							
							
								
								check result of unsat core validation
							
							
							
							
							
						 | 
						
							2017-04-22 13:36:09 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								06cd07e3c2
								
							
						 | 
						
							
							
								
								Merge branch 'theory-assumptions' into develop
							
							
							
							
							
							
							
							Conflicts:
	src/smt/smt_context.cpp
	src/smt/smt_context.h
	src/smt/smt_theory.h 
							
						 | 
						
							2017-04-22 13:31:43 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								a1bb1f2a13
								
							
						 | 
						
							
							
								
								pre-init assumptions and unsat core validation for smt theories
							
							
							
							
							
						 | 
						
							2017-04-22 13:15:00 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								5cfe5e15ac
								
							
						 | 
						
							
							
								
								unsat core validation for smt theories
							
							
							
							
							
						 | 
						
							2017-04-21 17:51:14 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								0a0b17540f
								
							
						 | 
						
							
							
								
								Added rlimit.inc() for expensive interval exponentiation in the non-linear arithmetic theory.
							
							
							
							
							
						 | 
						
							2017-04-19 13:07:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								a02a7f4443
								
							
						 | 
						
							
							
								
								Whitespace
							
							
							
							
							
						 | 
						
							2017-04-19 13:04:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								bef64961ae
								
							
						 | 
						
							
							
								
								add pre-init assumptions for smt theories
							
							
							
							
							
						 | 
						
							2017-04-18 13:12:03 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Christoph M. Wintersteiger
								
							 
						 | 
						
							
							
							
							
								
							
							
								71da36f85c
								
							
						 | 
						
							
							
								
								Added core.extend_nonlocal_patterns parameter to improve unsat cores.
							
							
							
							
							
						 | 
						
							2017-04-18 15:13:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								66e61b8a31
								
							
						 | 
						
							
							
								
								issues #963 #912
							
							
							
							
							
						 | 
						
							2017-04-17 03:06:38 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f72bf4ef
								
							
						 | 
						
							
							
								
								add overlap assumption to other cases in theory_str
							
							
							
							
							
						 | 
						
							2017-04-13 13:46:23 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Murphy Berzish
								
							 
						 | 
						
							
							
							
							
								
							
							
								7207cabc97
								
							
						 | 
						
							
							
								
								experimental new unsat core based overlap detection
							
							
							
							
							
						 | 
						
							2017-04-12 17:09:35 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								4140afa4cb
								
							
						 | 
						
							
							
								
								add regular expression membership for range of int.to.str functions. Issue #957
							
							
							
							
							
							
							
							Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> 
							
						 | 
						
							2017-04-11 10:49:42 +08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolaj Bjorner
								
							 
						 | 
						
							
							
							
							
								
							
							
								80c10d5833
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/Z3Prover/z3
							
							
							
							
							
						 | 
						
							2017-04-07 21:22:48 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |