Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
SAT4J
sat4j
Commits
1af826fe
Commit
1af826fe
authored
Dec 02, 2017
by
Jan Elffers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove debug statements
parent
d7168eec
Pipeline
#412
passed with stage
in 30 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
9 deletions
+0
-9
org.sat4j.core/src/main/java/org/sat4j/minisat/core/Solver.java
...t4j.core/src/main/java/org/sat4j/minisat/core/Solver.java
+0
-2
org.sat4j.core/src/main/java/org/sat4j/minisat/orders/VarOrderHeap.java
.../src/main/java/org/sat4j/minisat/orders/VarOrderHeap.java
+0
-1
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
...rc/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
+0
-6
No files found.
org.sat4j.core/src/main/java/org/sat4j/minisat/core/Solver.java
View file @
1af826fe
...
...
@@ -554,7 +554,6 @@ public class Solver<D extends DataStructureFactory>
// literal is already satisfied. Skipping.
return
true
;
}
System
.
out
.
println
(
"enqueue "
+
org
.
sat4j
.
core
.
LiteralsUtils
.
toDimacs
(
p
));
if
(
this
.
voc
.
isFalsified
(
p
))
{
// conflicting enqueued assignment
return
false
;
...
...
@@ -1301,7 +1300,6 @@ public class Solver<D extends DataStructureFactory>
}
}
if
(
confl
!=
null
)
{
System
.
out
.
println
(
"conflict"
);
// conflict found
this
.
stats
.
conflicts
++;
this
.
slistener
.
conflictFound
(
confl
,
decisionLevel
(),
...
...
org.sat4j.core/src/main/java/org/sat4j/minisat/orders/VarOrderHeap.java
View file @
1af826fe
...
...
@@ -114,7 +114,6 @@ public class VarOrderHeap implements IOrder, Serializable {
if
(
this
.
activity
[
var
]
<
0.0001
)
{
this
.
nullchoice
++;
}
System
.
out
.
println
(
"select(): "
+
org
.
sat4j
.
core
.
LiteralsUtils
.
toDimacs
(
next
));
return
next
;
}
}
...
...
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
View file @
1af826fe
...
...
@@ -297,7 +297,6 @@ public class ConflictMap extends MapPb implements IConflict {
*/
public
BigInteger
resolve
(
PBConstr
cpb
,
int
litImplied
,
VarActivityListener
val
)
{
System
.
out
.
println
(
"resolve(cpb="
+
cpb
+
", litImplied="
+
litImplied
+
")"
);
assert
litImplied
>
1
;
int
nLitImplied
=
litImplied
^
1
;
if
(
cpb
==
null
||
!
this
.
weightedLits
.
containsKey
(
nLitImplied
))
{
...
...
@@ -324,10 +323,7 @@ public class ConflictMap extends MapPb implements IConflict {
}
return
this
.
degree
;
}
System
.
out
.
println
(
"resolve? "
+
org
.
sat4j
.
core
.
LiteralsUtils
.
toDimacs
(
litImplied
));
if
(
this
.
allowSkipping
)
{
System
.
out
.
println
(
"skip"
);
System
.
out
.
println
(
"coef: "
+
this
.
weightedLits
.
get
(
nLitImplied
)
+
", slack: "
+
slackConflict
());
if
(
this
.
weightedLits
.
get
(
nLitImplied
).
negate
()
.
compareTo
(
slackConflict
())
>
0
)
{
if
(
this
.
endingSkipping
)
...
...
@@ -350,7 +346,6 @@ public class ConflictMap extends MapPb implements IConflict {
}
stats
.
numberOfDerivationSteps
++;
System
.
out
.
println
(
"resolve "
+
org
.
sat4j
.
core
.
LiteralsUtils
.
toDimacs
(
litImplied
));
assert
slackConflict
().
signum
()
<
0
;
assert
this
.
degree
.
signum
()
>=
0
;
...
...
@@ -447,7 +442,6 @@ public class ConflictMap extends MapPb implements IConflict {
this
.
degree
=
saturation
();
assert
slackConflict
().
signum
()
<
0
;
divideCoefs
();
System
.
out
.
println
(
"after resolve step: "
+
this
);
return
this
.
degree
;
}
...
...
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