Merge branch 'condition-furcation' into main

Benchmark/Program.cs

@@ -106,7 +106,7 @@ private static async Task RunOther()
             MaxStepCount = 30,
         };
 
-        var sim = new SimulatorNoRandom(new(input));
+        var sim = new SimulatorNoRandom();
         (_, var state) = sim.Execute(new(input), ActionType.MuscleMemory);
         (_, state) = sim.Execute(state, ActionType.PrudentTouch);
         //(_, state) = sim.Execute(state, ActionType.Manipulation);

Craftimizer/Configuration.cs

@@ -82,6 +82,7 @@ public class Configuration : IPluginConfiguration
     private List<Macro> macros { get; set; } = new();
     [JsonIgnore]
     public IReadOnlyList<Macro> Macros => macros;
+    public int ReliabilitySimulationCount { get; set; } = 500;
     public bool ConditionRandomness { get; set; } = true;
     public SolverConfig SimulatorSolverConfig { get; set; } = SolverConfig.SimulatorDefault;
     public SolverConfig SynthHelperSolverConfig { get; set; } = SolverConfig.SynthHelperDefault;

Craftimizer/Craftimizer.csproj

@@ -39,6 +39,7 @@
 
   <ItemGroup>
     <PackageReference Include="DalamudPackager" Version="2.1.12" />
+    <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.106">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Craftimizer/ImGuiExtras.cs

@@ -5,7 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Craftimizer;
+namespace Craftimizer.Plugin;
 
 internal static unsafe class ImGuiExtras
 {

Craftimizer/ImGuiUtils.cs

@@ -2,12 +2,16 @@
 using Dalamud.Interface;
 using Dalamud.Interface.Utility.Raii;
 using ImGuiNET;
+using ImPlotNET;
+using MathNet.Numerics.Statistics;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
 using System.Numerics;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -130,44 +134,14 @@ public static void EndGroupPanel()
         ImGui.PopID();
     }
 
-    private struct EndUnconditionally : ImRaii.IEndObject, IDisposable
-    {
-        private Action EndAction { get; }
-
-        public bool Success { get; }
-
-        public bool Disposed { get; private set; }
-
-        public EndUnconditionally(Action endAction, bool success)
-        {
-            EndAction = endAction;
-            Success = success;
-            Disposed = false;
-        }
-
-        public void Dispose()
-        {
-            if (!Disposed)
-            {
-                EndAction();
-                Disposed = true;
-            }
-        }
-    }
-
-    public static ImRaii.IEndObject GroupPanel(string name, float width, out float internalWidth)
-    {
-        internalWidth = BeginGroupPanel(name, width);
-        return new EndUnconditionally(EndGroupPanel, true);
-    }
-
     private static Vector2 UnitCircle(float theta)
     {
         var (s, c) = MathF.SinCos(theta);
         // SinCos positive y is downwards, but we want it upwards for ImGui
         return new Vector2(c, -s);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private static float Lerp(float a, float b, float t) =>
         MathF.FusedMultiplyAdd(b - a, t, a);
 
@@ -251,6 +225,72 @@ public static void ArcProgress(float value, float radiusInner, float radiusOuter
         Arc(MathF.PI / 2, MathF.PI / 2 - MathF.Tau * Math.Clamp(value, 0, 1), radiusInner, radiusOuter, backgroundColor, filledColor);
     }
 
+    public sealed class ViolinData
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        public struct Point
+        {
+            public float X, Y, Y2;
+
+            public Point(float x, float y, float y2)
+            {
+                X = x;
+                Y = y;
+                Y2 = y2;
+            }
+        }
+
+        public ReadOnlySpan<Point> Data => (DataArray ?? Array.Empty<Point>()).AsSpan();
+        private Point[]? DataArray { get; set; }
+        public readonly float Min;
+        public readonly float Max;
+
+        public ViolinData(IEnumerable<int> samples, float min, float max, int resolution, double bandwidth)
+        {
+            Min = min;
+            Max = max;
+            bandwidth *= Max - Min;
+            var samplesList = samples.AsParallel().Select(s => (double)s).ToArray();
+            _ = Task.Run(() => {
+                var s = Stopwatch.StartNew();
+                var data = ParallelEnumerable.Range(0, resolution + 1)
+                    .Select(n => Lerp(min, max, n / (float)resolution))
+                    .Select(n => (n, (float)KernelDensity.EstimateGaussian(n, bandwidth, samplesList)))
+                    .Select(n => new Point(n.n, n.Item2, -n.Item2));
+                DataArray = data.ToArray();
+                s.Stop();
+                Log.Debug($"Violin plot processing took {s.Elapsed.TotalMilliseconds:0.00}ms");
+            });
+        }
+    }
+
+    public static void ViolinPlot(in ViolinData data, Vector2 size)
+    {
+        using var padding = ImRaii2.PushStyle(ImPlotStyleVar.PlotPadding, Vector2.Zero);
+        using var plotBg = ImRaii2.PushColor(ImPlotCol.PlotBg, Vector4.Zero);
+        using var fill = ImRaii2.PushColor(ImPlotCol.Fill, Vector4.One.WithAlpha(.5f));
+
+        using var plot = ImRaii2.Plot("##violin", size, ImPlotFlags.CanvasOnly | ImPlotFlags.NoInputs | ImPlotFlags.NoChild | ImPlotFlags.NoFrame);
+        if (plot)
+        {
+            ImPlot.SetupAxes(null, null, ImPlotAxisFlags.NoDecorations, ImPlotAxisFlags.NoDecorations | ImPlotAxisFlags.AutoFit);
+            ImPlot.SetupAxisLimits(ImAxis.X1, data.Min, data.Max, ImPlotCond.Always);
+            ImPlot.SetupFinish();
+
+            if (data.Data is { } points && !points.IsEmpty)
+            {
+                unsafe
+                {
+                    var label_id = stackalloc byte[] { (byte)'\0' };
+                    fixed (ViolinData.Point* p = points)
+                    {
+                        ImPlotNative.ImPlot_PlotShaded_FloatPtrFloatPtrFloatPtr(label_id, &p->X, &p->Y, &p->Y2, points.Length, ImPlotShadedFlags.None, 0, sizeof(ViolinData.Point));
+                    }
+                }
+            }
+        }
+    }
+
     private sealed class SearchableComboData<T> where T : class
     {
         public readonly ImmutableArray<T> items;
@@ -467,10 +507,50 @@ public static bool InputTextMultilineWithHint(string label, string hint, ref str
         return ImGuiExtras.InputTextEx(label, hint, ref input, maxLength, size, flags | Multiline, callback, user_data);
     }
 
-    public static bool IconButtonSized(FontAwesomeIcon icon, Vector2 size)
+    private static Vector2 GetIconSize(FontAwesomeIcon icon)
     {
         using var font = ImRaii.PushFont(UiBuilder.IconFont);
-        var ret = ImGui.Button(icon.ToIconString(), size);
+        return ImGui.CalcTextSize(icon.ToIconString());
+    }
+
+    private static void DrawCenteredIcon(FontAwesomeIcon icon, Vector2 offset, Vector2 size)
+    {
+        var iconSize = GetIconSize(icon);
+
+        float scale;
+        Vector2 iconOffset;
+        if (iconSize.X > iconSize.Y)
+        {
+            scale = size.X / iconSize.X;
+            iconOffset = new(0, (size.Y - (iconSize.Y * scale)) / 2f);
+        }
+        else if (iconSize.Y > iconSize.X)
+        {
+            scale = size.Y / iconSize.Y;
+            iconOffset = new((size.X - (iconSize.X * scale)) / 2f, 0);
+        }
+        else
+        {
+            scale = size.X / iconSize.X;
+            iconOffset = Vector2.Zero;
+        }
+
+        ImGui.GetWindowDrawList().AddText(UiBuilder.IconFont, UiBuilder.IconFont.FontSize * scale, offset + iconOffset, ImGui.GetColorU32(ImGuiCol.Text), icon.ToIconString());
+    }
+
+    public static bool IconButtonSquare(FontAwesomeIcon icon, float size = -1)
+    {
+        var ret = false;
+
+        var buttonSize = new Vector2(size == -1 ? ImGui.GetFrameHeight() : size);
+        var pos = ImGui.GetCursorScreenPos();
+        var spacing = new Vector2(ImGui.GetStyle().FramePadding.Y);
+
+        if (ImGui.Button($"###{icon.ToIconString()}", buttonSize))
+            ret = true;
+
+        DrawCenteredIcon(icon, pos + spacing, buttonSize - spacing * 2);
+
         return ret;
     }
 

Craftimizer/ImRaii2.cs

@@ -0,0 +1,92 @@
+using Dalamud.Interface.Utility.Raii;
+using ImPlotNET;
+using System;
+using System.Numerics;
+
+namespace Craftimizer.Plugin;
+
+public static class ImRaii2
+{
+    private struct EndUnconditionally : ImRaii.IEndObject, IDisposable
+    {
+        private Action EndAction { get; }
+
+        public bool Success { get; }
+
+        public bool Disposed { get; private set; }
+
+        public EndUnconditionally(Action endAction, bool success)
+        {
+            EndAction = endAction;
+            Success = success;
+            Disposed = false;
+        }
+
+        public void Dispose()
+        {
+            if (!Disposed)
+            {
+                EndAction();
+                Disposed = true;
+            }
+        }
+    }
+
+    private struct EndConditionally : ImRaii.IEndObject, IDisposable
+    {
+        public bool Success { get; }
+
+        public bool Disposed { get; private set; }
+
+        private Action EndAction { get; }
+
+        public EndConditionally(Action endAction, bool success)
+        {
+            EndAction = endAction;
+            Success = success;
+            Disposed = false;
+        }
+
+        public void Dispose()
+        {
+            if (!Disposed)
+            {
+                if (Success)
+                {
+                    EndAction();
+                }
+
+                Disposed = true;
+            }
+        }
+    }
+
+    public static ImRaii.IEndObject GroupPanel(string name, float width, out float internalWidth)
+    {
+        internalWidth = ImGuiUtils.BeginGroupPanel(name, width);
+        return new EndUnconditionally(ImGuiUtils.EndGroupPanel, true);
+    }
+
+    public static ImRaii.IEndObject Plot(string title_id, Vector2 size, ImPlotFlags flags)
+    {
+        return new EndConditionally(new Action(ImPlot.EndPlot), ImPlot.BeginPlot(title_id, size, flags));
+    }
+
+    public static ImRaii.IEndObject PushStyle(ImPlotStyleVar idx, Vector2 val)
+    {
+        ImPlot.PushStyleVar(idx, val);
+        return new EndUnconditionally(ImPlot.PopStyleVar, true);
+    }
+
+    public static ImRaii.IEndObject PushStyle(ImPlotStyleVar idx, float val)
+    {
+        ImPlot.PushStyleVar(idx, val);
+        return new EndUnconditionally(ImPlot.PopStyleVar, true);
+    }
+
+    public static ImRaii.IEndObject PushColor(ImPlotCol idx, Vector4 col)
+    {
+        ImPlot.PushStyleColor(idx, col);
+        return new EndUnconditionally(ImPlot.PopStyleColor, true);
+    }
+}

Craftimizer/Windows/MacroClipboard.cs

@@ -36,7 +36,7 @@ public override void Draw()
     private void DrawMacro(int idx, string macro)
     {
         using var id = ImRaii.PushId(idx);
-        using var panel = ImGuiUtils.GroupPanel($"Macro {idx + 1}", -1, out var availWidth);
+        using var panel = ImRaii2.GroupPanel($"Macro {idx + 1}", -1, out var availWidth);
 
         var cursor = ImGui.GetCursorPos();
 
@@ -49,7 +49,7 @@ private void DrawMacro(int idx, string macro)
         ImGui.SetCursorPos(buttonCursor);
         {
             using var color = ImRaii.PushColor(ImGuiCol.Button, ImGui.GetColorU32(buttonActive ? ImGuiCol.ButtonActive : ImGuiCol.ButtonHovered), buttonHovered);
-            ImGuiUtils.IconButtonSized(FontAwesomeIcon.Paste, new(ImGui.GetFrameHeight()));
+            ImGuiUtils.IconButtonSquare(FontAwesomeIcon.Paste);
             if (buttonClicked)
             {
                 ImGui.SetClipboardText(macro);