Fix order of numbers in state in Grid.prototype.getState

jinghao · Mar 16, 2014 · 22f724b · 22f724b
1 parent dfa6cc3
commit 22f724b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/js/Grid.js b/js/Grid.js
@@ -108,9 +108,9 @@ Grid.prototype.getState = function() {
       var offset = stateY * this.size + stateX;
 
       if (offset < Grid.CELLS_PER_STATE) {
-        state1 += (val * Math.pow(Grid.MAX_CELL_VAL, offset));
+        state2 += (val * Math.pow(Grid.MAX_CELL_VAL, offset));
       } else {
-        state2 += (val * Math.pow(Grid.MAX_CELL_VAL, offset - Grid.CELLS_PER_STATE));
+        state1 += (val * Math.pow(Grid.MAX_CELL_VAL, offset - Grid.CELLS_PER_STATE));
       }
     }
   }

diff --git a/js/__tests__/gridTest.js b/js/__tests__/gridTest.js
@@ -37,7 +37,7 @@ describe('getState', function() {
         [null, null, null, null],
         [2, null, null, null]
       ],
-      expected: [0x00000000, 0x10000000]
+      expected: [0x10000000, 0x00000000]
     },
     {
       cells: [
@@ -46,7 +46,7 @@ describe('getState', function() {
         [null, null, null, null],
         [null, null, 2, null]
       ],
-      expected: [0x10000003, 0x00000000]
+      expected: [0x00000000, 0x10000003]
     },
     {
       cells: [
@@ -55,7 +55,7 @@ describe('getState', function() {
         [null, null, null, null],
         [null, 4, 4, 8]
       ],
-      expected: [0x2000300b, 0x00022000]
+      expected: [0x00022000, 0x2000300b]
     }
   ].forEach(function(testInput) {
     it('tests ' + testInput.cells, function() {
@@ -71,4 +71,4 @@ describe('getState', function() {
       expect(grid.getState()).toEqual(testInput.expected);
     });
   });
-});
+});