[Quantum] Optimize logic based on enumerations

profan · Jun 2, 2020 · 4140892 · 4140892
1 parent 67f2aa6
commit 4140892
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 15 deletions.
diff --git a/sources/assets/Stride.Core.Assets.Quantum/AssetToBaseNodeLinker.cs b/sources/assets/Stride.Core.Assets.Quantum/AssetToBaseNodeLinker.cs
@@ -48,7 +48,13 @@ public override ObjectReference FindTargetReference(IGraphNode sourceNode, IGrap
             var targetIds = CollectionItemIdHelper.GetCollectionItemIds(targetNode.Retrieve());
             var itemId = sourceIds[sourceReference.Index.Value];
             var targetKey = targetIds.GetKey(itemId);
-            return targetReference.FirstOrDefault(x => Equals(x.Index.Value, targetKey));
+            foreach (var targetRef in targetReference)
+            {
+                if (Equals(targetRef.Index.Value, targetKey))
+                    return targetRef;
+            }
+
+            return null;
         }
     }
 }
diff --git a/sources/assets/Stride.Core.Assets/Reflection/CollectionItemIdentifiers.cs b/sources/assets/Stride.Core.Assets/Reflection/CollectionItemIdentifiers.cs
@@ -134,7 +134,12 @@ public void Validate(bool isList)
         public object GetKey(ItemId itemId)
         {
             // TODO: add indexing by guid to avoid O(n)
-            return keyToIdMap.SingleOrDefault(x => x.Value == itemId).Key;
+            foreach( var kvp in keyToIdMap )
+            {
+                if( kvp.Value == itemId )
+                    return kvp.Key;
+            }
+            return null;
         }
 
         public void CloneInto(CollectionItemIdentifiers target, IReadOnlyDictionary<object, object> referenceTypeClonedKeys)

diff --git a/sources/presentation/Stride.Core.Quantum/GraphNodeLinker.cs b/sources/presentation/Stride.Core.Quantum/GraphNodeLinker.cs
@@ -46,10 +46,28 @@ protected override void VisitChildren(IObjectNode node)
             {
                 if (VisitedLinks.TryGetValue(node, out IGraphNode targetNodeParent))
                 {
-                    foreach (var child in node.Members)
+                    var objNode = targetNodeParent as IObjectNode;
+                    var members = node.Members;
+                    if (members is List<IMemberNode> asList)
                     {
-                        string name = child.Name;
-                        VisitedLinks.Add(child, ((IObjectNode)targetNodeParent)?.TryGetChild(name));
+                        foreach (var child in asList)
+                        {
+                            VisitedLinks.Add(child, objNode?.TryGetChild(child.Name));
+                        }
+                    }
+                    else if(members is Dictionary<string, IMemberNode>.ValueCollection asVCol)
+                    {
+                        foreach (var child in asVCol)
+                        {
+                            VisitedLinks.Add(child, objNode?.TryGetChild(child.Name));
+                        }
+                    }
+                    else
+                    {
+                        foreach (var child in members)
+                        {
+                            VisitedLinks.Add(child, objNode?.TryGetChild(child.Name));
+                        }
                     }
                 }
                 base.VisitChildren(node);

diff --git a/sources/presentation/Stride.Core.Quantum/GraphVisitorBase.cs b/sources/presentation/Stride.Core.Quantum/GraphVisitorBase.cs
@@ -64,14 +64,14 @@ protected virtual void VisitNode([NotNull] IGraphNode node)
             {
                 Visiting?.Invoke(node, CurrentPath);
             }
-            var objectNode = node as IObjectNode;
-            if (objectNode != null)
+
+            if (node is IObjectNode objectNode)
             {
                 VisitChildren(objectNode);
                 VisitItemTargets(objectNode);
             }
-            var memberNode = node as IMemberNode;
-            if (memberNode != null)
+
+            if (node is IMemberNode memberNode)
             {
                 VisitMemberTarget(memberNode);
             }
@@ -85,11 +85,33 @@ protected virtual void VisitNode([NotNull] IGraphNode node)
         protected virtual void VisitChildren([NotNull] IObjectNode node)
         {
             if (node == null) throw new ArgumentNullException(nameof(node));
-            foreach (var child in node.Members)
+            var members = node.Members;
+            if (members is List<IMemberNode> asList)
+            {
+                foreach (var child in asList)
+                {
+                    CurrentPath.PushMember(child.Name);
+                    VisitNode(child);
+                    CurrentPath.Pop();
+                }
+            }
+            else if(members is Dictionary<string, IMemberNode>.ValueCollection asVCol)
             {
-                CurrentPath.PushMember(child.Name);
-                VisitNode(child);
-                CurrentPath.Pop();
+                foreach (var child in asVCol)
+                {
+                    CurrentPath.PushMember(child.Name);
+                    VisitNode(child);
+                    CurrentPath.Pop();
+                }
+            }
+            else
+            {
+                foreach (var child in members)
+                {
+                    CurrentPath.PushMember(child.Name);
+                    VisitNode(child);
+                    CurrentPath.Pop();
+                }
             }
         }
 

diff --git a/sources/presentation/Stride.Core.Quantum/References/ReferenceEnumerable.cs b/sources/presentation/Stride.Core.Quantum/References/ReferenceEnumerable.cs
@@ -153,7 +153,9 @@ public void Refresh(IGraphNode ownerNode, NodeContainer nodeContainer)
         }
 
         /// <inheritdoc/>
-        public IEnumerator<ObjectReference> GetEnumerator()
+        public ReferenceEnumerator GetEnumerator() => new ReferenceEnumerator(this);
+
+        IEnumerator<ObjectReference> IEnumerable<ObjectReference>.GetEnumerator()
         {
             return new ReferenceEnumerator(this);
         }
@@ -237,7 +239,7 @@ private static object GetValue([NotNull] object keyValuePair)
         /// <summary>
         /// An enumerator for <see cref="ReferenceEnumerable"/> that enumerates in proper item order.
         /// </summary>
-        private class ReferenceEnumerator : IEnumerator<ObjectReference>
+        public struct ReferenceEnumerator : IEnumerator<ObjectReference>
         {
             private readonly IEnumerator<NodeIndex> indexEnumerator;
             private ReferenceEnumerable obj;