Count DB-hit results as skipped simulations

Agent-Logs-Url: https://github.com/APN-Pucky/tyrant_optimize/sessions/03a3ddb6-482c-420a-a814-67476ef400e2

Co-authored-by: APN-Pucky <4533248+APN-Pucky@users.noreply.github.com>

Author: Copilot

algorithms.cpp

@@ -5,21 +5,6 @@
 
 using namespace tuo;
 
-inline unsigned skipped_simulations_increment(Process& proc, unsigned num_iterations)
-{
-	if (num_iterations == 0 || !use_db_load)
-	{
-		return num_iterations;
-	}
-	std::vector<std::array<std::string, 3>> const vhashes = proc.hashes();
-	EvaluatedResults db_results{EvaluatedResults::first_type(vhashes.size()), 0};
-	if (!proc.check_db(vhashes, num_iterations, db_results))
-	{
-		return 0;
-	}
-	return num_iterations;
-}
-
 inline bool try_improve_deck(Deck* d1, unsigned from_slot, unsigned to_slot, const Card* card_candidate,
 		const Card*& best_commander, const Card*& best_alpha_dominion, std::vector<const Card*>& best_cards,
 		FinalResults<long double>& best_score, unsigned& best_gap, std::string& best_deck,
@@ -58,7 +43,7 @@ inline bool try_improve_deck(Deck* d1, unsigned from_slot, unsigned to_slot, con
 	auto & prev_results = emplace_rv.first->second;
 	if (!emplace_rv.second)
 	{
-		skipped_simulations += skipped_simulations_increment(proc, prev_results.second);
+		skipped_simulations += prev_results.second;
 	}
 
 	// Evaluate new deck
@@ -100,7 +85,7 @@ inline FinalResults<long double> fitness(Deck* d1,
 	auto & prev_results = emplace_rv.first->second;
 	if (!emplace_rv.second)
 	{
-		skipped_simulations += skipped_simulations_increment(proc, prev_results.second);
+		skipped_simulations += prev_results.second;
 	}
 
 	// Evaluate new deck
@@ -235,7 +220,7 @@ DeckResults hill_climbing(unsigned num_min_iterations, unsigned num_iterations,
 			if (best_score.n_sims >= num_iterations || best_gap > 0)
 			{ break; } // exit main climbing loop
 			auto & prev_results = evaluated_decks[best_deck];
-			skipped_simulations += skipped_simulations_increment(proc, prev_results.second);
+			skipped_simulations += prev_results.second;
 			// Re-evaluate the best deck
 			d1->commander = best_commander;
 			d1->alpha_dominion = best_alpha_dominion;
@@ -907,7 +892,7 @@ void recursion(unsigned num_iterations, std::vector<unsigned> used, unsigned poo
 		auto & prev_results = emplace_rv.first->second;
 		if(!emplace_rv.second)
 		{
-			skipped_simulations += skipped_simulations_increment(proc, prev_results.second);
+			skipped_simulations += prev_results.second;
 		}
 		auto compare_results= proc.evaluate(num_iterations, prev_results);
 		auto current_score = compute_score(compare_results, proc.factors);

sim_test.cpp

@@ -552,7 +552,7 @@ BOOST_AUTO_TEST_CASE(test_db_skipped_counter_on_hit)
     Result cached(run_sim(sizeof(cached_argv) / sizeof(*cached_argv), cached_argv));
     unsigned long cached_skipped{0};
     BOOST_REQUIRE_MESSAGE(try_get_skipped_simulations(std::get<1>(cached), cached_skipped), "Failed to parse skipped simulations from cached output");
-    BOOST_CHECK_MESSAGE(cached_skipped == 0, "Expected zero skipped simulations on DB-only hit, got " + std::to_string(cached_skipped) + ". Warmup skipped: " + std::to_string(warmup_skipped));
+    BOOST_CHECK_MESSAGE(cached_skipped > 0, "Expected skipped simulations to include DB-hit results, got " + std::to_string(cached_skipped) + ". Warmup skipped: " + std::to_string(warmup_skipped));
 }
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()