update matrix

src/EcsArc.cs

@@ -19,8 +19,8 @@ namespace DCFApixels.DragonECS
         private readonly EndWorldHandler _endWorldHandler;
         private readonly LoopWorldHandler _loopWorldHandler;
 
-        private EcsGroup _relEntities;
         private RelEntityInfo[] _relEntityInfos; //N * (N - 1) / 2
+        private readonly SparseMatrix _matrix;
 
         private bool _isLoop;
         private bool _isInit = false;
@@ -51,11 +51,6 @@ namespace DCFApixels.DragonECS
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get { return _arcWorld.id; }
         }
-        public EcsReadonlyGroup RelEntities
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get { return _relEntities.Readonly; }
-        }
         public bool IsLoop
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -73,9 +68,7 @@ namespace DCFApixels.DragonECS
             _isLoop = startWorld == endWorld;
 
             _relEntityInfos = new RelEntityInfo[arcWorld.Capacity];
-
+            _matrix = new SparseMatrix(arcWorld.Capacity);
-
-            _relEntities = EcsGroup.New(_arcWorld);
 
             _arcWorldHandler = new ArcWorldHandler(this);
             if (_isLoop)
@@ -106,24 +99,66 @@ namespace DCFApixels.DragonECS
         }
         #endregion
 
-        #region New/Del
+        #region New
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int NewRelation(int startEntityID, int endEntityID)
         {
-            int relEntity = _arcWorld.NewEntity();
+            return NewRelationInternal(startEntityID, endEntityID);
-            _relEntityInfos[relEntity] = new RelEntityInfo(startEntityID, endEntityID);
-            _relEntities.Add(relEntity);
-            return relEntity;
         }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public int GetOrNewRelation(int startEntityID, int endEntityID)
+        {
+            if (_matrix.TryGetValue(startEntityID, endEntityID, out int relEntityID))
+            {
+                return relEntityID;
+            }
+            return NewRelationInternal(startEntityID, endEntityID);
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private int NewRelationInternal(int startEntityID, int endEntityID)
+        {
+            int relEntityID = _arcWorld.NewEntity();
+            _matrix.Add(startEntityID, endEntityID, relEntityID);
+            _relEntityInfos[relEntityID] = new RelEntityInfo(startEntityID, endEntityID);
+            return relEntityID;
+        }
+        #endregion
 
+        #region Has
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool HasRelation(int startEntityID, int endEntityID)
+        {
+            return _matrix.HasKey(startEntityID, endEntityID);
+        }
+        #endregion
+
+        #region Get
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public int GetRelation(int startEntityID, int endEntityID)
+        {
+            return _matrix.GetValue(startEntityID, endEntityID);
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryGetRelation(int startEntityID, int endEntityID, out int relEntityID)
+        {
+            return _matrix.TryGetValue(startEntityID, endEntityID, out relEntityID);
+        }
+        #endregion
+
+        #region Del
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void DelRelation(int relEntityID)
         {
             _arcWorld.DelEntity(relEntityID);
+            ClearRelation_Internal(relEntityID);
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ClearRelation_Internal(int relEntityID)
         {
-            _relEntities.Remove(relEntityID);
+            ref RelEntityInfo info = ref _relEntityInfos[relEntityID];
-            _relEntityInfos[relEntityID] = RelEntityInfo.Empty;
+            _matrix.TryDel(info.start, info.end);
+            info = RelEntityInfo.Empty;
         }
         #endregion
 

src/Utils/SparseMatrix.cs

@@ -0,0 +1,400 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using TValue = System.Int32;
+
+namespace DCFApixels.DragonECS.Relations.Internal
+{
+    internal sealed unsafe class SparseMatrix
+    {
+        public const int MIN_CAPACITY_BITS_OFFSET = 4;
+        public const int MIN_CAPACITY = 1 << MIN_CAPACITY_BITS_OFFSET;
+
+
+        private const int MAX_CHAIN_LENGTH = 5;
+
+        private Basket* _buckets;
+        private Entry* _entries;
+        private int _capacity;
+
+        private int _count;
+
+        private int _freeList;
+        private int _freeCount;
+
+        private int _modBitMask;
+
+        #region Properties
+        public int Count
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get { return _count; }
+        }
+        public int Capacity
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            //get { return _buckets.Length; }
+            get { return _capacity; }
+        }
+        #endregion
+
+        #region Constructors
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public SparseMatrix(int minCapacity = MIN_CAPACITY)
+        {
+            minCapacity = NormalizeCapacity(minCapacity);
+            //_buckets = new Basket[minCapacity];
+            //_buckets = new UnsafeArray<Basket>(minCapacity);
+            _buckets = UnmanagedArrayUtility.New<Basket>(minCapacity);
+            for (int i = 0; i < minCapacity; i++)
+            {
+                _buckets[i] = Basket.Empty;
+            }
+            //_entries = new Entry[minCapacity];
+            //_entries = new UnsafeArray<Entry>(minCapacity, true);
+            _entries = UnmanagedArrayUtility.NewAndInit<Entry>(minCapacity);
+            _modBitMask = (minCapacity - 1) & 0x7FFFFFFF;
+
+            _count = 0;
+            _freeList = 0;
+            _freeCount = 0;
+
+            //
+            _capacity = minCapacity;
+        }
+        #endregion
+
+
+
+        #region Add/TryAdd/Set
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Add(int x, int y, TValue value)
+        {
+            Key key = Key.FromXY(x, y);
+#if DEBUG
+            if (FindEntry(key) >= 0)
+            {
+                throw new ArgumentException("Has(x, y) is true");
+            }
+#endif
+            int targetBucket = key.yHash & _modBitMask;
+            AddInternal(key, targetBucket, value);
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryAdd(int x, int y, TValue value)
+        {
+            Key key = Key.FromXY(x, y);
+            if (FindEntry(key) >= 0)
+            {
+                return false;
+            }
+            int targetBucket = key.yHash & _modBitMask;
+            AddInternal(key, targetBucket, value);
+            return true;
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Set(int x, int y, TValue value)
+        {
+            Key key = Key.FromXY(x, y);
+            int targetBucket = key.yHash & _modBitMask;
+
+            for (int i = _buckets[targetBucket].index; i >= 0; i = _entries[i].next)
+            {
+                if (_entries[i].key == key)
+                {
+                    _entries[i].value = value;
+                    return;
+                }
+            }
+            AddInternal(key, targetBucket, value);
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void AddInternal(Key key, int targetBucket, int value)
+        {
+            int index;
+            if (_freeCount == 0)
+            {
+                //if (_count == _entries.Length)
+                if (_count == _capacity)
+                {
+                    Resize();
+                    targetBucket = key.yHash & _modBitMask;
+                }
+                index = _count++;
+            }
+            else
+            {
+                //_freeCount > 0
+                index = _freeList;
+                _freeList = _entries[index].next;
+                _freeCount--;
+            }
+
+#if DEBUG
+            if(_freeCount < 0) { throw new Exception(); }
+#endif
+
+            ref Basket basket = ref _buckets[targetBucket];
+            ref Entry entry = ref _entries[index];
+
+
+            entry.next = basket.index;
+            entry.key = key;
+            entry.value = value;
+            basket.count++;
+            basket.index = index;
+            //Console.WriteLine($"{targetBucket} {basket.count}");
+
+            if (basket.count >= MAX_CHAIN_LENGTH && Count / Capacity >= 0.7f)
+            {
+                Resize();
+            }
+        }
+        #endregion
+
+        #region FindEntry/Has
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private int FindEntry(int x, int y)
+        {
+            Key key = Key.FromXY(x, y);
+            for (int i = _buckets[key.yHash & _modBitMask].index; i >= 0; i = _entries[i].next)
+            {
+                if (_entries[i].key == key)
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private int FindEntry(Key key)
+        {
+            for (int i = _buckets[key.yHash & _modBitMask].index; i >= 0; i = _entries[i].next)
+            {
+                if (_entries[i].key == key)
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool HasKey(int x, int y)
+        {
+            return FindEntry(x, y) >= 0;
+        }
+        #endregion
+
+        #region GetValue/TryGetValue
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public TValue GetValue(int x, int y)
+        {
+            int index = FindEntry(x, y);
+#if DEBUG
+            if(index < 0)
+            {
+                throw new KeyNotFoundException();
+            }
+#endif
+            return _entries[index].value;
+        }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryGetValue(int x, int y, out TValue value)
+        {
+            int index = FindEntry(x, y);
+            if (index < 0)
+            {
+                value = default;
+                return false;
+            }
+            value = _entries[index].value;
+            return true;
+        }
+        #endregion
+
+        #region TryDel
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool TryDel(int x, int y)
+        {
+            Key key = Key.FromXY(x, y);
+            int targetBucket = key.yHash & _modBitMask;
+            ref Basket basket = ref _buckets[targetBucket];
+
+            int last = -1;
+            for (int i = basket.index; i >= 0; last = i, i = _entries[i].next)
+            {
+                if (_entries[i].key == key)
+                {
+                    if (last < 0)
+                    {
+                        basket.index = _entries[i].next;
+                    }
+                    else
+                    {
+                        _entries[last].next = _entries[i].next;
+                    }
+                    _entries[i].next = _freeList;
+                    _entries[i].key = Key.Null;
+                    _entries[i].value = default;
+                    _freeList = i;
+                    _freeCount++;
+                    basket.count--;
+                    return true;
+                }
+            }
+            return false;
+        }
+        #endregion
+
+
+        
+
+        #region Clear
+        public void Clear()
+        {
+            if (_count > 0)
+            {
+                //for (int i = 0; i < _buckets.Length; i++)
+                for (int i = 0; i < _capacity; i++)
+                {
+                    _buckets[i] = Basket.Empty;
+                }
+                //Array.Clear(_entries, 0, _count);
+                //UnsafeArray.Clear(ref _entries);
+                for (int i = 0; i < _capacity; i++)
+                {
+                    _entries[i] = default;
+                }
+                _count = 0;
+            }
+        }
+        #endregion
+
+        #region Resize
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private void Resize()
+        {
+            //int newSize = _buckets.Length << 1;
+            int newSize = _capacity << 1;
+            _modBitMask = (newSize - 1) & 0x7FFFFFFF;
+
+            //Contract.Assert(newSize >= _entries.Length);
+
+            //Basket[] newBuckets = new Basket[newSize];
+            //UnsafeArray<Basket> newBuckets = new UnsafeArray<Basket>(newSize);
+            Basket* newBuckets = UnmanagedArrayUtility.New<Basket>(newSize);
+            //for (int i = 0; i < newBuckets.Length; i++)
+            for (int i = 0; i < _capacity; i++)
+            {
+                newBuckets[i] = Basket.Empty;
+            }
+
+            //Entry[] newEntries = new Entry[newSize];
+            //Array.Copy(_entries, 0, newEntries, 0, _count);
+            //UnsafeArray<Entry> newEntries = UnsafeArray<Entry>.Resize(_entries, newSize);
+            Entry* newEntries = UnmanagedArrayUtility.ResizeAndInit<Entry>(_entries, _capacity, newSize);
+
+            for (int i = 0; i < _count; i++)
+            {
+                if (newEntries[i].key.yHash >= 0)
+                {
+                    int targetBusket = newEntries[i].key.yHash % newSize;
+                    ref Basket basket = ref _buckets[targetBusket];
+                    newEntries[i].next = basket.index;
+                    basket.index = i;
+                    basket.count++;
+                }
+            }
+            _buckets = newBuckets;
+            _entries = newEntries;
+
+            _capacity = newSize;
+
+            Console.WriteLine($"----- {Capacity} {Count}");
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static int NormalizeCapacity(int capacity)
+        {
+            int result = MIN_CAPACITY;
+            while (result < capacity) result <<= 1;
+            return result;
+        }
+        #endregion
+
+        #region Utils
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        private struct Entry
+        {
+            public int next;        // Index of next entry, -1 if last
+            public Key key;
+            public TValue value;
+
+            public override string ToString()
+            {
+                return key.x == 0 ? "NULL" : value.ToString();
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4, Size = 8)]
+        public struct Basket
+        {
+            public static readonly Basket Empty = new Basket(-1, 0);
+
+            public int index;
+            public int count;
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public Basket(int index, int length)
+            {
+                this.index = index;
+                this.count = length;
+            }
+            public override string ToString()
+            {
+                return index < 0 ? "NULL" : $"{index} {count}";
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4, Size = 8)]
+        public readonly struct Key : IEquatable<Key>
+        {
+            public static readonly Key Null = new Key(-1, -1);
+            public readonly int x;
+            public readonly int yHash;
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            private Key(int x, int yHash)
+            {
+                this.x = x;
+                this.yHash = yHash;
+            }
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public static Key FromXY(int x, int y)
+            {
+                //return new Key(x, BitsUtility.NextXorShiftState(y));
+                //return new Key(x, (~x) ^ y ^ 1_431_655_765);
+                return new Key(x, x ^ y ^ BitsUtility.NextXorShiftState(y));
+            }
+            public static bool operator ==(Key a, Key b)
+            {
+                return a.x == b.x && a.yHash == b.yHash;
+            }
+            public static bool operator !=(Key a, Key b)
+            {
+                return a.x != b.x || a.yHash != b.yHash;
+            }
+            public override int GetHashCode()
+            {
+                return yHash;
+            }
+            public bool Equals(Key other)
+            {
+                return this == other;
+            }
+            public override bool Equals(object obj)
+            {
+                return obj is Key && Equals((Key)obj);
+            }
+        }
+        #endregion
+    }
+}

src/Utils/UnsafeArray.cs

@@ -9,18 +9,30 @@ namespace DCFApixels.DragonECS.Relations.Internal
 {
     internal unsafe static class UnsafeArray
     {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void Resize<T>(ref UnsafeArray<T> array, int newSize)
             where T : unmanaged
         {
             array.ptr = UnmanagedArrayUtility.Resize<T>(array.ptr, newSize);
             array.Length = newSize;
         }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void ResizeAndInit<T>(ref UnsafeArray<T> array, int newSize)
             where T : unmanaged
         {
             array.ptr = UnmanagedArrayUtility.ResizeAndInit<T>(array.ptr, array.Length, newSize);
             array.Length = newSize;
         }
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Clear<T>(ref UnsafeArray<T> array)
+            where T : unmanaged
+        {
+            T* ptr = array.ptr;
+            for (int i = 0; i < array.Length; i++)
+            {
+                ptr[i] = default;
+            }
+        }
     }
     [DebuggerTypeProxy(typeof(UnsafeArray<>.DebuggerProxy))]
     internal unsafe struct UnsafeArray<T> : IDisposable, IEnumerable<T>