From aade53eaebf5b2e12f650265d2b201bb277ba534 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 4 Apr 2019 07:50:26 -0500 Subject: [PATCH 1/2] Adding GetParent to SortedTree --- src/client/spark_core/Collections/SortedTree.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/client/spark_core/Collections/SortedTree.cs b/src/client/spark_core/Collections/SortedTree.cs index 00f7e1ef1..72622e344 100644 --- a/src/client/spark_core/Collections/SortedTree.cs +++ b/src/client/spark_core/Collections/SortedTree.cs @@ -305,6 +305,13 @@ namespace bts.collections { Node GetRootNode(Node node) => _index.TryGetValue(parent(node.value), out Node pnode) ? GetRootNode(pnode) : node; + public INode GetParent(T item) { + if (_index.TryGetValue(parent(item), out Node pnode)) { + return pnode; + } + return null; + } + public IEnumerable EnumerateGroup(T item) { var pnode = parentmost(item); return pnode == null ? Enumerable.Empty() : EnumerateNode(pnode); From 786f4253b9426f8f7b5cd493454151d80ba70735 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 4 Apr 2019 07:50:52 -0500 Subject: [PATCH 2/2] adding GetParent unit test --- .../spark_test/SortedTree/SortedTreeTests.cs | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/client/spark_test/SortedTree/SortedTreeTests.cs b/src/client/spark_test/SortedTree/SortedTreeTests.cs index d578f50aa..b80e4e826 100644 --- a/src/client/spark_test/SortedTree/SortedTreeTests.cs +++ b/src/client/spark_test/SortedTree/SortedTreeTests.cs @@ -82,6 +82,46 @@ namespace bts.tests { int id(Order order) => order.id; int pid(Order order) => order.parent_id; + [Test] + public void test_parent() { + var comparer = Comparer.Create((l, r) => l.name.CompareTo(r.name)); + var input = orders.ToList(); + var tree = new SortedTree(comparer, id, pid, input); + + // grab node a to start + var input_a = input[0]; + var node_a = tree.Where(x => x.name == 'A').FirstOrDefault(); + Assert.AreEqual(input_a, node_a); + + // node a's parent should be null + var node_a_parent = tree.GetParent(node_a); + Assert.IsTrue(node_a_parent == null); + + // grab node b + var input_b = input[1]; + var node_b = tree.Where(x => x.name == 'B').FirstOrDefault(); + Assert.AreEqual(input_b, node_b); + + // verify node b's parent is node a + var node_b_parent = tree.GetParent(node_b); + Assert.AreEqual(node_b_parent.value, node_a); + + // grab a node deeper down and check that it only goes 1 level up + // grab node a to start + var input_e = input[4]; + var node_e = tree.Where(x => x.name == 'E').FirstOrDefault(); + Assert.AreEqual(input_e, node_e); + + var input_f = input[5]; + var node_f = tree.Where(x => x.name == 'F').FirstOrDefault(); + Assert.AreEqual(input_f, node_f); + + // verify node f's parent is node e + var node_f_parent = tree.GetParent(node_f); + Assert.AreEqual(node_f_parent.value, node_e); + + } + [Test] public void test_enumerate_group() { var comparer = Comparer.Create((l, r) => l.name.CompareTo(r.name));