Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
inox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LARA
inox
Commits
202ff967
Commit
202ff967
authored
12 years ago
by
Etienne Kneuss
Browse files
Options
Downloads
Patches
Plain Diff
Implement solveSATWithCores
parent
d4c0745b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/scala/leon/solvers/Solver.scala
+9
-0
9 additions, 0 deletions
src/main/scala/leon/solvers/Solver.scala
src/main/scala/leon/solvers/z3/FairZ3Solver.scala
+5
-0
5 additions, 0 deletions
src/main/scala/leon/solvers/z3/FairZ3Solver.scala
with
14 additions
and
0 deletions
src/main/scala/leon/solvers/Solver.scala
+
9
−
0
View file @
202ff967
...
@@ -33,6 +33,15 @@ abstract class Solver(val reporter: Reporter) extends Extension(reporter) {
...
@@ -33,6 +33,15 @@ abstract class Solver(val reporter: Reporter) extends Extension(reporter) {
}
}
}
}
def
solveSATWithCores
(
expression
:
Expr
,
assumptions
:
Set
[
Expr
])
:
(
Option
[
Boolean
],
Map
[
Identifier
,
Expr
],
Set
[
Expr
])
=
{
solveSAT
(
And
(
expression
+:
assumptions
.
toSeq
))
match
{
case
(
Some
(
false
),
_
)
=>
(
Some
(
false
),
Map
(),
assumptions
)
case
(
r
,
m
)
=>
(
r
,
m
,
Set
())
}
}
def
superseeds
:
Seq
[
String
]
=
Nil
def
superseeds
:
Seq
[
String
]
=
Nil
private
var
_forceStop
=
false
private
var
_forceStop
=
false
...
...
This diff is collapsed.
Click to expand it.
src/main/scala/leon/solvers/z3/FairZ3Solver.scala
+
5
−
0
View file @
202ff967
...
@@ -161,6 +161,11 @@ class FairZ3Solver(reporter: Reporter) extends Solver(reporter) with AbstractZ3S
...
@@ -161,6 +161,11 @@ class FairZ3Solver(reporter: Reporter) extends Solver(reporter) with AbstractZ3S
}
}
}
}
override
def
solveSATWithCores
(
expression
:
Expr
,
assumptions
:
Set
[
Expr
])
:
(
Option
[
Boolean
],
Map
[
Identifier
,
Expr
],
Set
[
Expr
])
=
{
restartZ3
decideWithModel
(
expression
,
false
,
None
,
Some
(
assumptions
))
}
private
[
this
]
def
decideWithModel
(
vc
:
Expr
,
forValidity
:
Boolean
,
evaluator
:
Option
[(
Map
[
Identifier
,
Expr
])
=>
Boolean
]
=
None
,
assumptions
:
Option
[
Set
[
Expr
]]
=
None
)
:
(
Option
[
Boolean
],
Map
[
Identifier
,
Expr
],
Set
[
Expr
])
=
{
private
[
this
]
def
decideWithModel
(
vc
:
Expr
,
forValidity
:
Boolean
,
evaluator
:
Option
[(
Map
[
Identifier
,
Expr
])
=>
Boolean
]
=
None
,
assumptions
:
Option
[
Set
[
Expr
]]
=
None
)
:
(
Option
[
Boolean
],
Map
[
Identifier
,
Expr
],
Set
[
Expr
])
=
{
val
initializationStopwatch
=
new
Stopwatch
(
"init"
,
false
)
val
initializationStopwatch
=
new
Stopwatch
(
"init"
,
false
)
val
blocking2Z3Stopwatch
=
new
Stopwatch
(
"blocking-set-to-z3"
,
false
)
val
blocking2Z3Stopwatch
=
new
Stopwatch
(
"blocking-set-to-z3"
,
false
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment