don't realloc PriorityQHeap's vert list

brendankenny · Oct 29, 2015 · 17e9238 · 17e9238
1 parent 0dfab79
commit 17e9238
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 81 deletions.
diff --git a/libtess.cat.js b/libtess.cat.js
@@ -4581,8 +4581,7 @@ libtess.PriorityQHeap = function(leq) {
    * An unordered list of vertices in the heap, with null in empty slots.
    * @private {!Array<libtess.PQKey>}
    */
-  this.verts_ = libtess.PriorityQHeap.reallocKeys_([],
-      libtess.PriorityQHeap.INIT_SIZE_ + 1);
+  this.verts_ = [null, null];
 
   /**
    * An unordered list of indices mapping vertex handles into the heap. An entry
@@ -4668,28 +4667,6 @@ libtess.PriorityQHeap.reallocNumeric_ = function(oldArray, size) {
   return newArray;
 };
 
-/**
- * Allocate a PQKey array of size size. oldArray's contents are copied to the
- * beginning of the new array. The rest of the array is filled with null values.
- * @private
- * @param {!Array<libtess.PQKey>} oldArray
- * @param {number} size
- * @return {!Array<libtess.PQKey>}
- */
-libtess.PriorityQHeap.reallocKeys_ = function(oldArray, size) {
-  var newArray = new Array(size);
-
-  for (var index = 0; index < oldArray.length; index++) {
-    newArray[index] = oldArray[index];
-  }
-
-  for (; index < size; index++) {
-    newArray[index] = null;
-  }
-
-  return newArray;
-};
-
 /**
  * Initializing ordering of the heap. Must be called before any method other
  * than insert is called to ensure correctness when removing or querying.
@@ -4717,8 +4694,6 @@ libtess.PriorityQHeap.prototype.insert = function(keyNew) {
 
     this.heap_ = libtess.PriorityQHeap.reallocNumeric_(this.heap_,
         this.max_ + 1);
-    this.verts_ = libtess.PriorityQHeap.reallocKeys_(this.verts_,
-        this.max_ + 1);
     this.handles_ = libtess.PriorityQHeap.reallocNumeric_(this.handles_,
         this.max_ + 1);
   }

diff --git a/libtess.debug.js b/libtess.debug.js
@@ -4651,8 +4651,7 @@ libtess.PriorityQHeap = function(leq) {
    * An unordered list of vertices in the heap, with null in empty slots.
    * @private {!Array<libtess.PQKey>}
    */
-  this.verts_ = libtess.PriorityQHeap.reallocKeys_([],
-      libtess.PriorityQHeap.INIT_SIZE_ + 1);
+  this.verts_ = [null, null];
 
   /**
    * An unordered list of indices mapping vertex handles into the heap. An entry
@@ -4738,28 +4737,6 @@ libtess.PriorityQHeap.reallocNumeric_ = function(oldArray, size) {
   return newArray;
 };
 
-/**
- * Allocate a PQKey array of size size. oldArray's contents are copied to the
- * beginning of the new array. The rest of the array is filled with null values.
- * @private
- * @param {!Array<libtess.PQKey>} oldArray
- * @param {number} size
- * @return {!Array<libtess.PQKey>}
- */
-libtess.PriorityQHeap.reallocKeys_ = function(oldArray, size) {
-  var newArray = new Array(size);
-
-  for (var index = 0; index < oldArray.length; index++) {
-    newArray[index] = oldArray[index];
-  }
-
-  for (; index < size; index++) {
-    newArray[index] = null;
-  }
-
-  return newArray;
-};
-
 /**
  * Initializing ordering of the heap. Must be called before any method other
  * than insert is called to ensure correctness when removing or querying.
@@ -4787,8 +4764,6 @@ libtess.PriorityQHeap.prototype.insert = function(keyNew) {
 
     this.heap_ = libtess.PriorityQHeap.reallocNumeric_(this.heap_,
         this.max_ + 1);
-    this.verts_ = libtess.PriorityQHeap.reallocKeys_(this.verts_,
-        this.max_ + 1);
     this.handles_ = libtess.PriorityQHeap.reallocNumeric_(this.handles_,
         this.max_ + 1);
   }

diff --git a/libtess.min.js b/libtess.min.js
diff --git a/src/priorityq/PriorityQHeap.js b/src/priorityq/PriorityQHeap.js
@@ -51,8 +51,7 @@ libtess.PriorityQHeap = function(leq) {
    * An unordered list of vertices in the heap, with null in empty slots.
    * @private {!Array<libtess.PQKey>}
    */
-  this.verts_ = libtess.PriorityQHeap.reallocKeys_([],
-      libtess.PriorityQHeap.INIT_SIZE_ + 1);
+  this.verts_ = [null, null];
 
   /**
    * An unordered list of indices mapping vertex handles into the heap. An entry
@@ -138,28 +137,6 @@ libtess.PriorityQHeap.reallocNumeric_ = function(oldArray, size) {
   return newArray;
 };
 
-/**
- * Allocate a PQKey array of size size. oldArray's contents are copied to the
- * beginning of the new array. The rest of the array is filled with null values.
- * @private
- * @param {!Array<libtess.PQKey>} oldArray
- * @param {number} size
- * @return {!Array<libtess.PQKey>}
- */
-libtess.PriorityQHeap.reallocKeys_ = function(oldArray, size) {
-  var newArray = new Array(size);
-
-  for (var index = 0; index < oldArray.length; index++) {
-    newArray[index] = oldArray[index];
-  }
-
-  for (; index < size; index++) {
-    newArray[index] = null;
-  }
-
-  return newArray;
-};
-
 /**
  * Initializing ordering of the heap. Must be called before any method other
  * than insert is called to ensure correctness when removing or querying.
@@ -187,8 +164,6 @@ libtess.PriorityQHeap.prototype.insert = function(keyNew) {
 
     this.heap_ = libtess.PriorityQHeap.reallocNumeric_(this.heap_,
         this.max_ + 1);
-    this.verts_ = libtess.PriorityQHeap.reallocKeys_(this.verts_,
-        this.max_ + 1);
     this.handles_ = libtess.PriorityQHeap.reallocNumeric_(this.handles_,
         this.max_ + 1);
   }