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
1bcf9303
Commit
1bcf9303
authored
Oct 28, 2019
by
Romain WALLON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the reduction to clause.
parent
1af826fe
Pipeline
#6857
passed with stage
in 38 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
...rc/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
+7
-5
No files found.
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
View file @
1bcf9303
...
...
@@ -423,7 +423,7 @@ public class ConflictMap extends MapPb implements IConflict {
}
}
assert
slackConflict
().
signum
()
<
0
;
//assert slackConflict().equals(currentSlack.subtract(degree));
//
assert slackConflict().equals(currentSlack.subtract(degree));
// cutting plane
this
.
degree
=
cuttingPlane
(
cpb
,
degreeCons
,
coefsCons
,
...
...
@@ -436,7 +436,7 @@ public class ConflictMap extends MapPb implements IConflict {
assert
getLevelByLevel
(
nLitImplied
)
==
-
1
;
assert
this
.
degree
.
signum
()
>
0
;
assert
slackConflict
().
signum
()
<
0
;
//assert slackConflict().equals(currentSlack.subtract(degree));
//
assert slackConflict().equals(currentSlack.subtract(degree));
// saturation
this
.
degree
=
saturation
();
...
...
@@ -809,6 +809,10 @@ public class ConflictMap extends MapPb implements IConflict {
return
value
;
}
@Override
public
String
toString
()
{
return
value
.
toString
();
}
}
/**
...
...
@@ -859,8 +863,7 @@ public class ConflictMap extends MapPb implements IConflict {
int
at
=
0
;
for
(
Integer
lvl
:
levels
)
{
s
=
s
.
subtract
(
bylvl
.
get
(
lvl
).
getValue
());
for
(;;
at
++)
{
assert
at
<
vv_indices
.
size
();
for
(;
at
<
vv_indices
.
size
();
at
++)
{
int
i
=
vv_indices
.
get
(
at
);
int
l
=
weightedLits
.
getLit
(
i
);
BigInteger
coef
=
weightedLits
.
getCoef
(
i
);
...
...
@@ -873,7 +876,6 @@ public class ConflictMap extends MapPb implements IConflict {
}
}
}
assert
false
;
return
0
;
}
...
...
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