Skip to content

Commit 92a9401

Browse files
peterschrammelpeterschrammel
authored
Merge pull request #4400 from peterschrammel/satcheck-messaget
Satcheck doesn't inherit from messaget anymore
2 parents 6533631 + f2c1da9 commit 92a9401

9 files changed

+49
-47
lines changed

‎src/solvers/sat/satcheck_booleforce.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ propt::resultt satcheck_booleforce_baset::do_prop_solve()
103103
break;
104104
}
105105

106-
messaget::status() << msg << messaget::eom;
106+
log.status() << msg << messaget::eom;
107107
}
108108

109109
if(result==BOOLEFORCE_UNSATISFIABLE)

‎src/solvers/sat/satcheck_cadical.cpp

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

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

7575
if(status == statust::UNSAT)
7676
{
77-
messaget::status() << "SAT checker inconsistent: instance is UNSATISFIABLE"
78-
<< eom;
77+
log.status() << "SAT checker inconsistent: instance is UNSATISFIABLE"
78+
<< messaget::eom;
7979
}
8080
else
8181
{
8282
switch(solver->solve())
8383
{
8484
case 10:
85-
messaget::status() << "SAT checker: instance is SATISFIABLE" << eom;
85+
log.status() << "SAT checker: instance is SATISFIABLE" << messaget::eom;
8686
status = statust::SAT;
8787
return resultt::P_SATISFIABLE;
8888
case 20:
89-
messaget::status() << "SAT checker: instance is UNSATISFIABLE" << eom;
89+
log.status() << "SAT checker: instance is UNSATISFIABLE"
90+
<< messaget::eom;
9091
break;
9192
default:
92-
messaget::status() << "SAT checker: solving returned without solution"
93-
<< eom;
93+
log.status() << "SAT checker: solving returned without solution"
94+
<< messaget::eom;
9495
throw analysis_exceptiont(
9596
"solving inside CaDiCaL SAT solver has been interrupted");
9697
}

‎src/solvers/sat/satcheck_glucose.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void satcheck_glucose_baset<T>::set_polarity(literalt a, bool value)
7373
}
7474
catch(Glucose::OutOfMemoryException)
7575
{
76-
messaget::error() << "SAT checker ran out of memory" << eom;
76+
log.error() << "SAT checker ran out of memory" << messaget::eom;
7777
status = statust::ERROR;
7878
throw std::bad_alloc();
7979
}
@@ -125,7 +125,7 @@ void satcheck_glucose_baset<T>::lcnf(const bvt &bv)
125125
}
126126
catch(Glucose::OutOfMemoryException)
127127
{
128-
messaget::error() << "SAT checker ran out of memory" << eom;
128+
log.error() << "SAT checker ran out of memory" << messaget::eom;
129129
status = statust::ERROR;
130130
throw std::bad_alloc();
131131
}
@@ -137,17 +137,17 @@ propt::resultt satcheck_glucose_baset<T>::do_prop_solve()
137137
PRECONDITION(status != statust::ERROR);
138138

139139
// We start counting at 1, thus there is one variable fewer.
140-
messaget::statistics() << (no_variables() - 1) << " variables, "
141-
<< solver->nClauses() << " clauses" << eom;
140+
log.statistics() << (no_variables() - 1) << " variables, "
141+
<< solver->nClauses() << " clauses" << messaget::eom;
142142

143143
try
144144
{
145145
add_variables();
146146

147147
if(!solver->okay())
148148
{
149-
messaget::status()
150-
<< "SAT checker inconsistent: instance is UNSATISFIABLE" << eom;
149+
log.status() << "SAT checker inconsistent: instance is UNSATISFIABLE"
150+
<< messaget::eom;
151151
}
152152
else
153153
{
@@ -160,8 +160,8 @@ propt::resultt satcheck_glucose_baset<T>::do_prop_solve()
160160

161161
if(has_false)
162162
{
163-
messaget::status()
164-
<< "got FALSE as assumption: instance is UNSATISFIABLE" << eom;
163+
log.status() << "got FALSE as assumption: instance is UNSATISFIABLE"
164+
<< messaget::eom;
165165
}
166166
else
167167
{
@@ -170,13 +170,15 @@ propt::resultt satcheck_glucose_baset<T>::do_prop_solve()
170170

171171
if(solver->solve(solver_assumptions))
172172
{
173-
messaget::status() << "SAT checker: instance is SATISFIABLE" << eom;
173+
log.status() << "SAT checker: instance is SATISFIABLE"
174+
<< messaget::eom;
174175
status = statust::SAT;
175176
return resultt::P_SATISFIABLE;
176177
}
177178
else
178179
{
179-
messaget::status() << "SAT checker: instance is UNSATISFIABLE" << eom;
180+
log.status() << "SAT checker: instance is UNSATISFIABLE"
181+
<< messaget::eom;
180182
}
181183
}
182184
}
@@ -186,7 +188,7 @@ propt::resultt satcheck_glucose_baset<T>::do_prop_solve()
186188
}
187189
catch(Glucose::OutOfMemoryException)
188190
{
189-
messaget::error() << "SAT checker ran out of memory" << eom;
191+
log.error() << "SAT checker ran out of memory" << messaget::eom;
190192
status = statust::ERROR;
191193
throw std::bad_alloc();
192194
}
@@ -209,7 +211,7 @@ void satcheck_glucose_baset<T>::set_assignment(literalt a, bool value)
209211
}
210212
catch(Glucose::OutOfMemoryException)
211213
{
212-
messaget::error() << "SAT checker ran out of memory" << eom;
214+
log.error() << "SAT checker ran out of memory" << messaget::eom;
213215
status = statust::ERROR;
214216
throw std::bad_alloc();
215217
}
@@ -284,7 +286,7 @@ void satcheck_glucose_simplifiert::set_frozen(literalt a)
284286
}
285287
catch(Glucose::OutOfMemoryException)
286288
{
287-
messaget::error() << "SAT checker ran out of memory" << eom;
289+
log.error() << "SAT checker ran out of memory" << messaget::eom;
288290
status = statust::ERROR;
289291
throw std::bad_alloc();
290292
}

‎src/solvers/sat/satcheck_ipasir.cpp

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

100-
messaget::statistics() << (no_variables() - 1) << " variables, "
101-
<< clause_counter << " clauses" << eom;
100+
log.statistics() << (no_variables() - 1) << " variables, " << clause_counter
101+
<< " clauses" << messaget::eom;
102102

103103
// use the internal representation, as ipasir does not support reporting the
104104
// status
105105
if(status==statust::UNSAT)
106106
{
107-
messaget::status() <<
108-
"SAT checker inconsistent: instance is UNSATISFIABLE" << eom;
107+
log.status() << "SAT checker inconsistent: instance is UNSATISFIABLE"
108+
<< messaget::eom;
109109
}
110110
else
111111
{
@@ -116,8 +116,8 @@ propt::resultt satcheck_ipasirt::do_prop_solve()
116116

117117
if(has_false)
118118
{
119-
messaget::status() <<
120-
"got FALSE as assumption: instance is UNSATISFIABLE" << eom;
119+
log.status() << "got FALSE as assumption: instance is UNSATISFIABLE"
120+
<< messaget::eom;
121121
}
122122
else
123123
{
@@ -129,20 +129,19 @@ propt::resultt satcheck_ipasirt::do_prop_solve()
129129
int solver_state=ipasir_solve(solver);
130130
if(10==solver_state)
131131
{
132-
messaget::status() <<
133-
"SAT checker: instance is SATISFIABLE" << eom;
132+
log.status() << "SAT checker: instance is SATISFIABLE" << messaget::eom;
134133
status=statust::SAT;
135134
return resultt::P_SATISFIABLE;
136135
}
137136
else if(20==solver_state)
138137
{
139-
messaget::status() <<
140-
"SAT checker: instance is UNSATISFIABLE" << eom;
138+
log.status() << "SAT checker: instance is UNSATISFIABLE"
139+
<< messaget::eom;
141140
}
142141
else
143142
{
144-
messaget::status() <<
145-
"SAT checker: solving returned without solution" << eom;
143+
log.status() << "SAT checker: solving returned without solution"
144+
<< messaget::eom;
146145
throw analysis_exceptiont(
147146
"solving inside IPASIR SAT solver has been interrupted");
148147
}

‎src/solvers/sat/satcheck_lingeling.cpp

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

7878
std::string msg;
@@ -86,15 +86,15 @@ propt::resultt satcheck_lingelingt::do_prop_solve()
8686
if(res==10)
8787
{
8888
msg="SAT checker: instance is SATISFIABLE";
89-
messaget::status() << msg << messaget::eom;
89+
log.status() << msg << messaget::eom;
9090
status=SAT;
9191
return P_SATISFIABLE;
9292
}
9393
else
9494
{
9595
INVARIANT(res == 20, "result value is either 10 or 20");
9696
msg="SAT checker: instance is UNSATISFIABLE";
97-
messaget::status() << msg << messaget::eom;
97+
log.status() << msg << messaget::eom;
9898
}
9999

100100
status=UNSAT;

‎src/solvers/sat/satcheck_minisat.cpp

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

157-
messaget::statistics() << (_no_variables - 1) << " variables, "
158-
<< solver->nClauses() << " clauses" << messaget::eom;
157+
log.statistics() << (_no_variables - 1) << " variables, "
158+
<< solver->nClauses() << " clauses" << messaget::eom;
159159

160160
add_variables();
161161

@@ -179,15 +179,15 @@ propt::resultt satcheck_minisat1_baset::do_prop_solve()
179179
if(solver->solve(MiniSat_assumptions))
180180
{
181181
msg="SAT checker: instance is SATISFIABLE";
182-
messaget::status() << msg << messaget::eom;
182+
log.status() << msg << messaget::eom;
183183
status=SAT;
184184
return P_SATISFIABLE;
185185
}
186186
else
187187
msg="SAT checker: instance is UNSATISFIABLE";
188188
}
189189

190-
messaget::status() << msg << messaget::eom;
190+
log.status() << msg << messaget::eom;
191191
status=UNSAT;
192192
return P_UNSATISFIABLE;
193193
}

‎src/solvers/sat/satcheck_picosat.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ propt::resultt satcheck_picosatt::do_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::statistics() << msg << messaget::eom;
76+
log.statistics() << msg << messaget::eom;
7777
}
7878

7979
std::string msg;
@@ -85,7 +85,7 @@ propt::resultt satcheck_picosatt::do_prop_solve()
8585
if(res==PICOSAT_SATISFIABLE)
8686
{
8787
msg="SAT checker: instance is SATISFIABLE";
88-
messaget::status() << msg << messaget::eom;
88+
log.status() << msg << messaget::eom;
8989
status=SAT;
9090
return P_SATISFIABLE;
9191
}
@@ -95,7 +95,7 @@ propt::resultt satcheck_picosatt::do_prop_solve()
9595
res == PICOSAT_UNSATISFIABLE,
9696
"picosat result should report either sat or unsat");
9797
msg="SAT checker: instance is UNSATISFIABLE";
98-
messaget::status() << msg << messaget::eom;
98+
log.status() << msg << messaget::eom;
9999
}
100100

101101
status=UNSAT;

‎src/solvers/sat/satcheck_zchaff.cpp

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

8787
SAT_StatusT result=(SAT_StatusT)solver->solve();
@@ -120,7 +120,7 @@ propt::resultt satcheck_zchaff_baset::do_prop_solve()
120120
break;
121121
}
122122

123-
messaget::status() << msg << messaget::eom;
123+
log.status() << msg << messaget::eom;
124124
}
125125

126126
if(result==SATISFIABLE)

‎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::do_prop_solve()
4141
std::string msg=
4242
std::to_string(no_variables()-1)+" variables, "+
4343
std::to_string(no_clauses())+" clauses";
44-
messaget::statistics() << msg << messaget::eom;
44+
log.statistics() << msg << messaget::eom;
4545
}
4646

4747
// get the core

0 commit comments

Comments
 (0)