| 
								
								
									 Christoph M. Wintersteiger | 1d49f61b9a | Merge branch 'unstable' of https://github.com/Z3Prover/z3 into contrib Conflicts:
	README
	src/api/ml/build-lib.sh
	src/api/ml/z3.ml
	src/api/ml/z3.mli
	src/api/ml/z3_stubs.c | 2015-04-28 15:19:08 +01:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 8862cb4833 | Java example: Removed throws declarations for Z3Exception. | 2015-04-09 14:52:50 +01:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | e456af142e | fix complex.py example with power prompted by suggestion of smilliken Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> | 2015-03-27 02:42:08 -07:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 0482e7fe72 | cache datatype util in context to avoid performance bug, codeplex issue 195 Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com> | 2015-03-25 11:46:28 -07:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 39892aae10 | cache datatype util in context to avoid performance bug, codeplex issue 195 Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com> | 2015-03-25 11:46:17 -07:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 8059a5a0b7 | cache datatype util in context to avoid performance bug, codeplex issue 195 Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com> | 2015-03-25 11:36:01 -07:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 86ac20faf6 | cache datatype util in context to avoid performance bug, codeplex issue 195 Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com> | 2015-03-25 11:35:44 -07:00 |  | 
				
					
						| 
								
								
									 Nikolaj Bjorner | 2aa91eee70 | cache datatype util in context to avoid performance bug, codeplex issue 195 Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com> | 2015-03-25 11:24:47 -07:00 |  | 
				
					
						| 
								
								
									 nikolajbjorner | 3ca3c948cf | add bit-vector extract shortcuts to C++ API Signed-off-by: nikolajbjorner <nbjorner@microsoft.com> | 2015-02-27 11:08:49 -08:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 9b137d54d3 | Bugfix and new examples for implicit assumptions in Z3_solver_assert_and_track. Thanks to Amir Ebrahimi for reporting this issue! (See http://stackoverflow.com/questions/28558683/modeling-constraints-in-z3-and-unsat-core-cases)
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-02-18 16:25:27 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | b96551a1a2 | .NET/Java/ML: Moved toggle_warning_messages to Global, added en/disable_trace. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-02-07 14:17:39 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | d7a62baef4 | Improved memory use of the Java API. Thanks to Joerg Pfaehler for reporting this issue! + formatting
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-30 21:10:22 -06:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | b92bdaeebe | ML API readme fixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 18:51:47 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | e29abefb12 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng Conflicts:
	scripts/mk_util.py
+ Cosmetics
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-24 18:44:59 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 5c7d0380d3 | Fixes in the OCaml FPA  API and example | 2015-01-24 18:29:52 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 1c9051016a | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng Conflicts:
	scripts/mk_util.py | 2015-01-24 18:29:03 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 65ccc9a8ea | added FPA ML API Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-23 19:36:47 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 48c72d2c38 | FPA API: naming consistency Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-23 18:18:26 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | ffd10675f4 | Merge branch 'unstable' of https://git01.codeplex.com/z3 into ml-ng | 2015-01-23 11:07:48 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 1a6af4385e | Fixed C example Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-21 15:01:50 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | d56d63e3e8 | Merge branch 'fpa-api' of https://git01.codeplex.com/z3 into unstable Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
Conflicts:
	src/tactic/portfolio/default_tactic.cpp | 2015-01-21 14:25:31 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | ed0fa93245 | Minor adjustments after rebase Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:35:19 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 10c153bfe4 | ML API: build fix | 2015-01-19 17:17:13 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 05af33ac7d | ML API: ocamlfind installation fixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:13:52 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 555a3883b9 | ML example doc fix Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:11:18 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 0465ad3ce6 | ML example; or' is deprecated, changed to ||'Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:11:16 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 9dc8021995 | Added facilities for ocamlfind in the ML API build Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:11:15 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 54b7f8eec3 | ML API bugfix (Codeplex issue 102) Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:09:39 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | b889b225a0 | ML cleanup; makefile removed. The example is built by running make examples in the build directory. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:09:36 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | c1e29dabe7 | ML API: renamed assert_ to add Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:08:15 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 050629536a | ML API: bugfix Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:08:14 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | eea13a087f | ML API savegame Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:08:14 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | d293b579f3 | ML API: flat & rich layer in place. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:08:13 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 79d0c32c91 | ML API: replaced arrays with lists. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:08:12 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 6842acbea8 | ML API: Cleanup Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:08:10 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 9142901efe | ML API: bugfixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:08:08 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 9ed926498f | ML API: updated example Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:06:20 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 3347d7ca8c | ML API: moved more objects into normal types. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:06:18 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 6257c56901 | ML API: bugfixes; starting to replace objects with normal types. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:06:18 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 1e2b546b03 | ML API: changed context from object to normal type. Removed optional array parameters. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:06:17 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | e2f6b10e32 | ML API bugfixes More ML examples
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:02:17 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | c03d5277bc | more ML Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:01:36 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 25498345e5 | New ML API bugfixes and first example. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:01:36 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | c2ff90720e | ML API: mk_context added. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:01:35 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 49a4e77a6d | More new ML API. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:01:34 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | c28f0e7c8a | ML API bugfixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:01:31 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 7ae90f0b20 | More ML API: Fixes in native layer.
Added symbols.
Prepared code for automatic documentation.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 17:01:29 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 1685e3dd6f | ML API bugfixes Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 16:57:10 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | 0e98d26721 | ML API and example compilation. Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 16:56:42 +00:00 |  | 
				
					
						| 
								
								
									 Christoph M. Wintersteiger | c9cca119c5 | File renamed Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com> | 2015-01-19 16:55:24 +00:00 |  |