From 17b4b34bd37200d7ce67d96bf6bd322d63cb7d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=98=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= Date: Tue, 8 Oct 2024 19:05:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BA=D0=B0=D1=82=D1=82=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- weighting_n_cutting_the_tree/cutting.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/weighting_n_cutting_the_tree/cutting.go b/weighting_n_cutting_the_tree/cutting.go index 37bf0d7..797d3a4 100644 --- a/weighting_n_cutting_the_tree/cutting.go +++ b/weighting_n_cutting_the_tree/cutting.go @@ -1,9 +1,8 @@ package main import ( - "slices" - "github.com/pkg/errors" + "slices" ) func DecomposeTree(tree map[string]*WeightedNode, threshold uint16) ([]SubTree, error) { @@ -109,18 +108,14 @@ func RecalculateParents(tree map[string]*WeightedNode, currentID string, nodeWei func CutBranch(tree map[string]*WeightedNode, nodeID string) *Node { // Удаление ссылки на ноду из родительской ноды if tree[nodeID].parent != nil { - parentID := tree[nodeID].parent.ID - k := slices.IndexFunc(tree[parentID].children, func(node *Node) bool { + parent := tree[nodeID].parent + m := slices.IndexFunc(parent.Children, func(node *Node) bool { return node.ID == nodeID }) - if k > 0 { - tree[parentID].children = append(tree[parentID].children[:k], tree[parentID].children[k+1:]...) - } - m := slices.IndexFunc(tree[parentID].node.Children, func(node *Node) bool { - return node.ID == nodeID - }) - if m > 0 { - tree[parentID].children = append(tree[parentID].node.Children[:m], tree[parentID].node.Children[m+1:]...) + if m >= 0 { + parent.Children[m] = parent.Children[len(parent.Children)-1] + parent.Children = parent.Children[:len(parent.Children)-1] + //parent.Children = append(parent.Children[:m], parent.Children[m+1:]...) } }