data-structure-typed 1.35.1 → 1.36.1

package/src/data-structures/binary-tree/bst.ts

@@ -16,9 +16,9 @@ import {CP, LoopType} from '../../types';
 import {BinaryTree, BinaryTreeNode} from './binary-tree';
 import {IBST, IBSTNode} from '../../interfaces';
 
-export class BSTNode<V = any, NEIGHBOR extends BSTNode<V, NEIGHBOR> = BSTNodeNested<V>>
-  extends BinaryTreeNode<V, NEIGHBOR>
-  implements IBSTNode<V, NEIGHBOR>
+export class BSTNode<V = any, FAMILY extends BSTNode<V, FAMILY> = BSTNodeNested<V>>
+  extends BinaryTreeNode<V, FAMILY>
+  implements IBSTNode<V, FAMILY>
 {
   constructor(key: BinaryTreeNodeKey, val?: V) {
     super(key, val);

package/src/data-structures/binary-tree/rb-tree.ts

@@ -2,9 +2,9 @@ import {BinaryTreeNodeKey, RBColor, RBTreeNodeNested, RBTreeOptions} from '../..
 import {IRBTree, IRBTreeNode} from '../../interfaces';
 import {BST, BSTNode} from './bst';
 
-export class RBTreeNode<V = any, NEIGHBOR extends RBTreeNode<V, NEIGHBOR> = RBTreeNodeNested<V>>
-  extends BSTNode<V, NEIGHBOR>
-  implements IRBTreeNode<V, NEIGHBOR>
+export class RBTreeNode<V = any, FAMILY extends RBTreeNode<V, FAMILY> = RBTreeNodeNested<V>>
+  extends BSTNode<V, FAMILY>
+  implements IRBTreeNode<V, FAMILY>
 {
   private _color: RBColor;
 

package/src/data-structures/binary-tree/tree-multiset.ts

@@ -10,9 +10,9 @@ import {BinaryTreeDeletedResult, CP, DFSOrderPattern, FamilyPosition, LoopType}
 import {ITreeMultiset, ITreeMultisetNode} from '../../interfaces';
 import {AVLTree, AVLTreeNode} from './avl-tree';
 
-export class TreeMultisetNode<V = any, NEIGHBOR extends TreeMultisetNode<V, NEIGHBOR> = TreeMultisetNodeNested<V>>
-  extends AVLTreeNode<V, NEIGHBOR>
-  implements ITreeMultisetNode<V, NEIGHBOR>
+export class TreeMultisetNode<V = any, FAMILY extends TreeMultisetNode<V, FAMILY> = TreeMultisetNodeNested<V>>
+  extends AVLTreeNode<V, FAMILY>
+  implements ITreeMultisetNode<V, FAMILY>
 {
   /**
    * The constructor function initializes a BinaryTreeNode object with a key, value, and count.

package/src/data-structures/graph/abstract-graph.ts

@@ -1,8 +1,8 @@
 /**
  * data-structure-typed
  *
- * @author Tyler Zeng
- * @copyright Copyright (c) 2022 Tyler Zeng <zrwusa@gmail.com>
+ * @author Kirk Qi
+ * @copyright Copyright (c) 2022 Kirk Qi <qilinaus@gmail.com>
  * @license MIT License
  */
 import {arrayRemove, uuidV4} from '../../utils';
@@ -622,9 +622,7 @@ export abstract class AbstractGraph<
       if (vertexOrKey instanceof AbstractVertex) distMap.set(vertexOrKey, Infinity);
     }
 
-    const heap = new PriorityQueue<{key: number; val: V}>({
-      comparator: (a, b) => a.key - b.key
-    });
+    const heap = new PriorityQueue<{key: number; val: V}>((a, b) => a.key - b.key);
     heap.add({key: 0, val: srcVertex});
 
     distMap.set(srcVertex, 0);

package/src/data-structures/heap/heap.ts

@@ -1,212 +1,236 @@
 /**
  * data-structure-typed
- *
- * @author Tyler Zeng
- * @copyright Copyright (c) 2022 Tyler Zeng <zrwusa@gmail.com>
+ * @author Kirk Qi
+ * @copyright Copyright (c) 2022 Kirk Qi <qilinaus@gmail.com>
  * @license MIT License
  */
-import {PriorityQueue} from '../priority-queue';
-import type {HeapOptions} from '../../types';
 
-export class HeapItem<V = any> {
-  /**
-   * The constructor function initializes an instance of a class with a priority and a value.
-   * @param {number} priority - The `priority` parameter is a number that represents the priority of the value. It is
-   * optional and has a default value of `NaN`.
-   * @param {V | null} [val=null] - The `val` parameter is of type `V | null`, which means it can accept a value of type
-   * `V` or `null`.
-   */
-  constructor(priority: number = Number.MAX_SAFE_INTEGER, val: V | null = null) {
-    this._val = val;
-    this._priority = priority;
-  }
+import type {CompareFunction} from '../../types';
 
-  private _priority: number;
+export class Heap<E> {
+  protected nodes: E[] = [];
+  private readonly comparator: CompareFunction<E>;
 
-  get priority(): number {
-    return this._priority;
+  constructor(comparator: CompareFunction<E>) {
+    this.comparator = comparator;
   }
 
-  set priority(value: number) {
-    this._priority = value;
+  /**
+   * Insert an element into the heap and maintain the heap properties.
+   * @param value - The element to be inserted.
+   */
+  add(value: E): Heap<E> {
+    this.nodes.push(value);
+    this.bubbleUp(this.nodes.length - 1);
+    return this;
   }
 
-  private _val: V | null;
-
-  get val(): V | null {
-    return this._val;
-  }
+  /**
+   * Remove and return the top element (smallest or largest element) from the heap.
+   * @returns The top element or null if the heap is empty.
+   */
+  poll(): E | null {
+    if (this.nodes.length === 0) {
+      return null;
+    }
+    if (this.nodes.length === 1) {
+      return this.nodes.pop() as E;
+    }
 
-  set val(value: V | null) {
-    this._val = value;
+    const topValue = this.nodes[0];
+    this.nodes[0] = this.nodes.pop() as E;
+    this.sinkDown(0);
+    return topValue;
   }
-}
 
-export abstract class Heap<V = any> {
   /**
-   * The function is a constructor for a class that initializes a priority callback function based on the
-   * options provided.
-   * @param [options] - An optional object that contains configuration options for the Heap.
+   * Float operation to maintain heap properties after adding an element.
+   * @param index - The index of the newly added element.
    */
-  protected constructor(options?: HeapOptions<V>) {
-    if (options) {
-      const {priorityExtractor} = options;
-      if (priorityExtractor !== undefined && typeof priorityExtractor !== 'function') {
-        throw new Error('.constructor expects a valid priority function');
+  protected bubbleUp(index: number): void {
+    const element = this.nodes[index];
+    while (index > 0) {
+      const parentIndex = Math.floor((index - 1) / 2);
+      const parent = this.nodes[parentIndex];
+      if (this.comparator(element, parent) < 0) {
+        this.nodes[index] = parent;
+        this.nodes[parentIndex] = element;
+        index = parentIndex;
+      } else {
+        break;
       }
-      this._priorityExtractor = priorityExtractor || (el => +el);
-    } else {
-      this._priorityExtractor = el => +el;
     }
   }
 
-  protected abstract _pq: PriorityQueue<HeapItem<V>>;
+  /**
+   * Sinking operation to maintain heap properties after removing the top element.
+   * @param index - The index from which to start sinking.
+   */
+  protected sinkDown(index: number): void {
+    const leftChildIndex = 2 * index + 1;
+    const rightChildIndex = 2 * index + 2;
+    const length = this.nodes.length;
+    let targetIndex = index;
+
+    if (leftChildIndex < length && this.comparator(this.nodes[leftChildIndex], this.nodes[targetIndex]) < 0) {
+      targetIndex = leftChildIndex;
+    }
+    if (rightChildIndex < length && this.comparator(this.nodes[rightChildIndex], this.nodes[targetIndex]) < 0) {
+      targetIndex = rightChildIndex;
+    }
 
-  get pq() {
-    return this._pq;
+    if (targetIndex !== index) {
+      const temp = this.nodes[index];
+      this.nodes[index] = this.nodes[targetIndex];
+      this.nodes[targetIndex] = temp;
+      this.sinkDown(targetIndex);
+    }
   }
 
-  protected _priorityExtractor: (val: V) => number;
-  get priorityExtractor() {
-    return this._priorityExtractor;
+  /**
+   * Fix the entire heap to maintain heap properties.
+   */
+  protected fix() {
+    for (let i = Math.floor(this.size / 2); i >= 0; i--) this.sinkDown(i);
   }
 
   /**
-   * The function returns the size of a priority queue.
-   * @returns The size of the priority queue.
+   * Peek at the top element of the heap without removing it.
+   * @returns The top element or null if the heap is empty.
    */
-  get size(): number {
-    return this._pq.size;
+  peek(): E | null {
+    if (this.nodes.length === 0) {
+      return null;
+    }
+    return this.nodes[0];
   }
 
   /**
-   * The function checks if a priority queue is empty.
-   * @returns {boolean} A boolean value indicating whether the size of the priority queue is less than 1.
+   * Get the size (number of elements) of the heap.
    */
-  isEmpty(): boolean {
-    return this._pq.size < 1;
+  get size(): number {
+    return this.nodes.length;
   }
 
-  peek(isItem?: undefined): V | undefined;
-  peek(isItem: false): V | undefined;
-  peek(isItem: true): HeapItem<V> | null;
-
   /**
-   * The `peek` function returns the top item in the priority queue without removing it.
-   * @returns The `peek()` method is returning either a `HeapItem<V>` object or `null`.Returns an val with the highest priority in the queue
+   * Get the last element in the heap, which is not necessarily a leaf node.
+   * @returns The last element or null if the heap is empty.
    */
-  peek(isItem?: boolean): HeapItem<V> | null | V | undefined {
-    isItem = isItem ?? false;
-    const peeked = this._pq.peek();
-
-    return isItem ? peeked : peeked?.val;
+  get leaf(): E | null {
+    return this.nodes[this.size - 1] ?? null;
   }
 
-  peekLast(isItem?: undefined): V | undefined;
-  peekLast(isItem: false): V | undefined;
-  peekLast(isItem: true): HeapItem<V> | null;
-
   /**
-   * The `peekLast` function returns the last item in the heap.
-   * @returns The method `peekLast()` returns either a `HeapItem<V>` object or `null`.Returns an val with the lowest priority in the queue
+   * Check if the heap is empty.
+   * @returns True if the heap is empty, otherwise false.
    */
-  peekLast(isItem?: boolean): HeapItem<V> | null | V | undefined {
-    isItem = isItem ?? false;
-    const leafItem = this._pq.leaf();
-
-    return isItem ? leafItem : leafItem?.val;
+  isEmpty() {
+    return this.size === 0;
   }
 
   /**
-   * The `add` function adds an val to a priority queue with an optional priority value.
-   * @param {V} val - The `val` parameter represents the value that you want to add to the heap. It can be of any
-   * type.
-   * @param {number} [priority] - The `priority` parameter is an optional number that represents the priority of the
-   * val being added to the heap. If the `val` parameter is a number, then the `priority` parameter is set to
-   * the value of `val`. If the `val` parameter is not a number, then the
-   * @returns The `add` method returns the instance of the `Heap` class.
-   * @throws {Error} if priority is not a valid number
+   * Reset the nodes of the heap. Make the nodes empty.
    */
-  add(priority: number, val?: V): Heap<V> {
-    val = val === undefined ? (priority as unknown as V) : val;
-    this._pq.add(new HeapItem<V>(priority, val));
+  clear() {
+    this.nodes = [];
+  }
 
-    return this;
+  /**
+   * Clear and add nodes of the heap
+   * @param nodes
+   */
+  refill(nodes: E[]) {
+    this.nodes = nodes;
+    this.fix();
   }
 
-  poll(isItem?: undefined): V | undefined;
-  poll(isItem: false): V | undefined;
-  poll(isItem: true): HeapItem<V> | null;
+  /**
+   * Use a comparison function to check whether a binary heap contains a specific element.
+   * @param value - the element to check.
+   * @returns Returns true if the specified element is contained; otherwise, returns false.
+   */
+  has(value: E): boolean {
+    return this.nodes.includes(value);
+  }
 
   /**
-   * The `poll` function returns the top item from a priority queue or null if the queue is empty.Removes and returns an val with the highest priority in the queue
-   * @returns either a HeapItem<V> object or null.
+   * Depth-first search (DFS) method, different traversal orders can be selected。
+   * @param order - Traversal order parameter: 'in' (in-order), 'pre' (pre-order) or 'post' (post-order).
+   * @returns An array containing elements traversed in the specified order.
    */
-  poll(isItem?: boolean): HeapItem<V> | null | V | undefined {
-    isItem = isItem ?? false;
-    const top = this._pq.poll();
-    if (!top) {
-      return null;
-    }
+  dfs(order: 'in' | 'pre' | 'post'): E[] {
+    const result: E[] = [];
+
+    // Auxiliary recursive function, traverses the binary heap according to the traversal order
+    const dfsHelper = (index: number) => {
+      if (index < this.size) {
+        if (order === 'in') {
+          dfsHelper(2 * index + 1);
+          result.push(this.nodes[index]);
+          dfsHelper(2 * index + 2);
+        } else if (order === 'pre') {
+          result.push(this.nodes[index]);
+          dfsHelper(2 * index + 1);
+          dfsHelper(2 * index + 2);
+        } else if (order === 'post') {
+          dfsHelper(2 * index + 1);
+          dfsHelper(2 * index + 2);
+          result.push(this.nodes[index]);
+        }
+      }
+    };
+
+    dfsHelper(0); // Traverse starting from the root node
 
-    return isItem ? top : top.val;
+    return result;
   }
 
   /**
-   * The function checks if a given node or value exists in the priority queue.
-   * @param {V | HeapItem<V>} node - The parameter `node` can be of type `V` or `HeapItem<V>`.
-   * @returns a boolean value.
+   * Convert the heap to an array.
+   * @returns An array containing the elements of the heap.
    */
-  has(node: V | HeapItem<V>): boolean {
-    if (node instanceof HeapItem) {
-      return this.pq.getNodes().includes(node);
-    } else {
-      return (
-        this.pq.getNodes().findIndex(item => {
-          return item.val === node;
-        }) !== -1
-      );
-    }
+  toArray(): E[] {
+    return [...this.nodes];
   }
 
-  toArray(isItem?: undefined): (V | undefined)[];
-  toArray(isItem: false): (V | undefined)[];
-  toArray(isItem: true): (HeapItem<V> | null)[];
+  getNodes(): E[] {
+    return this.nodes;
+  }
 
   /**
-   * The `toArray` function returns an array of `HeapItem<V>` objects.
-   * @returns An array of HeapItem<V> objects.Returns a sorted list of vals
+   * Clone the heap, creating a new heap with the same elements.
+   * @returns A new Heap instance containing the same elements.
    */
-  toArray(isItem?: boolean): (HeapItem<V> | null | V | undefined)[] {
-    isItem = isItem ?? false;
-    const itemArray = this._pq.toArray();
-
-    return isItem ? itemArray : itemArray.map(item => item.val);
+  clone(): Heap<E> {
+    const clonedHeap = new Heap<E>(this.comparator);
+    clonedHeap.nodes = [...this.nodes];
+    return clonedHeap;
   }
 
-  sort(isItem?: undefined): (V | undefined)[];
-  sort(isItem: false): (V | undefined)[];
-  sort(isItem: true): (HeapItem<V> | null)[];
-
   /**
-   * The function sorts the elements in the priority queue and returns either the sorted items or their values depending
-   * on the value of the isItem parameter.
-   * @param {boolean} [isItem] - The `isItem` parameter is a boolean flag that indicates whether the sorted result should
-   * be an array of `HeapItem<V>` objects or an array of the values (`V`) of those objects. If `isItem` is `true`, the
-   * sorted result will be an array of `HeapItem
-   * @returns an array of either `HeapItem<V>`, `null`, `V`, or `undefined` values.
+   * Sort the elements in the heap and return them as an array.
+   * @returns An array containing the elements sorted in ascending order.
    */
-  sort(isItem?: boolean): (HeapItem<V> | null | V | undefined)[] {
-    isItem = isItem ?? false;
-    const sorted = this._pq.sort();
-
-    return isItem ? sorted : sorted.map(item => item.val);
+  sort(): E[] {
+    const visitedNode: E[] = [];
+    const cloned = this.clone();
+    while (cloned.size !== 0) {
+      const top = cloned.poll();
+      if (top) visitedNode.push(top);
+    }
+    return visitedNode;
   }
 
   /**
-   * The clear function clears the priority queue.
+   * Static method that creates a binary heap from an array of nodes and a comparison function.
+   * @param nodes
+   * @param comparator - Comparison function.
+   * @returns A new Heap instance.
    */
-  clear(): void {
-    this._pq.clear();
+  static heapify<E>(nodes: E[], comparator: CompareFunction<E>): Heap<E> {
+    const binaryHeap = new Heap<E>(comparator);
+    binaryHeap.nodes = [...nodes];
+    binaryHeap.fix(); // Fix heap properties
+    return binaryHeap;
   }
 }

package/src/data-structures/heap/max-heap.ts

@@ -1,31 +1,24 @@
 /**
  * data-structure-typed
  *
- * @author Tyler Zeng
- * @copyright Copyright (c) 2022 Tyler Zeng <zrwusa@gmail.com>
+ * @author Kirk Qi
+ * @copyright Copyright (c) 2022 Kirk Qi <qilinaus@gmail.com>
  * @license MIT License
  */
 
-import {Heap, HeapItem} from './heap';
-import {PriorityQueue} from '../priority-queue';
-import type {HeapOptions} from '../../types';
+import {Heap} from './heap';
+import type {CompareFunction} from '../../types';
 
-/**
- * @class MaxHeap
- * @extends Heap
- */
-export class MaxHeap<V = any> extends Heap<V> {
-  protected _pq: PriorityQueue<HeapItem<V>>;
-
-  /**
-   * The constructor initializes a PriorityQueue with a custom comparator function.
-   * @param [options] - The `options` parameter is an optional object that can be passed to the constructor. It is of
-   * type `HeapOptions<V>`, which is a generic type that represents the options for the heap.
-   */
-  constructor(options?: HeapOptions<V>) {
-    super(options);
-    this._pq = new PriorityQueue<HeapItem<V>>({
-      comparator: (a, b) => b.priority - a.priority
-    });
+export class MaxHeap<E = any> extends Heap<E> {
+  constructor(
+    comparator: CompareFunction<E> = (a: E, b: E) => {
+      if (!(typeof a === 'number' && typeof b === 'number')) {
+        throw new Error('The a, b params of compare function must be number');
+      } else {
+        return b - a;
+      }
+    }
+  ) {
+    super(comparator);
   }
 }

package/src/data-structures/heap/min-heap.ts

@@ -1,32 +1,24 @@
 /**
  * data-structure-typed
  *
- * @author Tyler Zeng
- * @copyright Copyright (c) 2022 Tyler Zeng <zrwusa@gmail.com>
+ * @author Kirk Qi
+ * @copyright Copyright (c) 2022 Kirk Qi <qilinaus@gmail.com>
  * @license MIT License
  */
 
-import {Heap, HeapItem} from './heap';
-import {PriorityQueue} from '../priority-queue';
-import type {HeapOptions} from '../../types';
+import {Heap} from './heap';
+import type {CompareFunction} from '../../types';
 
-/**
- * @class MinHeap
- * @extends Heap
- */
-export class MinHeap<V = any> extends Heap<V> {
-  protected _pq: PriorityQueue<HeapItem<V>>;
-
-  /**
-   * The constructor initializes a PriorityQueue with a comparator function that compares the priority of two HeapItem
-   * objects.
-   * @param [options] - The `options` parameter is an optional object that can be passed to the constructor. It is of
-   * type `HeapOptions<V>`, which is a generic type that represents the options for the heap.
-   */
-  constructor(options?: HeapOptions<V>) {
-    super(options);
-    this._pq = new PriorityQueue<HeapItem<V>>({
-      comparator: (a, b) => a.priority - b.priority
-    });
+export class MinHeap<E = any> extends Heap<E> {
+  constructor(
+    comparator: CompareFunction<E> = (a: E, b: E) => {
+      if (!(typeof a === 'number' && typeof b === 'number')) {
+        throw new Error('The a, b params of compare function must be number');
+      } else {
+        return a - b;
+      }
+    }
+  ) {
+    super(comparator);
   }
 }

package/src/data-structures/priority-queue/max-priority-queue.ts

@@ -1,56 +1,23 @@
 /**
  * data-structure-typed
  *
- * @author Tyler Zeng
- * @copyright Copyright (c) 2022 Tyler Zeng <zrwusa@gmail.com>
+ * @author Kirk Qi
+ * @copyright Copyright (c) 2022 Kirk Qi <qilinaus@gmail.com>
  * @license MIT License
  */
 import {PriorityQueue} from './priority-queue';
-import type {PriorityQueueOptions, SpecifyOptional} from '../../types';
+import type {CompareFunction} from '../../types';
 
 export class MaxPriorityQueue<E = any> extends PriorityQueue<E> {
-  constructor(options?: Omit<PriorityQueueOptions<number>, 'comparator'>);
-  constructor(options: PriorityQueueOptions<E>);
-
-  /**
-   * The constructor initializes a priority queue with an optional comparator function.
-   * @param [options] - The `options` parameter is an optional object that can contain various properties to configure
-   * the priority queue.
-   */
-  constructor(options?: SpecifyOptional<PriorityQueueOptions<E>, 'comparator'>) {
-    super({
-      ...options,
-      comparator: options?.comparator
-        ? options.comparator
-        : (a: E, b: E) => {
-            const aKey = a as unknown as number,
-              bKey = b as unknown as number;
-            return bKey - aKey;
-          }
-    });
-  }
-
-  static override heapify<E extends number>(options?: Omit<PriorityQueueOptions<E>, 'comparator'>): MaxPriorityQueue<E>;
-  static override heapify<E>(options: PriorityQueueOptions<E>): MaxPriorityQueue<E>;
-
-  /**
-   * The function `heapify` creates a max priority queue from the given options and returns it.
-   * @param options - The `options` parameter is an object that contains configuration options for creating a priority
-   * queue. It can have the following properties:
-   * @returns a MaxPriorityQueue object.
-   */
-  static override heapify<E>(options: PriorityQueueOptions<E>): MaxPriorityQueue<E> {
-    const maxPQ = new MaxPriorityQueue<E>({
-      ...options,
-      comparator: options?.comparator
-        ? options.comparator
-        : (a: E, b: E) => {
-            const aKey = a as unknown as number,
-              bKey = b as unknown as number;
-            return bKey - aKey;
-          }
-    });
-    maxPQ._fix();
-    return maxPQ;
+  constructor(
+    compare: CompareFunction<E> = (a: E, b: E) => {
+      if (!(typeof a === 'number' && typeof b === 'number')) {
+        throw new Error('The a, b params of compare function must be number');
+      } else {
+        return b - a;
+      }
+    }
+  ) {
+    super(compare);
   }
 }