Hashmap limit

copy · Jun 15, 2013 · 053931f · 053931f
1 parent 94217b2
commit 053931f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/cc.sh b/cc.sh
@@ -3,7 +3,7 @@
 # To compile, get the script from http://closure-compiler.googlecode.com/files/compiler-latest.zip
 # And put it into ~/.local or change the path below
 
-FILENAME="out.js"
+FILENAME="life-compressed.js"
 
 ls -l $FILENAME
 

diff --git a/life.js b/life.js
@@ -5,7 +5,8 @@ function LifeUniverse()
 {
     /** @const */
     var LOAD_FACTOR = .6,
-        INITIAL_SIZE = 20;
+        INITIAL_SIZE = 20,
+        HASHMAP_LIMIT = 24;
 
     var 
         // last id for nodes
@@ -684,9 +685,15 @@ function LifeUniverse()
         //console.log("collecting garbage ...");
         //var t = Date.now();
 
-        hashmap_size = hashmap_size << 1 | 1;
+        if(hashmap_size < (1 << HASHMAP_LIMIT) - 1)
+        {
+            hashmap_size = hashmap_size << 1 | 1;
+            hashmap = [];
+        }
+
         max_load = hashmap_size * LOAD_FACTOR | 0;
 
+
         for(var i = 0; i <= hashmap_size; i++)
             hashmap[i] = undefined;
 

diff --git a/main.js b/main.js
@@ -798,7 +798,7 @@ var pow2 = (function()
         life.set_step(10);
         max_fps = 6;
 
-        drawer.cell_width = 1 / 128;
+        drawer.cell_width = 1 / 32;
 
         life.make_center(field, bounds);
         life.setup_meta(otca_on, otca_off, field, bounds);