From dfe014df341fe21e1299725869164e461193d24c Mon Sep 17 00:00:00 2001 From: Asriel Camora Date: Thu, 14 Dec 2023 18:46:10 -0800 Subject: [PATCH] Fix Observe action spamming --- Solver/Solver.cs | 2 +- Solver/SolverSolution.cs | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Solver/Solver.cs b/Solver/Solver.cs index 4a7f07e..b552e7d 100644 --- a/Solver/Solver.cs +++ b/Solver/Solver.cs @@ -225,7 +225,7 @@ public sealed class Solver : IDisposable } if (definiteCount != equalCount) { - foreach(var action in refActions.Take(equalCount).Skip(definiteCount)) + foreach (var action in refActions.Take(equalCount).Skip(definiteCount)) InvokeNewAction(action); definiteActionCount = equalCount; diff --git a/Solver/SolverSolution.cs b/Solver/SolverSolution.cs index ce38fce..d7afb63 100644 --- a/Solver/SolverSolution.cs +++ b/Solver/SolverSolution.cs @@ -6,7 +6,7 @@ namespace Craftimizer.Solver; public readonly record struct SolverSolution { private readonly List actions = null!; public readonly IReadOnlyList Actions { get => actions; init => ActionEnumerable = value; } - public readonly IEnumerable ActionEnumerable { init => actions = SanitizeCombos(value).ToList(); } + public readonly IEnumerable ActionEnumerable { init => actions = value.ToList(); } public readonly SimulationState State { get; init; } public SolverSolution(IEnumerable actions, in SimulationState state) @@ -33,13 +33,4 @@ public readonly record struct SolverSolution { else yield return action; } - - internal static IEnumerable SanitizeCombos(IEnumerable actions) - { - foreach (var action in actions) - { - foreach (var sanitizedAction in SanitizeCombo(action)) - yield return sanitizedAction; - } - } }