Skip to content

Commit 1669461

Browse files
author
Daniel Kroening
committed
increase verbosity level of CNF statistics
The current verbosity of the number of variables and clauses is 'status' (6), and this commit changes that to 'statistics' (8).
1 parent a2cff1e commit 1669461

10 files changed

+16
-28
lines changed

src/solvers/sat/pbs_dimacs_cnf.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ propt::resultt pbs_dimacs_cnft::prop_solve()
218218
pbfile.close();
219219

220220
// We start counting at 1, thus there is one variable fewer.
221-
messaget::status() << (no_variables() - 1) << " variables, " << clauses.size()
222-
<< " clauses" << eom;
221+
messaget::statistics() << (no_variables() - 1) << " variables, "
222+
<< clauses.size() << " clauses" << eom;
223223

224224
const bool result = pbs_solve();
225225

src/solvers/sat/satcheck_cadical.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ propt::resultt satcheck_cadicalt::prop_solve()
6969
{
7070
INVARIANT(status != statust::ERROR, "there cannot be an error");
7171

72-
messaget::status() << (no_variables() - 1) << " variables, " << clause_counter
73-
<< " clauses" << eom;
72+
messaget::statistics() << (no_variables() - 1) << " variables, "
73+
<< clause_counter << " clauses" << eom;
7474

7575
if(status == statust::UNSAT)
7676
{

src/solvers/sat/satcheck_glucose.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,8 @@ propt::resultt satcheck_glucose_baset<T>::prop_solve()
137137
PRECONDITION(status != statust::ERROR);
138138

139139
// We start counting at 1, thus there is one variable fewer.
140-
{
141-
messaget::status() <<
142-
(no_variables()-1) << " variables, " <<
143-
solver->nClauses() << " clauses" << eom;
144-
}
140+
messaget::statistics() << (no_variables() - 1) << " variables, "
141+
<< solver->nClauses() << " clauses" << eom;
145142

146143
try
147144
{

src/solvers/sat/satcheck_ipasir.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,8 @@ propt::resultt satcheck_ipasirt::prop_solve()
9797
{
9898
INVARIANT(status!=statust::ERROR, "there cannot be an error");
9999

100-
{
101-
messaget::status() <<
102-
(no_variables()-1) << " variables, " <<
103-
clause_counter << " clauses" << eom;
104-
}
100+
messaget::statistics() << (no_variables() - 1) << " variables, "
101+
<< clause_counter << " clauses" << eom;
105102

106103
// use the internal representation, as ipasir does not support reporting the
107104
// status

src/solvers/sat/satcheck_lingeling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ propt::resultt satcheck_lingelingt::prop_solve()
7272
std::string msg=
7373
std::to_string(no_variables()-1)+" variables, "+
7474
std::to_string(clause_counter)+" clauses";
75-
messaget::status() << msg << messaget::eom;
75+
messaget::statistics() << msg << messaget::eom;
7676
}
7777

7878
std::string msg;

src/solvers/sat/satcheck_minisat.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,8 @@ propt::resultt satcheck_minisat1_baset::prop_solve()
154154
{
155155
PRECONDITION(status != ERROR);
156156

157-
{
158-
messaget::status() <<
159-
(_no_variables-1) << " variables, " <<
160-
solver->nClauses() << " clauses" << messaget::eom;
161-
}
157+
messaget::statistics() << (_no_variables - 1) << " variables, "
158+
<< solver->nClauses() << " clauses" << messaget::eom;
162159

163160
add_variables();
164161

src/solvers/sat/satcheck_minisat2.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,8 @@ propt::resultt satcheck_minisat2_baset<T>::prop_solve()
167167
{
168168
PRECONDITION(status != statust::ERROR);
169169

170-
{
171-
messaget::status() <<
172-
(no_variables()-1) << " variables, " <<
173-
solver->nClauses() << " clauses" << eom;
174-
}
170+
messaget::statistics() << (no_variables() - 1) << " variables, "
171+
<< solver->nClauses() << " clauses" << eom;
175172

176173
try
177174
{

src/solvers/sat/satcheck_picosat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ propt::resultt satcheck_picosatt::prop_solve()
7373
std::string msg=
7474
std::to_string(_no_variables-1)+" variables, "+
7575
std::to_string(picosat_added_original_clauses(picosat))+" clauses";
76-
messaget::status() << msg << messaget::eom;
76+
messaget::statistics() << msg << messaget::eom;
7777
}
7878

7979
std::string msg;

src/solvers/sat/satcheck_zchaff.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ propt::resultt satcheck_zchaff_baset::prop_solve()
8181
std::string msg=
8282
std::to_string(solver->num_variables())+" variables, "+
8383
std::to_string(solver->clauses().size())+" clauses";
84-
messaget::status() << msg << messaget::eom;
84+
messaget::statistics() << msg << messaget::eom;
8585
}
8686

8787
SAT_StatusT result=(SAT_StatusT)solver->solve();

src/solvers/sat/satcheck_zcore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ propt::resultt satcheck_zcoret::prop_solve()
4141
std::string msg=
4242
std::to_string(no_variables()-1)+" variables, "+
4343
std::to_string(no_clauses())+" clauses";
44-
messaget::status() << msg << messaget::eom;
44+
messaget::statistics() << msg << messaget::eom;
4545
}
4646

4747
// get the core

0 commit comments

Comments
 (0)