From 79377b5e89e23b434a1284ba8d1cca75750d2198 Mon Sep 17 00:00:00 2001
From: Asriel Camora <asriel@camora.dev>
Date: Fri, 14 Jul 2023 22:54:53 +0400
Subject: [PATCH] Minor performance tweaks

---
 Craftimizer/Windows/SimulatorWindowSolver.cs |  2 +-
 Simulator/Effects.cs                         |  2 +-
 Simulator/Simulator.cs                       | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Craftimizer/Windows/SimulatorWindowSolver.cs b/Craftimizer/Windows/SimulatorWindowSolver.cs
index a2493bb..64b8967 100644
--- a/Craftimizer/Windows/SimulatorWindowSolver.cs
+++ b/Craftimizer/Windows/SimulatorWindowSolver.cs
@@ -73,7 +73,7 @@ public sealed partial class SimulatorWindow : Window, IDisposable
 
         SolverInitialActionCount = Actions.Count;
         SolverTaskToken = new();
-        Func<SolverConfig, SimulationState, Action<ActionType>?, CancellationToken, (List<ActionType> Actions, SimulationState State)> solverMethod = Configuration.SolverAlgorithm switch
+        Func<SolverConfig, SimulationState, Action<ActionType>?, CancellationToken, SolverSolution> solverMethod = Configuration.SolverAlgorithm switch
         {
             SolverAlgorithm.Oneshot => Solver.Crafty.Solver.SearchOneshot,
             SolverAlgorithm.OneshotForked => Solver.Crafty.Solver.SearchOneshotForked,
diff --git a/Simulator/Effects.cs b/Simulator/Effects.cs
index f97e20f..ddc3495 100644
--- a/Simulator/Effects.cs
+++ b/Simulator/Effects.cs
@@ -86,7 +86,7 @@ public struct Effects
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public readonly byte GetStrength(EffectType effect) =>
         effect == EffectType.InnerQuiet ? InnerQuiet :
-        (byte)(GetDuration(effect) != 0 ? 1 : 0);
+        (byte)(HasEffect(effect) ? 1 : 0);
     
     [Pure]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
diff --git a/Simulator/Simulator.cs b/Simulator/Simulator.cs
index f132105..c0400a3 100644
--- a/Simulator/Simulator.cs
+++ b/Simulator/Simulator.cs
@@ -1,4 +1,6 @@
 using Craftimizer.Simulator.Actions;
+using System.Diagnostics.Contracts;
+using System.Runtime.CompilerServices;
 
 namespace Craftimizer.Simulator;
 
@@ -62,6 +64,7 @@ public class Simulator
         return ActionResponse.UsedAction;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void ExecuteForced(ActionType action, BaseAction baseAction)
     {
         baseAction.Use(this);
@@ -71,9 +74,13 @@ public class Simulator
         ActiveEffects.DecrementDuration();
     }
 
+    [Pure]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public int GetEffectStrength(EffectType effect) =>
         ActiveEffects.GetStrength(effect);
 
+    [Pure]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public int GetEffectDuration(EffectType effect) =>
         ActiveEffects.GetDuration(effect);
 
@@ -88,12 +95,16 @@ public class Simulator
         ActiveEffects.SetDuration(effect, (byte)duration);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void StrengthenEffect(EffectType effect) =>
         ActiveEffects.Strengthen(effect);
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void RemoveEffect(EffectType effect) =>
         ActiveEffects.SetDuration(effect, 0);
 
+    [Pure]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public bool HasEffect(EffectType effect) =>
         ActiveEffects.HasEffect(effect);
 
@@ -235,9 +246,11 @@ public class Simulator
         return qualityGain;
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void ReduceDurabilityRaw(int amount) =>
         Durability -= amount;
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void ReduceCPRaw(int amount) =>
         CP -= amount;
 
@@ -260,15 +273,19 @@ public class Simulator
             StrengthenEffect(EffectType.InnerQuiet);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void ReduceDurability(int amount) =>
         ReduceDurabilityRaw(CalculateDurabilityCost(amount));
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void ReduceCP(int amount) =>
         ReduceCPRaw(CalculateCPCost(amount));
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void IncreaseProgress(float efficiency) =>
         IncreaseProgressRaw(CalculateProgressGain(efficiency, false));
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void IncreaseQuality(float efficiency) =>
         IncreaseQualityRaw(CalculateQualityGain(efficiency, false));