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

Exclude Raphael from synth helper

Browse Source
This commit is contained in:
Asriel Camora
2024-11-28 02:46:19 -08:00
parent 150c2c9716
commit 819f23a6d9
2 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Craftimizer/Utils/DynamicBars.cs
+1 -1
View File
@@ -207,7 +207,7 @@ internal static class DynamicBars
{
string tooltip;
if (solver.IsIndeterminate)
tooltip = "Initializing Solver";
tooltip = "Initializing";
else
{
tooltip = $"Solver Progress: {solver.ProgressValue:N0} / {solver.ProgressMax:N0}";
Craftimizer/Windows/Settings.cs
+25 -20
View File
@@ -118,7 +118,7 @@ public sealed class Settings : Window, IDisposable
ImGuiUtils.TooltipWrapped(tooltip);
}
private static void DrawOption<T>(string label, string tooltip, Func<T, string> getName, Func<T, string> getTooltip, T value, Action<T> setter, ref bool isDirty) where T : struct, Enum
private static void DrawOption<T>(string label, string tooltip, Func<T, string> getName, Func<T, string> getTooltip, T value, Action<T> setter, ref bool isDirty, params T[] excludedValues) where T : struct, Enum
{
ImGui.SetNextItemWidth(OptionWidth);
using (var combo = ImRaii.Combo(label, getName(value)))
@@ -127,6 +127,8 @@ public sealed class Settings : Window, IDisposable
{
foreach (var type in Enum.GetValues<T>())
{
if (excludedValues.Contains(type))
continue;
if (ImGui.Selectable(getName(type), value.Equals(type)))
{
setter(type);
@@ -504,7 +506,7 @@ public sealed class Settings : Window, IDisposable
Config.Save();
}
private static void DrawSolverConfig(ref SolverConfig configRef, SolverConfig defaultConfig, out bool isDirty)
private static void DrawSolverConfig(ref SolverConfig configRef, SolverConfig defaultConfig, bool disableOptimal, out bool isDirty)
{
isDirty = false;
@@ -522,13 +524,14 @@ public sealed class Settings : Window, IDisposable
"Algorithm",
"The algorithm to use when solving for a macro. Different " +
"algorithms provide different pros and cons for using them. " +
"By far, the Stepwise Genetic algorithm provides the best " +
"results, especially for very difficult crafts.",
"By far, the Optimal and Stepwise Genetic algorithms provide " +
"the best results, especially for very difficult crafts.",
GetAlgorithmName,
GetAlgorithmTooltip,
config.Algorithm,
v => config = config with { Algorithm = v },
ref isDirty
ref isDirty,
disableOptimal ? [SolverAlgorithm.Raphael] : []
);
if (config.Algorithm != SolverAlgorithm.Raphael)
@@ -682,9 +685,9 @@ public sealed class Settings : Window, IDisposable
}
}
using (var panel = ImRaii2.GroupPanel("Advanced", -1, out _))
{
if (config.Algorithm != SolverAlgorithm.Raphael)
{
using (var panel = ImRaii2.GroupPanel("Advanced", -1, out _))
{
DrawOption(
"Max Rollout Step Count",
@@ -708,18 +711,19 @@ public sealed class Settings : Window, IDisposable
ref isDirty
);
}
else
{
DrawOption(
"Unsound Branch Pruning",
"TBD",
config.UnsoundBranchPruning,
v => config = config with { UnsoundBranchPruning = v },
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 _))
{
DrawOption(
@@ -773,6 +777,7 @@ public sealed class Settings : Window, IDisposable
ref isDirty
);
}
}
if (isDirty)
configRef = config;
@@ -952,7 +957,7 @@ public sealed class Settings : Window, IDisposable
ImGuiHelpers.ScaledDummy(5);
var solverConfig = Config.RecipeNoteSolverConfig;
DrawSolverConfig(ref solverConfig, SolverConfig.RecipeNoteDefault, out var isSolverDirty);
DrawSolverConfig(ref solverConfig, SolverConfig.RecipeNoteDefault, false, out var isSolverDirty);
if (isSolverDirty)
{
Config.RecipeNoteSolverConfig = solverConfig;
@@ -974,7 +979,7 @@ public sealed class Settings : Window, IDisposable
var isDirty = false;
var solverConfig = Config.EditorSolverConfig;
DrawSolverConfig(ref solverConfig, SolverConfig.EditorDefault, out var isSolverDirty);
DrawSolverConfig(ref solverConfig, SolverConfig.EditorDefault, false, out var isSolverDirty);
if (isSolverDirty)
{
Config.EditorSolverConfig = solverConfig;
@@ -1059,7 +1064,7 @@ public sealed class Settings : Window, IDisposable
ImGuiHelpers.ScaledDummy(5);
var solverConfig = Config.SynthHelperSolverConfig;
DrawSolverConfig(ref solverConfig, SolverConfig.SynthHelperDefault, out var isSolverDirty);
DrawSolverConfig(ref solverConfig, SolverConfig.SynthHelperDefault, true, out var isSolverDirty);
if (isSolverDirty)
{
Config.SynthHelperSolverConfig = solverConfig;