@@ -733,7 +733,6 @@ namespace nlsat {
733
733
bool have_zero = false ;
734
734
for (unsigned i = 0 ; i < num_factors; i++) {
735
735
f = m_factors.get (i);
736
- // std::cout << "f=";display(std::cout, f) << "\n";
737
736
if (coeffs_are_zeroes_in_factor (f)) {
738
737
have_zero = true ;
739
738
break ;
@@ -1043,7 +1042,6 @@ namespace nlsat {
1043
1042
// Otherwise, the isolate_roots procedure will assume p is a constant polynomial.
1044
1043
m_am.isolate_roots (p, undef_var_assignment (m_assignment, y), roots);
1045
1044
unsigned num_roots = roots.size ();
1046
- // #linxi begin add_cell_lits faster
1047
1045
bool all_lt = true ;
1048
1046
for (unsigned i = 0 ; i < num_roots; i++) {
1049
1047
int s = m_am.compare (y_val, roots[i]);
@@ -1092,7 +1090,6 @@ namespace nlsat {
1092
1090
i_lower = j + 1 ;
1093
1091
}
1094
1092
}
1095
- // #linxi end add_cell_lits faster
1096
1093
}
1097
1094
1098
1095
if (!lower_inf) {
@@ -1148,7 +1145,6 @@ namespace nlsat {
1148
1145
// Otherwise, the isolate_roots procedure will assume p is a constant polynomial.
1149
1146
m_am.isolate_roots (p, undef_var_assignment (m_assignment, y), roots);
1150
1147
unsigned num_roots = roots.size ();
1151
- // #linxi begin add_cell_lits faster
1152
1148
bool all_lt = true ;
1153
1149
for (unsigned i = 0 ; i < num_roots; i++) {
1154
1150
int s = m_am.compare (y_val, roots[i]);
@@ -1196,7 +1192,6 @@ namespace nlsat {
1196
1192
i_lower = j + 1 ;
1197
1193
}
1198
1194
}
1199
- // #linxi end add_cell_lits faster
1200
1195
}
1201
1196
1202
1197
if (!lower_inf) {
@@ -1254,12 +1249,18 @@ namespace nlsat {
1254
1249
add_cell_lits (ps, x);
1255
1250
}
1256
1251
}
1257
- void project_cdcac (polynomial_ref_vector & ps, var max_x) {
1258
- bool first = true ;
1259
-
1260
1252
1253
+ /* *
1254
+ * Sample Projection
1255
+ * Reference:
1256
+ * Haokun Li and Bican Xia.
1257
+ * "Solving Satisfiability of Polynomial Formulas By Sample - Cell Projection"
1258
+ * https://arxiv.org/abs/2003.00409
1259
+ */
1260
+ void project_cdcac (polynomial_ref_vector & ps, var max_x) {
1261
1261
if (ps.empty ())
1262
1262
return ;
1263
+ bool first = true ;
1263
1264
m_todo.reset ();
1264
1265
for (poly* p : ps) {
1265
1266
m_todo.insert (p);
@@ -1282,22 +1283,12 @@ namespace nlsat {
1282
1283
TRACE (" nlsat_explain" , tout << " project loop, processing var " ; display_var (tout, x); tout << " \n polynomials\n " ;
1283
1284
display (tout, ps); tout << " \n " ;);
1284
1285
1285
-
1286
- /* *
1287
- * Sample Projection
1288
- * Reference:
1289
- * Haokun Li and Bican Xia.
1290
- * "Solving Satisfiability of Polynomial Formulas By Sample - Cell Projection"
1291
- * https://arxiv.org/abs/2003.00409
1292
- */
1293
-
1294
1286
if (first) {
1295
1287
add_lc (ps, x);
1296
1288
psc_discriminant (ps, x);
1297
1289
psc_resultant (ps, x);
1298
1290
first = false ;
1299
1291
}
1300
-
1301
1292
else {
1302
1293
add_lc (ps, x);
1303
1294
// add_sample_coeff(ps, x);
0 commit comments