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

Minor optimizations

Browse Source
This commit is contained in:
Asriel Camora
2023-06-21 05:58:08 -07:00
parent b7393b5c65
commit fc0ffc11f3
5 changed files with 7 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Solver/Crafty/Arena.cs
+4 -5
View File
@@ -6,24 +6,23 @@ public class Arena<T> where T : struct
{
public readonly record struct Node
{
public int? Parent { get; init; }
public int Index { get; init; }
public List<int> Children { get; init; }
public T State { get; init; }
public List<int> Children { get; init; }
public int Parent { get; init; }
}
private readonly List<Node> nodes = new();
public Arena(T initialState = default)
{
nodes.Add(new() { Parent = null, Index = 0, Children = new(), State = initialState });
nodes.Add(new() { Parent = -1, Children = new(), State = initialState });
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public int Insert(int parentIndex, T state)
{
var index = nodes.Count;
nodes.Add(new() { Parent = parentIndex, Index = index, Children = new(), State = state });
nodes.Add(new() { Parent = parentIndex, Children = new(), State = state });
nodes[parentIndex].Children.Add(index);
return index;
}
Solver/Crafty/CompletionState.cs
+1 -1
View File
@@ -2,7 +2,7 @@ using CompState = Craftimizer.Simulator.CompletionState;
namespace Craftimizer.Solver.Crafty;
public enum CompletionState
public enum CompletionState : byte
{
Incomplete,
ProgressComplete,
Solver/Crafty/Solver.cs
-60
View File
@@ -70,20 +70,6 @@ public class Solver
return (currentIndex, currentNode.CompletionState);
}
public static float Eval(NodeScores node, NodeScores parent)
{
var w = MaxScoreWeightingConstant;
var c = ExplorationConstant;
var visits = node.Visits;
var average_score = node.ScoreSum / visits;
var exploitation = ((1f - w) * average_score) + (w * node.MaxScore);
var exploration = MathF.Sqrt(c * MathF.Log(parent.Visits) / visits);
return exploitation + exploration;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static int RustMaxBy(List<int> source, Func<int, float> into)
{
@@ -112,52 +98,6 @@ public class Solver
private static int AlignToVectorLength(int length) =>
(length + (Vector<float>.Count - 1)) & ~(Vector<float>.Count - 1);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
// Requires a multiple of Vector<float>.Count
private static void EvalBestChildMultiple(float parentVisits, ReadOnlySpan<float> scoreSums, ReadOnlySpan<float> visits, ReadOnlySpan<float> maxScores, Span<float> evalScores)
{
var C = ExplorationConstant * MathF.Log(parentVisits);
var w = MaxScoreWeightingConstant;
var W = 1f - w;
var CVector = new Vector<float>(C);
var length = scoreSums.Length;
for (var i = 0; i < length; i += Vector<float>.Count)
{
var scoreSumsVector = new Vector<float>(scoreSums[i..(i + Vector<float>.Count)]);
var visitsVector = new Vector<float>(visits[i..(i + Vector<float>.Count)]);
var maxScoresVector = new Vector<float>(maxScores[i..(i + Vector<float>.Count)]);
var evalVector = EvalBestChildVectorized(w, W, CVector, scoreSumsVector, visitsVector, maxScoresVector);
evalVector.CopyTo(evalScores[i..(i + Vector<float>.Count)]);
}
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private int EvalBestChildAlternative(float parentVisits, List<int> children)
{
var length = children.Count;
var alignedLength = AlignToVectorLength(length);
Span<float> scoreSums = stackalloc float[alignedLength];
Span<float> visits = stackalloc float[alignedLength];
Span<float> maxScores = stackalloc float[alignedLength];
Span<float> evalScores = stackalloc float[alignedLength];
for (var i = 0; i < length; ++i)
{
var node = Tree.Get(children[i]).State.Scores;
scoreSums[i] = node.ScoreSum;
visits[i] = node.Visits;
maxScores[i] = node.MaxScore;
}
EvalBestChildMultiple(parentVisits, scoreSums, visits, maxScores, evalScores);
var max = 0;
for (var i = 1; i < length; ++i)
if (evalScores[i] >= evalScores[max])
max = i;
return children[max];
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private int EvalBestChild(float parentVisits, List<int> children)
{