Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SAT4J
sat4j
Commits
a363f476
Commit
a363f476
authored
Apr 10, 2017
by
Anne Parrain
Browse files
PBSolverCPCard and Clause aerning really inherits from PBSolverCPLong
parent
7954f63d
Pipeline
#103
passed with stage
in 11 minutes and 43 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverCPCardLearning.java
View file @
a363f476
...
...
@@ -5,6 +5,7 @@ import org.sat4j.minisat.core.LearningStrategy;
import
org.sat4j.minisat.core.RestartStrategy
;
import
org.sat4j.minisat.core.SearchParams
;
import
org.sat4j.pb.constraints.pb.ConflictMap
;
import
org.sat4j.pb.constraints.pb.ConflictMapReduceToClause
;
import
org.sat4j.pb.constraints.pb.IConflict
;
import
org.sat4j.pb.constraints.pb.PBConstr
;
...
...
@@ -57,8 +58,8 @@ public class PBSolverCPCardLearning extends PBSolverCPLong {
@Override
protected
IConflict
chooseConflict
(
PBConstr
myconfl
,
int
level
)
{
return
ConflictMap
.
createConflict
(
myconfl
,
level
,
noRemove
,
ConflictMap
.
POSTPROCESSTOCARD
);
return
ConflictMap
ReduceToClause
.
createConflict
(
myconfl
,
level
,
noRemove
,
ConflictMap
.
POSTPROCESSTOCARD
);
}
@Override
...
...
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverCPClauseLearning.java
View file @
a363f476
...
...
@@ -5,6 +5,7 @@ import org.sat4j.minisat.core.LearningStrategy;
import
org.sat4j.minisat.core.RestartStrategy
;
import
org.sat4j.minisat.core.SearchParams
;
import
org.sat4j.pb.constraints.pb.ConflictMap
;
import
org.sat4j.pb.constraints.pb.ConflictMapReduceToClause
;
import
org.sat4j.pb.constraints.pb.IConflict
;
import
org.sat4j.pb.constraints.pb.PBConstr
;
...
...
@@ -62,8 +63,8 @@ public class PBSolverCPClauseLearning extends PBSolverCPLong {
@Override
protected
IConflict
chooseConflict
(
PBConstr
myconfl
,
int
level
)
{
return
ConflictMap
.
createConflict
(
myconfl
,
level
,
noRemove
,
ConflictMap
.
POSTPROCESSTOCLAUSE
);
return
ConflictMap
ReduceToClause
.
createConflict
(
myconfl
,
level
,
noRemove
,
ConflictMap
.
POSTPROCESSTOCLAUSE
);
}
@Override
...
...
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