Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
SAT4J
sat4j
Commits
e3844021
Commit
e3844021
authored
Oct 18, 2017
by
Daniel Le Berre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated statistics
parent
3c92dfc8
Pipeline
#281
passed with stages
in 23 minutes and 8 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
org.sat4j.core/src/main/java/org/sat4j/minisat/core/Solver.java
...t4j.core/src/main/java/org/sat4j/minisat/core/Solver.java
+2
-3
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
...rc/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
+1
-0
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverStats.java
...t4j.pb/src/main/java/org/sat4j/pb/core/PBSolverStats.java
+8
-0
No files found.
org.sat4j.core/src/main/java/org/sat4j/minisat/core/Solver.java
View file @
e3844021
...
...
@@ -1881,10 +1881,9 @@ public class Solver<D extends DataStructureFactory>
count
.
inc
();
}
}
out
.
print
(
prefix
);
out
.
println
(
"learnt constraints type "
);
for
(
Map
.
Entry
<
String
,
Counter
>
entry
:
learntTypes
.
entrySet
())
{
out
.
println
(
prefix
+
entry
.
getKey
()
+
" => "
+
entry
.
getValue
());
out
.
println
(
prefix
+
"learnt constraints type "
+
entry
.
getKey
()
+
"\t: "
+
entry
.
getValue
());
}
}
...
...
org.sat4j.pb/src/main/java/org/sat4j/pb/constraints/pb/ConflictMap.java
View file @
e3844021
...
...
@@ -328,6 +328,7 @@ public class ConflictMap extends MapPb implements IConflict {
}
stats
.
numberOfDerivationSteps
++;
assert
slackConflict
().
signum
()
<
0
;
assert
this
.
degree
.
signum
()
>=
0
;
...
...
org.sat4j.pb/src/main/java/org/sat4j/pb/core/PBSolverStats.java
View file @
e3844021
...
...
@@ -62,6 +62,8 @@ public class PBSolverStats extends SolverStats {
public
long
numberOfInternalSkipping
;
public
long
numberOfDerivationSteps
;
@Override
public
void
reset
()
{
super
.
reset
();
...
...
@@ -75,6 +77,7 @@ public class PBSolverStats extends SolverStats {
this
.
numberOfReductionsByGCD
=
0
;
this
.
numberOfEndingSkipping
=
0
;
this
.
numberOfInternalSkipping
=
0
;
this
.
numberOfDerivationSteps
=
0
;
}
@Override
...
...
@@ -108,6 +111,11 @@ public class PBSolverStats extends SolverStats {
+
this
.
numberOfEndingSkipping
);
out
.
println
(
prefix
+
"number of internal skipping \t: "
+
this
.
numberOfInternalSkipping
);
out
.
println
(
prefix
+
"number of derivation steps \t: "
+
this
.
numberOfDerivationSteps
);
out
.
println
(
prefix
+
"number of skipped derivation steps \t: "
+
(
this
.
numberOfInternalSkipping
+
this
.
numberOfEndingSkipping
));
}
}
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