mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 11:55:51 +00:00
Code Activity
4689 commits 24 branches 48 tags 158 MiB
Commit graph

450 commits

Author SHA1 Message Date
Christoph M. Wintersteiger
da4a2d6426 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 21:54:40 +01:00
Christoph M. Wintersteiger
23dccdc7d5 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-25 21:54:08 +01:00
Christoph M. Wintersteiger
5f0739cdc0 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 21:50:29 +01:00
Christoph M. Wintersteiger
c9c40877a7 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-25 21:49:35 +01:00
Christoph M. Wintersteiger
5fab191c6c compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-25 18:58:19 +01:00
Christoph M. Wintersteiger
8fe2db1eed Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 18:11:48 +01:00
Christoph M. Wintersteiger
4ff6a7c38d compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-25 18:11:30 +01:00
Christoph M. Wintersteiger
216b4d1aaa Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-04-25 18:06:03 +01:00
Christoph M. Wintersteiger
ac206bacbf Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 
Conflicts:
	src/tactic/sls/sls_compilation_settings.h

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-25 18:05:53 +01:00
Christoph M. Wintersteiger
bfdea4242c removed unused file 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-25 18:03:35 +01:00
Christoph M. Wintersteiger
a3f20774a8 BVSLS comments 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-25 17:17:47 +01:00
Andreas Froehlich
3df2967be9 Cleaned up final SLS version. Enjoy! 2014-04-25 13:56:15 +01:00
Christoph M. Wintersteiger
fb4c07a2ea FPA refactoring in preparation for FPA support in the kernel. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-23 18:36:38 +01:00
Andreas Froehlich
9ebfb119db Moved parameters to the right file. Almost clean. 2014-04-23 14:52:18 +01:00
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
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
Andreas Froehlich
c441bb4388 Backup before I touch early pruning ... 2014-04-22 16:10:44 +01:00
Andreas Froehlich
8346aed39c Fixed bug with VNS repick. 2014-04-22 01:07:30 +01:00
Andreas Froehlich
c1741d7941 Almost cleaned up version. 2014-04-22 00:32:45 +01:00
Andreas Froehlich
5ab65d52a6 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into bvsls 
Conflicts:
	src/tactic/sls/sls_engine.cpp
	src/tactic/sls/sls_engine.h
	src/tactic/sls/sls_evaluator.h
	src/tactic/sls/sls_tracker.h
 2014-04-21 17:05:19 +01:00
Andreas Froehlich
ef1d8f2acc Current version before integration ... 2014-04-20 16:38:49 +01: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
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
Christoph M. Wintersteiger
52b54f395b FPA division bugfix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-04-10 19:33:34 +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
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
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
c068db16e8 first attempts at getting to the bvsls from opt_context. 2014-03-28 17:46:26 +00: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
Christoph M. Wintersteiger
24d662ba49 bvsls refactoring 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-03-28 14:58:59 +00:00
Christoph M. Wintersteiger
2da9392e9e Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 12:30:58 +00:00
Christoph M. Wintersteiger
8e5659ac4c compilation fixes 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-03-28 12:30:15 +00:00
Christoph M. Wintersteiger
965157e354 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 12:28:53 +00:00
Christoph M. Wintersteiger
176715aea0 compilation fix 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-03-28 12:28:40 +00:00
Christoph M. Wintersteiger
715ce15dec Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-28 12:27:26 +00:00
Christoph M. Wintersteiger
883762d54a removed dependency of bvsls on goal_refs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-03-28 12:27:06 +00:00
Christoph M. Wintersteiger
2103bc3831 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-27 13:37:34 +00:00
Christoph M. Wintersteiger
c5e059211f bugfix 2014-03-27 13:37:04 +00:00
Christoph M. Wintersteiger
1c5cf3638d Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-27 13:35:40 +00:00
Christoph M. Wintersteiger
be2066a1a6 disabled old code 2014-03-27 13:34:21 +00:00
Christoph M. Wintersteiger
3ab1766588 Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt 2014-03-27 13:13:10 +00:00
Christoph M. Wintersteiger
6f9a348f63 removed dependency of bvsls on goal_refs 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-03-26 17:26:06 +00:00
Christoph M. Wintersteiger
96ab83d944 removed unnecessary changes for bvsls 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2014-03-26 13:08:13 +00:00