Add number of blocked restarts to stats.

potassco · Apr 4, 2024 · 67f1793 · 67f1793
1 parent ec05889
commit 67f1793
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/clasp/solver_types.h b/clasp/solver_types.h
@@ -183,8 +183,9 @@ struct CoreStats {
 	STAT(uint64 choices;    DOXY(number of choices)     , "choices"           , VALUE(choices)    , LHS.choices    += RHS.choices   )\
 	STAT(uint64 conflicts;  DOXY(number of conflicts)   , "conflicts"         , VALUE(conflicts)  , LHS.conflicts  += RHS.conflicts )\
 	STAT(uint64 analyzed;   DOXY(number of conflicts analyzed), "conflicts_analyzed", VALUE(analyzed)   , LHS.analyzed   += RHS.analyzed  )\
-	STAT(uint64 restarts;   DOXY(number of restarts)    , "restarts"          , VALUE(restarts)   , LHS.restarts   += RHS.restarts  )\
-	STAT(uint64 lastRestart;DOXY(length of last restart), "restarts_last"     , VALUE(lastRestart), LHS.lastRestart = std::max(LHS.lastRestart, RHS.lastRestart))
+	STAT(uint64 restarts;   DOXY(number of restarts)        , "restarts"        , VALUE(restarts)   , LHS.restarts   += RHS.restarts  )\
+	STAT(uint64 lastRestart;DOXY(length of last restart)    , "restarts_last"   , VALUE(lastRestart), LHS.lastRestart = std::max(LHS.lastRestart, RHS.lastRestart)) \
+	STAT(uint64 blRestarts; DOXY(number of blocked restarts), "restarts_blocked", VALUE(blRestarts), LHS.blRestarts = std::max(LHS.blRestarts, RHS.blRestarts))
 
 	CoreStats() { reset(); }
 	void reset();

diff --git a/src/clasp_output.cpp b/src/clasp_output.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009-2017 Benjamin Kaufmann
+// Copyright (c) 2009-present Benjamin Kaufmann
 //
 // This file is part of Clasp. See http://www.cs.uni-potsdam.de/clasp/
 //
@@ -1188,7 +1188,7 @@ void TextOutput::printStats(const Clasp::SolverStats& st) const {
 	printf(" (Analyzed: %" PRIu64")\n", st.backjumps());
 	printKeyValue("Restarts", "%-8" PRIu64"", st.restarts);
 	if (st.restarts) {
-		printf(" (Average: %.2f Last: %" PRIu64")", st.avgRestart(), st.lastRestart);
+		printf(" (Average: %.2f Last: %" PRIu64" Blocked: %" PRIu64")", st.avgRestart(), st.lastRestart, st.blRestarts);
 	}
 	printf("\n");
 	if (!st.extra) return;

diff --git a/src/solver.cpp b/src/solver.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2006-2017 Benjamin Kaufmann
+// Copyright (c) 2006-present Benjamin Kaufmann
 //
 // This file is part of Clasp. See http://www.cs.uni-potsdam.de/clasp/
 //
@@ -1833,6 +1833,7 @@ ValueRep Solver::search(SearchLimits& limit, double rf) {
 						if (limit.restart.dynamic) { limit.restart.dynamic->resetBlock(); }
 						else                       { limit.restart.conflicts += block->inc; }
 						block->next = block->n + block->inc;
+						++stats.blRestarts;
 					}
 				} while (resolveConflict() && !propagate() && (++n, true));
 				limit.used += n;

diff --git a/tests/facade_test.cpp b/tests/facade_test.cpp
@@ -1416,7 +1416,7 @@ TEST_CASE("Facade statistics", "[facade]") {
 			REQUIRE(result == stats->get(r, it->c_str()));
 			REQUIRE(stats->type(result) == Potassco::Statistics_t::Value);
 		}
-		REQUIRE(keys.size() == 238);
+		REQUIRE(keys.size() == 242);
 
 		Key_t result;
 		REQUIRE(stats->find(r, "problem.lp", &result));
@@ -1598,7 +1598,7 @@ TEST_CASE("Facade statistics", "[facade]") {
 			REQUIRE(stats->find(r, it->c_str(), 0));
 			REQUIRE(stats->type(stats->get(r, it->c_str())) == Potassco::Statistics_t::Value);
 		}
-		REQUIRE(keys.size() == 256);
+		REQUIRE(keys.size() == 260);
 	}
 }
 namespace {