weighted graph refactor

BrightData.UnitTests/FixedSizeArrayTests.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using BrightData.Types;
+using BrightData.Types.Graph;
 using FluentAssertions;
 using Xunit;
 

BrightData.UnitTests/SortedArrayTests.cs

@@ -0,0 +1,41 @@
+using BrightData.Types.Graph;
+using BrightData.Types;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Xunit;
+
+namespace BrightData.UnitTests
+{
+    public class SortedArrayTests
+    {
+        [Fact]
+        public void TestIndexedSortedArray()
+        {
+            var array = new IndexedSortedArray<GraphNodeIndex>(4);
+            for (var i = 0U; i < 4; i++)
+                array.Add(new(4-i));
+            array.Size.Should().Be(4);
+            array[0].Index.Should().Be(1);
+            array[3].Index.Should().Be(4);
+            array.TryFind(1, out var index).Should().BeTrue();
+            index!.Value.Index.Should().Be(1);
+        }
+
+        [Fact]
+        public void TestSortedArray()
+        {
+            var array = new SortedArray<uint, float>(4);
+            for (var i = 0U; i < 4; i++)
+                array.Add(i, 4-i);
+            array.Size.Should().Be(4);
+            array[0].Weight.Should().Be(1);
+            array[3].Weight.Should().Be(4);
+            array.TryFind(1, out var value).Should().BeTrue();
+            value.Should().Be(3);
+        }
+    }
+}

BrightData.UnitTests/VectorSetTests.cs

@@ -2,8 +2,8 @@
 using BrightData.UnitTests.Helper;
 using System.Linq;
 using BrightData.LinearAlgebra.VectorIndexing;
-using BrightData.LinearAlgebra.VectorIndexing.Helper;
 using BrightData.Types;
+using BrightData.Types.Graph;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
@@ -67,7 +67,7 @@ public void Closest()
         [Fact]
         public void TestVectorGraphNode()
         {
-            var node = new IndexedFixedSizeGraphNode<float, FixedSizeSortedAscending8Array<uint, float>>(1);
+            var node = new FixedSizeWeightedGraphNode<GraphNodeIndex, float, FixedSizeSortedAscending8Array<uint, float>>(new(1));
             node.Index.Should().Be(1);
             node.NeighbourIndices.Length.Should().Be(0);
 

BrightData/Interfaces.cs

@@ -616,7 +616,7 @@ public interface IFixedSizeSortedArray<V, W> : IHaveSize
         /// Returns a value and weight
         /// </summary>
         /// <param name="index">Index to return</param>
-        (V Value, W Weight) this[byte index] { get; }
+        (V Value, W Weight) this[uint index] { get; }
 
         /// <summary>
         /// Enumerates the values and weights
@@ -652,7 +652,7 @@ public interface IWeightedGraphNode<out T, W> : IGraphNode
     {
         public T Value { get; }
 
-        bool AddNeighbour(uint index, W weight);
+        bool TryAddNeighbour(uint index, W weight);
 
         IEnumerable<(uint Index, W Weight)> WeightedNeighbours { get; }
     }
@@ -663,14 +663,13 @@ public interface ICalculateNodeWeights<out W>
         W GetWeight(uint fromIndex, uint toIndex);
     }
 
-    public interface IWeightedGraph<T, W> : IHaveSize
+    public interface IWeightedGraph<out T, W> : IHaveSize
         where T: IHaveSingleIndex
         where W : unmanaged, INumber<W>, IMinMaxValue<W>
     {
-        void Add(T value);
-        void Add(T value, ReadOnlySpan<(uint Index, W Weight)> neighbours);
+        T Find(uint nodeIndex);
 
-        T Get(uint index);
+        T this[uint nodePosition] { get; }
 
         RAT Search<RAT, CAT>(uint q, uint entryPoint, ICalculateNodeWeights<W> distanceCalculator)
             where RAT : struct, IFixedSizeSortedArray<uint, W>
@@ -681,4 +680,12 @@ RAT Search<RAT, CAT>(uint q, uint entryPoint, ICalculateNodeWeights<W> distanceC
 
         bool AddNeighbour(uint nodeIndex, uint neighbourIndex, W weight);
     }
+
+    public interface IWeightedDynamicGraph<T, W> : IWeightedGraph<T, W>
+        where T: IHaveSingleIndex
+        where W : unmanaged, INumber<W>, IMinMaxValue<W>
+    {
+        void Add(T value);
+        void Add(T value, ReadOnlySpan<(uint Index, W Weight)> neighbours);
+    }
 }