JonKazama-Hellion/Craftimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Customizable solver config, remove simulator emplace/displace methods

Browse Source
This commit is contained in:
Asriel Camora
2023-06-21 10:38:08 -07:00
parent 11b4b7f6d9
commit f3445f3cb9
12 changed files with 103 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Solver/Crafty/SimulationNode.cs
+7 -5
View File
@@ -1,8 +1,10 @@
using Craftimizer.Simulator;
using Craftimizer.Simulator.Actions;
using System.Runtime.InteropServices;
namespace Craftimizer.Solver.Crafty;
[StructLayout(LayoutKind.Auto)]
public struct SimulationNode
{
public readonly SimulationState State;
@@ -12,9 +14,9 @@ public struct SimulationNode
public ActionSet AvailableActions;
public NodeScores Scores;
public CompletionState CompletionState => GetCompletionState(SimulationCompletionState, AvailableActions);
public readonly CompletionState CompletionState => GetCompletionState(SimulationCompletionState, AvailableActions);
public bool IsComplete => CompletionState != CompletionState.Incomplete;
public readonly bool IsComplete => CompletionState != CompletionState.Incomplete;
public SimulationNode(SimulationState state, ActionType? action, CompletionState completionState, ActionSet actions)
{
@@ -29,9 +31,9 @@ public struct SimulationNode
CompletionState.NoMoreActions :
simCompletionState;
public float? CalculateScore() => CalculateScoreForState(State, SimulationCompletionState);
public readonly float? CalculateScore(int maxStepCount) => CalculateScoreForState(State, SimulationCompletionState, maxStepCount);
public static float? CalculateScoreForState(SimulationState state, CompletionState completionState)
public static float? CalculateScoreForState(SimulationState state, CompletionState completionState, int maxStepCount)
{
if (completionState != CompletionState.ProgressComplete)
return null;
@@ -70,7 +72,7 @@ public struct SimulationNode
);
var fewerStepsScore =
fewerStepsBonus * (1f - ((float)(state.ActionCount + 1) / Solver.MaxStepCount));
fewerStepsBonus * (1f - ((float)(state.ActionCount + 1) / maxStepCount));
return progressScore + qualityScore + durabilityScore + cpScore + fewerStepsScore;
}