Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
BigDataViewer_Core_Extension
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
Container 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
BioinformaticDataCompression
BigDataViewer_Core_Extension
Commits
27ab73fa
Commit
27ab73fa
authored
8 years ago
by
Tobias Pietzsch
Browse files
Options
Downloads
Patches
Plain Diff
WIP: fine-grained progress through state transition path.
Old method will not be enough for WeakRefVolatileCache
parent
ecf548e8
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/verify/Literal.java
+56
-14
56 additions, 14 deletions
src/main/java/verify/Literal.java
src/main/java/verify/SatPlayground.java
+96
-24
96 additions, 24 deletions
src/main/java/verify/SatPlayground.java
with
152 additions
and
38 deletions
src/main/java/verify/Literal.java
+
56
−
14
View file @
27ab73fa
package
verify
;
import
static
verify
.
SatPlayground
.
State
.
A
;
import
verify.SatPlayground.State
;
public
class
Literal
implements
Comparable
<
Literal
>
{
protected
final
State
s
;
protected
final
State
s2
;
protected
final
int
t
;
protected
final
int
t2
;
protected
final
String
type
;
protected
final
boolean
negated
;
public
Literal
(
final
State
s
,
final
int
t
,
final
String
type
,
final
boolean
negated
)
private
final
int
hashcode
;
public
Literal
(
final
State
s
,
final
State
s2
,
final
int
t
,
final
int
t2
,
final
String
type
,
final
boolean
negated
)
{
assert
(
t
>=
0
);
this
.
s
=
s
;
this
.
s2
=
s2
;
this
.
t
=
t
;
this
.
t2
=
t2
;
this
.
type
=
type
;
this
.
negated
=
negated
;
int
value
=
s
.
hashCode
();
value
=
31
*
value
+
s2
.
hashCode
();
value
=
31
*
value
+
t
;
value
=
31
*
value
+
t2
;
value
=
31
*
value
+
Boolean
.
hashCode
(
negated
);
value
=
31
*
value
+
type
.
hashCode
();
hashcode
=
value
;
}
public
Literal
getVariable
()
{
return
negated
?
new
Literal
(
s
,
t
,
type
,
false
)
:
this
;
return
negated
?
new
Literal
(
s
,
s2
,
t
,
t2
,
type
,
false
)
:
this
;
}
public
boolean
negated
()
...
...
@@ -34,7 +52,7 @@ public class Literal implements Comparable< Literal >
@Override
public
int
hashCode
()
{
return
31
*
(
31
*
(
31
*
s
.
hash
C
ode
()
+
t
)
+
Boolean
.
hashCode
(
negated
)
)
+
type
.
hashCode
()
;
return
hash
c
ode
;
}
@Override
...
...
@@ -45,7 +63,9 @@ public class Literal implements Comparable< Literal >
final
Literal
other
=
(
Literal
)
obj
;
return
(
other
.
negated
==
this
.
negated
)
&&
(
other
.
t
==
this
.
t
)
&&
(
other
.
t2
==
this
.
t2
)
&&
(
other
.
s
==
this
.
s
)
&&
(
other
.
s2
==
this
.
s2
)
&&
(
other
.
type
==
this
.
type
);
}
...
...
@@ -59,29 +79,51 @@ public class Literal implements Comparable< Literal >
public
int
compareTo
(
final
Literal
o
)
{
int
c
=
t
-
o
.
t
;
if
(
c
==
0
)
{
c
=
s
.
compareTo
(
o
.
s
);
if
(
c
==
0
)
{
c
=
(
negated
?
1
:
0
)
-
(
o
.
negated
?
1
:
0
);
}
}
if
(
c
!=
0
)
return
c
;
c
=
t2
-
o
.
t2
;
if
(
c
!=
0
)
return
c
;
c
=
s
.
compareTo
(
o
.
s
);
if
(
c
!=
0
)
return
c
;
c
=
s2
.
compareTo
(
o
.
s2
);
if
(
c
!=
0
)
return
c
;
c
=
type
.
compareTo
(
o
.
type
);
if
(
c
!=
0
)
return
c
;
c
=
(
negated
?
1
:
0
)
-
(
o
.
negated
?
1
:
0
);
return
c
;
}
public
static
Literal
var
(
final
State
s
,
final
int
t
)
{
return
new
Literal
(
s
,
t
,
"p"
,
false
);
return
new
Literal
(
s
,
A
,
t
,
0
,
"p"
,
false
);
}
public
static
Literal
fvar
(
final
State
s
,
final
int
t
)
{
return
new
Literal
(
s
,
t
,
"f"
,
false
);
return
new
Literal
(
s
,
A
,
t
,
0
,
"f"
,
false
);
}
public
static
Literal
bvar
(
final
State
s
,
final
State
s2
,
final
int
t
)
{
return
new
Literal
(
s
,
s2
,
t
,
0
,
"b"
,
false
);
}
public
static
Literal
qvar
(
final
State
s
,
final
int
t
,
final
int
step
)
{
return
new
Literal
(
s
,
A
,
t
,
step
,
"q"
,
false
);
}
public
static
Literal
not
(
final
Literal
literal
)
{
return
new
Literal
(
literal
.
s
,
literal
.
t
,
literal
.
type
,
!
literal
.
negated
);
return
new
Literal
(
literal
.
s
,
literal
.
s2
,
literal
.
t
,
literal
.
t2
,
literal
.
type
,
!
literal
.
negated
);
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/verify/SatPlayground.java
+
96
−
24
View file @
27ab73fa
package
verify
;
import
static
verify
.
Literal
.
bvar
;
import
static
verify
.
Literal
.
fvar
;
import
static
verify
.
Literal
.
not
;
import
static
verify
.
Literal
.
qvar
;
import
static
verify
.
Literal
.
var
;
//import static verify.SatPlayground.State.*;
import
static
verify
.
SatPlayground
.
State
.
A
;
...
...
@@ -22,9 +24,6 @@ import org.sat4j.specs.ISolver;
import
org.sat4j.specs.TimeoutException
;
import
org.sat4j.tools.ModelIterator
;
import
net.imglib2.util.Pair
;
import
net.imglib2.util.ValuePair
;
public
class
SatPlayground
{
public
static
enum
State
...
...
@@ -32,17 +31,59 @@ public class SatPlayground
A
,
B
,
C
,
D
,
E
;
}
public
static
class
Transition
{
final
State
from
;
final
State
to
;
public
Transition
(
final
State
from
,
final
State
to
)
{
this
.
from
=
from
;
this
.
to
=
to
;
}
@Override
public
int
hashCode
()
{
return
31
*
from
.
hashCode
()
+
to
.
hashCode
();
}
@Override
public
boolean
equals
(
final
Object
obj
)
{
if
(
!
(
obj
instanceof
Transition
)
)
return
false
;
final
Transition
other
=
(
Transition
)
obj
;
return
this
.
from
==
other
.
from
&&
this
.
to
==
other
.
to
;
}
@Override
public
String
toString
()
{
return
"("
+
from
+
"->"
+
to
+
")"
;
}
}
public
static
Transition
transition
(
final
State
from
,
final
State
to
)
{
return
new
Transition
(
from
,
to
);
}
public
static
int
[][]
defaultTransitions
=
new
int
[][]
{
{
1
,
1
,
1
,
1
,
1
},
{
0
,
1
,
1
,
1
,
1
},
{
0
,
0
,
1
,
1
,
1
},
{
1
,
1
,
0
,
0
,
0
},
{
0
,
1
,
1
,
0
,
0
},
{
0
,
0
,
1
,
1
,
0
},
{
0
,
0
,
0
,
1
,
1
},
{
0
,
0
,
0
,
0
,
1
},
};
public
static
final
LiteralIndexBimap
map
=
new
LiteralIndexBimap
();
public
static
void
addDefaultConstraints
(
final
ISolver
solver
,
final
int
t
)
throws
ContradictionException
public
static
void
addDefaultConstraints
(
final
ISolver
solver
,
final
int
t
,
final
Collection
<
Transition
>
disabledTransitions
)
throws
ContradictionException
{
final
State
[]
ss
=
State
.
values
();
solver
.
addExactly
(
...
...
@@ -52,6 +93,17 @@ public class SatPlayground
.
collect
(
Collectors
.
toList
()
)
),
1
);
for
(
int
step
=
0
;
step
<
ss
.
length
;
++
step
)
{
final
int
fstep
=
step
;
solver
.
addExactly
(
map
.
clause
(
Arrays
.
stream
(
ss
)
.
map
(
s
->
qvar
(
s
,
t
,
fstep
)
)
.
collect
(
Collectors
.
toList
()
)
),
1
);
}
if
(
t
>
0
)
{
for
(
int
r
=
0
;
r
<
ss
.
length
;
++
r
)
...
...
@@ -59,11 +111,29 @@ public class SatPlayground
for
(
int
c
=
0
;
c
<
ss
.
length
;
++
c
)
{
if
(
defaultTransitions
[
r
][
c
]
==
0
)
{
solver
.
addClause
(
map
.
clause
(
bvar
(
ss
[
r
],
ss
[
c
],
t
)
)
);
for
(
int
step
=
0
;
step
<
ss
.
length
-
1
;
++
step
)
solver
.
addClause
(
map
.
clause
(
not
(
var
(
ss
[
r
],
t
-
1
)
),
not
(
var
(
ss
[
c
],
t
)
)
)
);
}
not
(
bvar
(
ss
[
r
],
ss
[
c
],
t
)
),
not
(
qvar
(
ss
[
r
],
t
,
step
)
),
not
(
qvar
(
ss
[
c
],
t
,
step
+
1
)
)
)
);
solver
.
addClause
(
map
.
clause
(
not
(
var
(
ss
[
r
],
t
-
1
)
),
qvar
(
ss
[
r
],
t
,
0
)
)
);
// solver.addClause( map.clause(
// var( ss[ r ], t - 1 ),
// not( qvar( ss[ r ], t, 0 ) ) ) );
solver
.
addClause
(
map
.
clause
(
var
(
ss
[
c
],
t
),
not
(
qvar
(
ss
[
c
],
t
,
ss
.
length
-
1
)
)
)
);
// solver.addClause( map.clause(
// not( var( ss[ c ], t ) ),
// qvar( ss[ c ], t, ss.length - 1 ) ) );
}
}
}
...
...
@@ -218,6 +288,8 @@ public class SatPlayground
{
ArrayList
<
Literal
>
forceVars
=
new
ArrayList
<>();
ArrayList
<
Transition
>
disabledTransitions
=
new
ArrayList
<>();
ArrayList
<
Constraint
>
constraints
=
new
ArrayList
<>();
ISolver
solver
=
SolverFactory
.
newDefault
();
...
...
@@ -227,7 +299,7 @@ public class SatPlayground
for
(
final
Constraint
constraint
:
constraints
)
constraint
.
add
(
solver
,
t
);
addDefaultConstraints
(
solver
,
t
);
addDefaultConstraints
(
solver
,
t
,
disabledTransitions
);
}
public
void
fixForcedVars
(
final
int
up_to_t
)
throws
ContradictionException
...
...
@@ -485,28 +557,28 @@ public class SatPlayground
}
}
static
class
Transition
extends
Program
static
class
Force
Transition
extends
Program
{
private
final
Collection
<
Pair
<
State
,
State
>
>
arrows
;
private
final
Collection
<
Transition
>
arrows
;
public
Transition
(
final
Collection
<
Pair
<
State
,
State
>
>
arrows
,
final
String
name
)
public
Force
Transition
(
final
Collection
<
Transition
>
arrows
,
final
String
name
)
{
super
(
name
);
this
.
arrows
=
arrows
;
}
public
Transition
(
final
State
from
,
final
State
to
,
final
String
name
)
public
Force
Transition
(
final
State
from
,
final
State
to
,
final
String
name
)
{
this
(
Arrays
.
asList
(
new
ValuePair
<>
(
from
,
to
)
),
name
);
this
(
Arrays
.
asList
(
transition
(
from
,
to
)
),
name
);
}
@Override
protected
void
modifyState
(
final
ProblemState
state
)
throws
ContradictionException
{
for
(
final
Pair
<
State
,
State
>
arrow
:
arrows
)
for
(
final
Transition
arrow
:
arrows
)
{
state
.
constraints
.
add
(
new
TransitionConstraint
(
arrow
.
getA
()
,
arrow
.
getB
()
,
t
)
);
state
.
forceVars
.
add
(
fvar
(
arrow
.
getA
()
,
t
)
);
state
.
constraints
.
add
(
new
TransitionConstraint
(
arrow
.
from
,
arrow
.
to
,
t
)
);
state
.
forceVars
.
add
(
fvar
(
arrow
.
from
,
t
)
);
}
state
.
applyConstraints
(
t
);
}
...
...
@@ -643,10 +715,10 @@ public class SatPlayground
new
GetValue
(
v2
,
" v = entry.getValue(); "
)
.
then
(
new
Branch
(
Arrays
.
asList
(
A
,
C
,
D
,
E
),
v2
,
" if ( v == null ) { "
,
new
Transition
(
Arrays
.
asList
(
new
ValuePair
<>
(
A
,
D
),
new
ValuePair
<>
(
B
,
D
),
new
ValuePair
<>
(
C
,
D
)
),
new
Force
Transition
(
Arrays
.
asList
(
transition
(
A
,
D
),
transition
(
B
,
D
),
transition
(
C
,
D
)
),
" map.remove( key, entry ); "
)
.
then
(
new
Nop
(
" return get( key, loader );"
)
),
" } else { "
,
...
...
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