Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
NIWO
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christian Müller
NIWO
Commits
5e41de33
Commit
5e41de33
authored
Feb 27, 2019
by
Christian Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tests
parent
3e408548
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
13 deletions
+5
-13
src/main/scala/de/tum/workflows/toz3/Z3BSFO.scala
src/main/scala/de/tum/workflows/toz3/Z3BSFO.scala
+0
-9
src/main/scala/de/tum/workflows/toz3/Z3FOEncoding.scala
src/main/scala/de/tum/workflows/toz3/Z3FOEncoding.scala
+3
-2
src/test/scala/de/tum/workflows/tests/Z3BSFOTest.scala
src/test/scala/de/tum/workflows/tests/Z3BSFOTest.scala
+2
-2
No files found.
src/main/scala/de/tum/workflows/toz3/Z3BSFO.scala
View file @
5e41de33
...
...
@@ -47,15 +47,6 @@ object Z3BSFO extends LazyLogging {
logger
.
warn
(
s
"Z3-BSFO: Status unknown - ${s.getReasonUnknown()}"
)
}
// in debug mode, check if same result
if
(
Utils
.
DEBUG_MODE
&&
f
.
isUniversal
)
{
val
(
c1
,
s1
)
=
Z3QFree
.
checkUniversal
(
f
)
if
(
c1
!=
c
)
{
logger
.
error
(
"Different results from QFree and BSFO"
)
}
}
(
c
,
s
)
}
logger
.
debug
(
s
"Z3-BSFO call took $time ms"
)
...
...
src/main/scala/de/tum/workflows/toz3/Z3FOEncoding.scala
View file @
5e41de33
...
...
@@ -202,10 +202,11 @@ object Z3FOEncoding extends LazyLogging {
Forall
(
vars
,
inner
)
}
}
case
f2
if
f2
.
isVar
()
||
f2
.
isConst
()
=>
{
// There are no boolean constants, these are all function applications
case
f2
if
f2
.
isVar
||
(
f2
.
isConst
&&
!
f2
.
isBool
)
=>
{
mapbackToVar
(
f2
)
}
// Why is a
a
constant also isApp?
// Why is a constant also isApp?
case
f2
if
f2
.
isApp
()
=>
{
val
name
=
FunNameFromVar
.
unapply
(
f2
.
getFuncDecl
().
getName
.
toString
)
if
(
name
.
isEmpty
)
{
...
...
src/test/scala/de/tum/workflows/tests/Z3BSFOTest.scala
View file @
5e41de33
...
...
@@ -33,7 +33,7 @@ class Z3BSFOTest extends FlatSpec with LazyLogging {
}
it
should
"check equalities"
in
{
val
easyForm
=
Forall
(
List
(
"x"
,
"y"
),
Equ
iv
(
"x"
,
"y"
))
val
easyForm
=
Forall
(
List
(
"x"
,
"y"
),
Equ
al
(
"x"
,
"y"
))
val
(
s
,
solver
)
=
Z3BSFO
.
checkAE
(
easyForm
)
...
...
@@ -42,7 +42,7 @@ class Z3BSFOTest extends FlatSpec with LazyLogging {
}
it
should
"check disequalities"
in
{
val
easyForm
=
Forall
(
List
(
"x"
,
"y"
),
Neg
(
Equ
iv
(
"x"
,
"y"
)))
val
easyForm
=
Forall
(
List
(
"x"
,
"y"
),
Neg
(
Equ
al
(
"x"
,
"y"
)))
val
(
s
,
solver
)
=
Z3BSFO
.
checkAE
(
easyForm
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment