Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
sat4j
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
53
Issues
53
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
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
SAT4J
sat4j
Commits
57ca63cf
Commit
57ca63cf
authored
Jun 22, 2020
by
Romain Wallon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes a missing method and uses LBD-based restarts in resolution-based solvers
parent
9f33062a
Pipeline
#8895
failed with stages
in 32 minutes and 49 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
org.sat4j.core/src/main/java/org/sat4j/minisat/orders/OrientedOrder.java
...src/main/java/org/sat4j/minisat/orders/OrientedOrder.java
+5
-0
org.sat4j.pb/src/main/java/org/sat4j/pb/SolverFactory.java
org.sat4j.pb/src/main/java/org/sat4j/pb/SolverFactory.java
+3
-3
No files found.
org.sat4j.core/src/main/java/org/sat4j/minisat/orders/OrientedOrder.java
View file @
57ca63cf
...
...
@@ -69,6 +69,11 @@ public class OrientedOrder implements IOrder {
}
}
@Override
public
void
updateVar
(
int
p
,
double
value
)
{
updateVar
(
p
);
}
@Override
public
void
init
()
{
order
.
init
();
...
...
org.sat4j.pb/src/main/java/org/sat4j/pb/SolverFactory.java
View file @
57ca63cf
...
...
@@ -930,7 +930,7 @@ public final class SolverFactory extends ASolverFactory<IPBSolver> {
PBSolverResolution
solver
=
newCompetPBResLongWLMixedConstraintsObjectiveExpSimp
();
solver
.
setSimplifier
(
Solver
.
NO_SIMPLIFICATION
);
solver
.
setRestartStrategy
(
new
Glucose21Restarts
());
solver
.
setLearnedConstraintsDeletionStrategy
(
solver
.
activity
_based
);
solver
.
setLearnedConstraintsDeletionStrategy
(
solver
.
lbd
_based
);
return
solver
;
}
...
...
@@ -986,7 +986,7 @@ public final class SolverFactory extends ASolverFactory<IPBSolver> {
*/
public
static
IPBSolver
newSimpleSimplification
()
{
PBSolverResolution
solver
=
newCompetPBResWLMixedConstraintsObjectiveExpSimp
();
solver
.
setLearnedConstraintsDeletionStrategy
(
solver
.
activity
_based
);
solver
.
setLearnedConstraintsDeletionStrategy
(
solver
.
lbd
_based
);
solver
.
setSimplifier
(
solver
.
SIMPLE_SIMPLIFICATION
);
return
solver
;
}
...
...
@@ -1000,7 +1000,7 @@ public final class SolverFactory extends ASolverFactory<IPBSolver> {
*/
public
static
IPBSolver
newResolutionSimpleRestarts
()
{
PBSolverResolution
solver
=
newCompetPBResLongWLMixedConstraintsObjectiveExpSimp
();
solver
.
setLearnedConstraintsDeletionStrategy
(
solver
.
activity
_based
);
solver
.
setLearnedConstraintsDeletionStrategy
(
solver
.
lbd
_based
);
solver
.
setRestartStrategy
(
new
MiniSATRestarts
());
return
solver
;
}
...
...
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