[Heap]

loiane · loiane · commit 0848b4f38e6f · 2018-03-30T19:59:49.000-04:00
diff --git a/examples/PacktDataStructuresAlgorithms.min.js b/examples/PacktDataStructuresAlgorithms.min.js
diff --git a/examples/PacktDataStructuresAlgorithms.min.js.map b/examples/PacktDataStructuresAlgorithms.min.js.map
diff --git a/examples/chapter10/01-UsingMinHeap.html b/examples/chapter10/01-UsingMinHeap.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+  <script src="./../PacktDataStructuresAlgorithms.min.js"></script>
+  <script src="01-UsingMinHeap.js"></script>
+</body>
+</html>
diff --git a/examples/chapter10/01-UsingMinHeap.js b/examples/chapter10/01-UsingMinHeap.js
@@ -0,0 +1,25 @@
+const { MinHeap } = PacktDataStructuresAlgorithms;
+
+const heap = new MinHeap();
+
+heap.insert(2);
+heap.insert(3);
+heap.insert(4);
+heap.insert(5);
+
+heap.insert(1);
+
+console.log(heap.getAsArray());
+
+console.log('Heap size: ', heap.size()); // 5
+console.log('Heap is empty: ', heap.isEmpty()); // false
+console.log('Heap min value: ', heap.findMinimum()); // 1
+
+heap.insert(6);
+heap.insert(7);
+
+console.log(heap.getAsArray());
+
+console.log('Extract minimum: ', heap.extract());
+console.log(heap.getAsArray());
+
diff --git a/examples/chapter10/02-UsingMaxHeap.html b/examples/chapter10/02-UsingMaxHeap.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+  <script src="./../PacktDataStructuresAlgorithms.min.js"></script>
+  <script src="02-UsingMaxHeap.js"></script>
+</body>
+</html>
diff --git a/examples/chapter10/02-UsingMaxHeap.js b/examples/chapter10/02-UsingMaxHeap.js
@@ -0,0 +1,27 @@
+const { MaxHeap } = PacktDataStructuresAlgorithms;
+
+const maxHeap = new MaxHeap();
+
+maxHeap.insert(2);
+maxHeap.insert(3);
+maxHeap.insert(4);
+maxHeap.insert(5);
+
+maxHeap.insert(1);
+
+console.log(maxHeap.getAsArray());
+
+console.log('Heap size: ', maxHeap.size()); // 5
+console.log('Heap is empty: ', maxHeap.isEmpty()); // false
+console.log('Heap min value: ', maxHeap.findMinimum()); // 5
+
+maxHeap.insert(6);
+maxHeap.insert(9);
+maxHeap.insert(10);
+maxHeap.insert(14);
+
+console.log(maxHeap.getAsArray());
+
+console.log('Extract minimum: ', maxHeap.extract());
+console.log(maxHeap.getAsArray());
+
diff --git a/examples/chapter10/03-HeapSort.html b/examples/chapter10/03-HeapSort.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+  <script src="./../PacktDataStructuresAlgorithms.min.js"></script>
+  <script src="03-HeapSort.js"></script>
+</body>
+</html>
diff --git a/examples/chapter10/03-HeapSort.js b/examples/chapter10/03-HeapSort.js
@@ -0,0 +1,7 @@
+const { heapSort } = PacktDataStructuresAlgorithms;
+
+console.log('********** Heap Sort **********');
+const array = [7, 6, 3, 5, 4, 1, 2];
+
+console.log('Before sorting: ', array);
+console.log('After sorting: ', heapSort(array));
diff --git a/examples/index.html b/examples/index.html
@@ -190,6 +190,19 @@
           </div>
         </div>
       </section>
+      <section class="mdl-layout__tab-panel" id="scroll-tab-10">
+        <div class="page-content">
+          <div class="page-content mdl-layout--fixed-drawer">
+            <div class="mdl-layout__drawer is-visible">
+              <nav class="mdl-navigation">
+                <a class="mdl-navigation__link" href="chapter10/01-UsingMinHeap.html">01-UsingMinHeap</a>
+                <a class="mdl-navigation__link" href="chapter10/02-UsingMaxHeap.html">02-UsingMaxHeap</a>
+                <a class="mdl-navigation__link" href="chapter10/03-HeapSort.html">03-HeapSort</a>
+              </nav>
+            </div>
+          </div>
+        </div>
+      </section>
       <section class="mdl-layout__tab-panel" id="scroll-tab-11">
         <div class="page-content">
           <div class="page-content mdl-layout--fixed-drawer">
diff --git a/package.json b/package.json
@@ -75,6 +75,7 @@
     "tslint": "^5.9.1",
     "typescript": "^2.7.2",
     "webpack": "^4.1.1",
+    "webpack-cli": "^2.0.12",
     "yargs": "^11.0.0"
   }
 }
diff --git a/src/js/data-structures/heap.js b/src/js/data-structures/heap.js
@@ -26,7 +26,7 @@ export class MinHeap {
   clear() {
     this.heap = [];
   }
-  find() {
+  findMinimum() {
     return this.isEmpty() ? undefined : this.heap[0];
   }
   insert(value) {
@@ -43,12 +43,15 @@ export class MinHeap {
     const left = this.getLeftIndex(index);
     const right = this.getRightIndex(index);
     const size = this.size();
-    if (left < size && this.compareFn(this.heap[element], this.heap[left]) > Compare.BIGGER_THAN) {
+    if (
+      left < size &&
+      this.compareFn(this.heap[element], this.heap[left]) === Compare.BIGGER_THAN
+    ) {
       element = left;
     }
     if (
       right < size &&
-      this.compareFn(this.heap[element], this.heap[right]) > Compare.BIGGER_THAN
+      this.compareFn(this.heap[element], this.heap[right]) === Compare.BIGGER_THAN
     ) {
       element = right;
     }
@@ -59,7 +62,10 @@ export class MinHeap {
   }
   siftUp(index) {
     let parent = this.getParentIndex(index);
-    while (index > 0 && this.compareFn(this.heap[parent], this.heap[index]) > Compare.BIGGER_THAN) {
+    while (
+      index > 0 &&
+      this.compareFn(this.heap[parent], this.heap[index]) === Compare.BIGGER_THAN
+    ) {
       swap(this.heap, parent, index);
       index = parent;
       parent = this.getParentIndex(index);
@@ -79,11 +85,15 @@ export class MinHeap {
   heapify(array) {
     if (array) {
       this.heap = array;
-      this.heap.unshift(null); // remove all null elements
     }
-    for (let i = this.size() - 1; i > 0; i--) {
+    const maxIndex = Math.floor(this.size() / 2) - 1;
+    for (let i = 0; i <= maxIndex; i++) {
       this.siftDown(i);
     }
+    return this.heap;
+  }
+  getAsArray() {
+    return this.heap;
   }
 }
 export class MaxHeap extends MinHeap {
diff --git a/src/ts/data-structures/heap.ts b/src/ts/data-structures/heap.ts
@@ -103,6 +103,10 @@ export class MinHeap<T> {
 
     return this.heap;
   }
+
+  getAsArray() {
+    return this.heap;
+  }
 }
 
 export class MaxHeap<T> extends MinHeap<T> {
diff --git a/test/ts/data-structures/heap.spec.ts b/test/ts/data-structures/heap.spec.ts
@@ -1,5 +1,5 @@
 import 'mocha';
-// import { expect } from 'chai';
+import { expect } from 'chai';
 import { MinHeap } from '../../../src/ts/index';
 import { MaxHeap } from '../../../src/ts/data-structures/heap';
 import heapSort from '../../../src/ts/algorithms/sorting/heap-sort';
@@ -15,12 +15,27 @@ describe('Heap', () => {
 
   });
 
-  it('inserts elements in the AVLTree', () => {
+  it('inserts elements in the Heap', () => {
+
+    let min = 2;
 
-    heap.insert(3);
     heap.insert(2);
-    heap.insert(1);
+    expect(heap.findMinimum()).to.equal(min);
+    heap.insert(3);
+    expect(heap.findMinimum()).to.equal(min);
     heap.insert(4);
+    expect(heap.findMinimum()).to.equal(min);
+    heap.insert(5);
+    expect(heap.findMinimum()).to.equal(min);
+
+    heap.insert(1);
+    min = 1;
+    expect(heap.findMinimum()).to.equal(min);
+
+    heap.insert(6);
+    heap.insert(9);
+    heap.insert(10);
+    heap.insert(14);
 
     heap.extract();
     heap.extract();
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,7 +1,7 @@
 // @ts-check
 /* eslint-disable */
 const webpack = require('webpack');
-const UglifyJsPlugin = webpack.optimize.UglifyJsPlugin;
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');;
 const path = require('path');
 const env = require('yargs').argv.env;
 
@@ -11,7 +11,7 @@ let plugins = [],
   outputFile;
 
 if (env === 'build') {
-  plugins.push(new UglifyJsPlugin({ minimize: true }));
+  // plugins.push(new UglifyJsPlugin({ minimize: true }));
   outputFile = libraryName + '.min.js';
 } else {
   outputFile = libraryName + '.js';
@@ -40,7 +40,17 @@ const config = {
     modules: [path.resolve('./node_modules'), path.resolve('./src/js')],
     extensions: ['.json', '.js']
   },
-  plugins: plugins
+  optimization: {
+    minimizer: [
+      // we specify a custom UglifyJsPlugin here to get source maps in production
+      new UglifyJsPlugin({
+        cache: true,
+        parallel: true,
+        sourceMap: true
+      })
+    ]
+  }
+ // plugins: plugins
 };
 
 module.exports = config;

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@`
`75`	`75`	`"tslint": "^5.9.1",`
`76`	`76`	`"typescript": "^2.7.2",`
`77`	`77`	`"webpack": "^4.1.1",`
	`78`	`+ "webpack-cli": "^2.0.12",`
`78`	`79`	`"yargs": "^11.0.0"`
`79`	`80`	`}`
`80`	`81`	`}`