Re-sync main (oops)

.editorconfig

@@ -158,6 +158,7 @@ dotnet_diagnostic.CA1841.severity = suggestion
 dotnet_diagnostic.CA1845.severity = suggestion
 dotnet_diagnostic.MA0011.severity = silent
 dotnet_diagnostic.MA0076.severity = silent
+dotnet_diagnostic.MA0046.severity = silent
 dotnet_diagnostic.MA0002.severity = silent
 csharp_style_prefer_switch_expression = true:suggestion
 csharp_style_prefer_pattern_matching = true:silent

.gitattributes

@@ -0,0 +1,3 @@
+# Auto detect text files and perform LF normalization
+* text eol=crlf
+*.png binary

.github/create_unofficial.py

@@ -0,0 +1,27 @@
+import shutil, os, subprocess, zipfile, json, sys
+
+from itertools import chain
+
+PROJECT_NAME = sys.argv[1]
+OFFICIAL_ZIP = f"{PROJECT_NAME}/bin/x64/Release/{PROJECT_NAME}/latest.zip"
+UNOFFICIAL_ZIP = f"{PROJECT_NAME}/bin/x64/Release/{PROJECT_NAME}/latestUnofficial.zip"
+
+shutil.copy(OFFICIAL_ZIP, UNOFFICIAL_ZIP)
+
+subprocess.check_call(['7z', 'd', UNOFFICIAL_ZIP, f"{PROJECT_NAME}.json"])
+
+with zipfile.ZipFile(UNOFFICIAL_ZIP) as file:
+	members = [member for member in file.namelist() if member in (f"{PROJECT_NAME}.dll", f"{PROJECT_NAME}.deps.json", f"{PROJECT_NAME}.json", f"{PROJECT_NAME}.pdb")]
+
+subprocess.check_call(['7z', 'rn', UNOFFICIAL_ZIP] + list(chain.from_iterable((m, m.replace(PROJECT_NAME, f"{PROJECT_NAME}Unofficial")) for m in members)))
+
+with open(f"{PROJECT_NAME}/bin/x64/Release/{PROJECT_NAME}/{PROJECT_NAME}.json") as file:
+	manifest = json.load(file)
+
+manifest['Punchline'] = f"Unofficial/uncertified build of {manifest['Name']}. {manifest['Punchline']}"
+manifest['InternalName'] += 'Unofficial'
+manifest['Name'] += ' (Unofficial)'
+manifest['IconUrl'] = f"https://raw.githubusercontent.com/WorkingRobot/MyDalamudPlugins/main/icons/{manifest['InternalName']}.png"
+
+with zipfile.ZipFile(UNOFFICIAL_ZIP, "a", zipfile.ZIP_DEFLATED, compresslevel = 7) as file:
+	file.writestr(f"{PROJECT_NAME}Unofficial.json", json.dumps(manifest, indent = 2))

.github/workflows/build.yml

@@ -1,53 +1,76 @@
 name: Build
 
 on:
-  push:
-    tags:
-      - '*'
+  push
 
 env:
   PLUGIN_REPO: WorkingRobot/MyDalamudPlugins
   PROJECT_NAME: Craftimizer
+  IS_OFFICIAL: ${{true}}
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_CLI_TELEMETRY_OPTOUT: true
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1.0.3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '7.0'
 
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
-          Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev\"
+          wget https://goatcorp.github.io/dalamud-distrib/stg/latest.zip
+          unzip latest.zip -d dalamud/
+          echo "DALAMUD_HOME=$PWD/dalamud" >> $GITHUB_ENV
+
+      - name: Restore
+        run: |
+          dotnet restore -r win
 
       - name: Build
         run: |
-          dotnet restore -r win ${{env.PROJECT_NAME}}.sln
-          dotnet build --configuration Release
-        env:
-          DOTNET_CLI_TELEMETRY_OUTPUT: true
+          dotnet build --configuration Release --no-restore
+
+      - name: Test
+        run: |
+          dotnet test --configuration Release --logger "trx;logfilename=results.trx" --logger "html;logfilename=results.html" --logger "console;verbosity=detailed" --no-build --results-directory="TestResults"
+
+      - name: Create Unofficial Builds
+        if: ${{env.IS_OFFICIAL}}
+        run: python ./.github/create_unofficial.py ${{env.PROJECT_NAME}}
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2.2.1
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
         with:
           name: ${{env.PROJECT_NAME}}
           path: ${{env.PROJECT_NAME}}/bin/x64/Release/${{env.PROJECT_NAME}}
           if-no-files-found: error
 
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v3
+        if: ${{ !cancelled() }}
+        with:
+          name: TestResults
+          path: TestResults
+
       - name: Create Release
         uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        id: release
         with:
           files: ${{env.PROJECT_NAME}}/bin/x64/Release/${{env.PROJECT_NAME}}/*
 
       - name: Trigger Plugin Repo Update
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
+        if: ${{ steps.release.conclusion == 'success' }}
         with:
           token: ${{secrets.PAT}}
           repository: ${{env.PLUGIN_REPO}}

.gitignore

@@ -1,4 +1,5 @@
 .vs/
 obj/
 bin/
-*.user
+*.user
+BenchmarkDotNet.Artifacts/

Benchmark/Bench.cs

@@ -0,0 +1,97 @@
+using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Engines;
+using Craftimizer.Simulator;
+using Craftimizer.Solver;
+
+namespace Craftimizer.Benchmark;
+
+[SimpleJob(RunStrategy.Monitoring)]
+[MinColumn, Q1Column, Q3Column, MaxColumn]
+public class Bench
+{
+    private static SimulationInput[] Inputs { get; } = new SimulationInput[] {
+        // https://craftingway.app/rotation/loud-namazu-jVe9Y
+        // Chondrite Saw
+        new(new()
+        {
+            Craftsmanship = 3304,
+            Control = 3374,
+            CP = 575,
+            Level = 90,
+            CanUseManipulation = true,
+            HasSplendorousBuff = false,
+            IsSpecialist = false,
+            CLvl = 560,
+        },
+        new()
+        {
+            IsExpert = false,
+            ClassJobLevel = 90,
+            RLvl = 560,
+            ConditionsFlag = 0b1111,
+            MaxDurability = 80,
+            MaxQuality = 7200,
+            MaxProgress = 3500,
+            QualityModifier = 80,
+            QualityDivider = 115,
+            ProgressModifier = 90,
+            ProgressDivider = 130
+        }),
+
+        // https://craftingway.app/rotation/sandy-fafnir-doVCs
+        // Classical Longsword
+        new(new()
+        {
+            Craftsmanship = 3290,
+            Control = 3541,
+            CP = 649,
+            Level = 90,
+            CanUseManipulation = true,
+            HasSplendorousBuff = false,
+            IsSpecialist = false,
+            CLvl = 560,
+        },
+        new()
+        {
+            IsExpert = false,
+            ClassJobLevel = 90,
+            RLvl = 580,
+            ConditionsFlag = 0b1111,
+            MaxDurability = 70,
+            MaxQuality = 10920,
+            MaxProgress = 3900,
+            QualityModifier = 70,
+            QualityDivider = 115,
+            ProgressModifier = 80,
+            ProgressDivider = 130
+        })
+    };
+
+    public static IEnumerable<SimulationState> States => Inputs.Select(i => new SimulationState(i));
+
+    public static IEnumerable<SolverConfig> Configs => new SolverConfig[]
+    {
+        new()
+        {
+            Iterations = 100_000,
+            ForkCount = 32,
+            FurcatedActionCount = 16,
+            MaxStepCount = 30,
+        }
+    };
+
+    [ParamsSource(nameof(States))]
+    public SimulationState State { get; set; }
+
+    [ParamsSource(nameof(Configs))]
+    public SolverConfig Config { get; set; }
+
+    [Benchmark]
+    public async Task<float> Solve()
+    {
+        var solver = new Solver.Solver(Config, State);
+        solver.Start();
+        var (_, s) = await solver.GetTask().ConfigureAwait(false);
+        return (float)s.Quality / s.Input.Recipe.MaxQuality;
+    }
+}

Benchmark/Craftimizer.Benchmark.csproj

@@ -5,11 +5,19 @@
     <OutputType>Exe</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Platforms>x64</Platforms>
+    <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
-    <PackageReference Include="Meziantou.Analyzer" Version="2.0.62">
+    <Compile Remove="BenchmarkDotNet.Artifacts\**" />
+    <EmbeddedResource Remove="BenchmarkDotNet.Artifacts\**" />
+    <None Remove="BenchmarkDotNet.Artifacts\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
+    <PackageReference Include="Meziantou.Analyzer" Version="2.0.92">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -20,4 +28,9 @@
     <ProjectReference Include="..\Simulator\Craftimizer.Simulator.csproj" />
     <ProjectReference Include="..\Solver\Craftimizer.Solver.csproj" />
   </ItemGroup>
+
+  <PropertyGroup Condition="'$(IS_BENCH)'=='1'">
+    <DefineConstants>$(DefineConstants);IS_DETERMINISTIC</DefineConstants>
+  </PropertyGroup>
+
 </Project>