diff --git a/src/data-structures/binary-tree/abstract-binary-tree.ts b/src/data-structures/binary-tree/abstract-binary-tree.ts index 1fc5e34..35e0899 100644 --- a/src/data-structures/binary-tree/abstract-binary-tree.ts +++ b/src/data-structures/binary-tree/abstract-binary-tree.ts @@ -461,21 +461,19 @@ export abstract class AbstractBinaryTree` objects. */ - remove(id: BinaryTreeNodeId, ignoreCount?: boolean): BinaryTreeDeletedResult[] { + remove(nodeOrId: N | BinaryTreeNodeId, ignoreCount?: boolean): BinaryTreeDeletedResult[] { const bstDeletedResult: BinaryTreeDeletedResult[] = []; if (!this.root) return bstDeletedResult; - const curr: N | null = this.get(id); + const curr: N | null = (typeof nodeOrId === 'number') ? this.get(nodeOrId) : nodeOrId; if (!curr) return bstDeletedResult; const parent: N | null = curr?.parent ? curr.parent : null; @@ -518,16 +516,17 @@ export abstract class AbstractBinaryTree { @@ -758,7 +764,7 @@ export abstract class AbstractBinaryTree { diff --git a/src/data-structures/binary-tree/bst.ts b/src/data-structures/binary-tree/bst.ts index fc570b1..55ad60a 100644 --- a/src/data-structures/binary-tree/bst.ts +++ b/src/data-structures/binary-tree/bst.ts @@ -213,19 +213,20 @@ export class BST = BSTNode> extends BinaryTree // --- start additional functions /** - * The `lesserSum` function calculates the sum of a specified property in all nodes with an ID less than a given ID in - * a binary search tree. - * @param {BinaryTreeNodeId} id - The `id` parameter is the identifier of the binary tree node for which you want to - * calculate the lesser sum. + * The `lesserSum` function calculates the sum of property values in a binary tree for nodes that have a lesser value + * than a given node. + * @param {N | BinaryTreeNodeId | null} beginNode - The `beginNode` parameter can be one of the following: * @param {BinaryTreeNodePropertyName} [propertyName] - The `propertyName` parameter is an optional parameter that - * specifies the property of the binary tree node to use for calculating the sum. If not provided, it defaults to 'id'. - * @returns The function `lesserSum` returns a number, which represents the sum of the values of the nodes in the - * binary search tree that have a property value lesser than the given `id`. + * specifies the property name to use for calculating the sum. If not provided, it defaults to `'id'`. + * @returns The function `lesserSum` returns a number, which represents the sum of the values of the nodes in a binary + * tree that have a lesser value than the specified `beginNode` based on the specified `propertyName`. */ - lesserSum(id: BinaryTreeNodeId, propertyName ?: BinaryTreeNodePropertyName): number { + lesserSum(beginNode: N | BinaryTreeNodeId | null, propertyName ?: BinaryTreeNodePropertyName): number { propertyName = propertyName ?? 'id'; + if (typeof beginNode === 'number') beginNode = this.get(beginNode, 'id'); + if (!beginNode) return 0; if (!this.root) return 0; - + const id = beginNode.id; const getSumByPropertyName = (cur: N) => { let needSum: number; switch (propertyName) { @@ -299,8 +300,11 @@ export class BST = BSTNode> extends BinaryTree * defaults to 'id'. * @returns a boolean value. */ - allGreaterNodesAdd(node: N, delta: number, propertyName ?: BinaryTreeNodePropertyName): boolean { + allGreaterNodesAdd(node: N | BinaryTreeNodeId | null, delta: number, propertyName ?: BinaryTreeNodePropertyName): boolean { propertyName = propertyName ?? 'id'; + if (typeof node === 'number') node = this.get(node, 'id'); + if (!node) return false; + const id = node.id; if (!this.root) return false; const _sumByPropertyName = (cur: N) => { @@ -319,7 +323,7 @@ export class BST = BSTNode> extends BinaryTree if (this.loopType === LoopType.RECURSIVE) { const _traverse = (cur: N) => { - const compared = this._compare(cur.id, node.id); + const compared = this._compare(cur.id, id); _sumByPropertyName(cur); if (!cur.left && !cur.right) return; diff --git a/src/data-structures/interfaces/abstract-binary-tree.ts b/src/data-structures/interfaces/abstract-binary-tree.ts index 21c3a47..63457fc 100644 --- a/src/data-structures/interfaces/abstract-binary-tree.ts +++ b/src/data-structures/interfaces/abstract-binary-tree.ts @@ -4,7 +4,8 @@ import { BinaryTreeDeletedResult, BinaryTreeNodeId, BinaryTreeNodePropertyName, - DFSOrderPattern, FamilyPosition, + DFSOrderPattern, + FamilyPosition, LoopType, NodeOrPropertyName } from '../types'; diff --git a/tests/unit/data-structures/binary-tree/bst.test.ts b/tests/unit/data-structures/binary-tree/bst.test.ts index adb522f..61cf46f 100644 --- a/tests/unit/data-structures/binary-tree/bst.test.ts +++ b/tests/unit/data-structures/binary-tree/bst.test.ts @@ -16,10 +16,10 @@ describe('BST operations test', () => { expect(bst.has(6)).toBe(true); const node6 = bst.get(6); - expect(node6 && bst.getHeight(node6)).toBe(2); - expect(node6 && bst.getDepth(node6)).toBe(3); + expect(node6 && bst.getHeight(6)).toBe(2); + expect(node6 && bst.getDepth(6)).toBe(3); - const nodeId10 = bst.get(10, 'id'); + const nodeId10 = bst.get(10); expect(nodeId10?.id).toBe(10); const nodeVal9 = bst.get(9, 'val'); @@ -35,7 +35,7 @@ describe('BST operations test', () => { const minNodeBySpecificNode = node15 && bst.getLeftMost(node15); expect(minNodeBySpecificNode?.id).toBe(12); - const subTreeSum = node15 && bst.subTreeSum(node15); + const subTreeSum = node15 && bst.subTreeSum(15); expect(subTreeSum).toBe(70); const lesserSum = bst.lesserSum(10); @@ -43,14 +43,14 @@ describe('BST operations test', () => { expect(node15).toBeInstanceOf(BSTNode); if (node15 instanceof BSTNode) { - const subTreeAdd = bst.subTreeAdd(node15, 1, 'count'); + const subTreeAdd = bst.subTreeAdd(15, 1, 'count'); expect(subTreeAdd).toBeDefined(); } const node11 = bst.get(11); expect(node11).toBeInstanceOf(BSTNode); if (node11 instanceof BSTNode) { - const allGreaterNodesAdded = bst.allGreaterNodesAdd(node11, 2, 'count'); + const allGreaterNodesAdded = bst.allGreaterNodesAdd(11, 2, 'count'); expect(allGreaterNodesAdded).toBeDefined(); } @@ -74,7 +74,7 @@ describe('BST operations test', () => { expect(bst.isAVLBalanced()).toBe(true); - expect(node15 && bst.getHeight(node15)).toBe(2); + expect(bst.getHeight(15)).toBe(1); const removed1 = bst.remove(1, true); expect(removed1).toBeInstanceOf(Array); @@ -189,7 +189,7 @@ describe('BST operations test', () => { expect(bfsNodes[0].id).toBe(2); expect(bfsNodes[1].id).toBe(12); expect(bfsNodes[2].id).toBe(16); - + expect(bst.count).toBe(5); }); diff --git a/tests/unit/data-structures/constants/magnitude.ts b/tests/unit/data-structures/constants/magnitude.ts index eaed3fe..9de4c5f 100644 --- a/tests/unit/data-structures/constants/magnitude.ts +++ b/tests/unit/data-structures/constants/magnitude.ts @@ -1,4 +1,4 @@ -const orderReducedBy = 2; // reduction of magnitude's order compared to the baseline magnitude +const orderReducedBy = 3; // reduction of magnitude's order compared to the baseline magnitude export const magnitude = { CONSTANT: Math.floor(Number.MAX_SAFE_INTEGER / Math.pow(10, orderReducedBy)),