Skip to content

Commit

Permalink
Use Raphael's application of MacroSolver
Browse files Browse the repository at this point in the history
  • Loading branch information
@WorkingRobot
WorkingRobot committed Nov 28, 2024
1 parent f89203a commit 127fa43
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 49 deletions.
42 changes: 26 additions & 16 deletions Craftimizer/Windows/Settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private static string GetAlgorithmName(SolverAlgorithm algorithm) =>
SolverAlgorithm.Stepwise => "Stepwise",
SolverAlgorithm.StepwiseForked => "Stepwise Forked",
SolverAlgorithm.StepwiseGenetic => "Stepwise Genetic",
SolverAlgorithm.Raphael => "Optimal (Slow)",
SolverAlgorithm.Raphael => "Optimal",
_ => "Unknown",
};

Expand Down Expand Up @@ -652,21 +652,40 @@ ref isDirty
else
{
DrawOption(
"Ensure 100% Reliability",
"Quick Solve",
"Speeds up solve times. Backloads all Progress " +
"actions to the end of the rotation.",
config.BackloadProgress,
v => config = config with { BackloadProgress = v },
ref isDirty
);
DrawOption(
"Ensure Reliability",
"Find a rotation that can reach the target quality no matter " +
"how unlucky the random conditions are.",
config.Adversarial,
v => config = config with { Adversarial = v },
ref isDirty
);
DrawOption(
"Backload Progress",
"Find a rotation that only uses Progress-increasing actions " +
"at the end of the rotation. May speed up solve times.",
config.BackloadProgress,
v => config = config with { BackloadProgress = v },
"Minimize Steps",
"Minimizes the number of crafting steps.",
config.MinimizeSteps,
v => config = config with { MinimizeSteps = v },
ref isDirty
);

if (config.MinimizeSteps && config.Adversarial)
{
ImGui.SameLine();
using (var color = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudOrange))
{
using var font = ImRaii.PushFont(UiBuilder.IconFont);
ImGui.TextUnformatted(FontAwesomeIcon.ExclamationCircle.ToIconString());
}
if (ImGui.IsItemHovered())
ImGuiUtils.TooltipWrapped("Combining \"Minimize Steps\" and \"Ensure Reliability\" will significantly increase solve times.");
}
}
}

Expand Down Expand Up @@ -713,15 +732,6 @@ ref isDirty
}
}

// TODO: Provide better option name than this lol
//DrawOption(
// "Unsound Branch Pruning",
// "TBD",
// config.UnsoundBranchPruning,
// v => config = config with { UnsoundBranchPruning = v },
// ref isDirty
//);

if (config.Algorithm != SolverAlgorithm.Raphael)
{
using (var panel = ImRaii2.GroupPanel("Score Weights (Advanced)", -1, out _))
Expand Down
97 changes: 66 additions & 31 deletions Solver/Solver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,6 @@ private async Task<SolverSolution> SearchRaphael()

maxProgress = 2000;

Raphael.SolverConfig config = new()
{
Adversarial = Config.Adversarial,
BackloadProgress = Config.BackloadProgress,
UnsoundBranchPruning = Config.UnsoundBranchPruning,
};

ActionType[]? solution = null;

var s = new SimulatorNoRandom() { State = State };
var pool = RaphaelUtils.ConvertToRawActions(Config.ActionPool.Where(a => a.Base().IsPossible(s)).ToArray());
var input = new Raphael.SolverInput()
Expand All @@ -178,48 +169,92 @@ private async Task<SolverSolution> SearchRaphael()
JobLevel = checked((byte)State.Input.Stats.Level),
};

using Raphael.Solver solver = new(in config, input, pool);

solver.OnFinish += s => solution = RaphaelUtils.ConvertRawActions(s);
solver.OnSuggestSolution += s =>
SimulationState ExecuteActions(IEnumerable<ActionType> actions)
{
var steps = RaphaelUtils.ConvertRawActions(s);
var sim = new SimulatorNoRandom();
var (resp, outState, failedIdx) = sim.ExecuteMultiple(State, steps);
var (resp, outState, failedIdx) = sim.ExecuteMultiple(State, actions);
if (resp != ActionResponse.SimulationComplete)
{
if (failedIdx != -1)
OnLog?.Invoke($"Invalid state; simulation failed to execute solution: {string.Join(',', s)}");
throw new ArgumentException($"Invalid state; simulation failed to execute solution: {string.Join(',', actions)}", nameof(actions));
}
return outState;
}

OnSuggestSolution?.Invoke(new(steps, in outState));
};
solver.OnProgress += p =>
ActionType[]? solution = null;

void OnFinish(Raphael.Action[] s) =>
solution = RaphaelUtils.ConvertRawActions(s);

void OnSuggestSolution(Raphael.Action[] s)
{
var steps = RaphaelUtils.ConvertRawActions(s);
var outState = ExecuteActions(steps);
this.OnSuggestSolution?.Invoke(new(steps, in outState));
}

void OnProgress(nuint p)
{
var prog = checked((int)p);
var stage = prog / maxProgress;
while (stage != progressStage)
ResetProgress();
progress = prog % maxProgress;
};

await using var registration = Token.Register(solver.Cancel).ConfigureAwait(true);
await Task.Run(solver.Solve, Token).ConfigureAwait(true);
}

if (!Config.MinimizeSteps)
{
Raphael.SolverConfig config = new()
{
Adversarial = Config.Adversarial,
BackloadProgress = true,
UnsoundBranchPruning = true
};

using var solver = new Raphael.Solver(in config, in input, pool);

solver.OnFinish += OnFinish;
solver.OnSuggestSolution += OnSuggestSolution;
solver.OnProgress += OnProgress;

progressStage = 0;
progress = 0;
await using var registration = Token.Register(solver.Cancel).ConfigureAwait(true);
await Task.Run(solver.Solve, Token).ConfigureAwait(true);
Token.ThrowIfCancellationRequested();
}


if (solution == null || ExecuteActions(solution).HQPercent != 100)
{
Raphael.SolverConfig config = new()
{
Adversarial = Config.Adversarial,
BackloadProgress = Config.BackloadProgress,
UnsoundBranchPruning = false
};

using var solver = new Raphael.Solver(in config, in input, pool);

solver.OnFinish += OnFinish;
solver.OnSuggestSolution += OnSuggestSolution;
solver.OnProgress += OnProgress;

progressStage = 0;
progress = 0;
await using var registration = Token.Register(solver.Cancel).ConfigureAwait(true);
await Task.Run(solver.Solve, Token).ConfigureAwait(true);
Token.ThrowIfCancellationRequested();
}

if (solution == null)
return new([], State);

foreach (var action in solution)
InvokeNewAction(action);

var sim = new SimulatorNoRandom();
var (resp, outState, failedIdx) = sim.ExecuteMultiple(State, solution);
if (resp != ActionResponse.SimulationComplete)
{
if (failedIdx != -1)
throw new Exception($"Invalid state; simulation failed to execute solution: {string.Join(',', solution)}");
}
return new(solution, outState);
var outState = ExecuteActions(solution);
return new(solution, in outState);
}

private async Task<SolverSolution> SearchStepwiseGenetic()
Expand Down
8 changes: 6 additions & 2 deletions Solver/SolverConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public enum SolverAlgorithm
[StructLayout(LayoutKind.Auto)]
public readonly record struct SolverConfig
{
// MCTS configuration
public int Iterations { get; init; }
public int MaxIterations { get; init; }
public float MaxScoreWeightingConstant { get; init; }
Expand All @@ -28,15 +29,17 @@ public readonly record struct SolverConfig
public int FurcatedActionCount { get; init; }
public bool StrictActions { get; init; }

// MCTS score weights
public float ScoreProgress { get; init; }
public float ScoreQuality { get; init; }
public float ScoreDurability { get; init; }
public float ScoreCP { get; init; }
public float ScoreSteps { get; init; }

// Raphael/A* configuration
public bool Adversarial { get; init; }
public bool BackloadProgress { get; init; }
public bool UnsoundBranchPruning { get; init; }
public bool MinimizeSteps { get; init; }

public ActionType[] ActionPool { get; init; }
public SolverAlgorithm Algorithm { get; init; }
Expand Down Expand Up @@ -190,7 +193,8 @@ public SolverConfig FilterSpecialistActions() =>

public static readonly SolverConfig EditorDefault = new SolverConfig() with
{
Iterations = 500000
Algorithm = SolverAlgorithm.Raphael,
Adversarial = true
};

public static readonly SolverConfig SynthHelperDefault = new SolverConfig() with
Expand Down

0 comments on commit 127fa43

Please sign in to comment.