Code review.

sethyuan · Mar 31, 2013 · 1b2c113 · 1b2c113
1 parent 771dceb
commit 1b2c113
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/lib/xtabs.js b/lib/xtabs.js
@@ -353,9 +353,9 @@ var addMargins = function(table, margins, fun) {
       blockLength *= dim[i];
     }
 
+    var a = new Array(currentDim[margin]);
     var addCalculation = function(group) {
       for (var i = 0; i < currentBlockLength; i++) {
-        var a = new Array(currentDim[margin]);
         for (var j = 0; j < a.length; j++) {
           a[j] = array[group * newBlockSizes[margin] + j * blockLength + i];
         }
@@ -374,10 +374,14 @@ var addMargins = function(table, margins, fun) {
   var singleFunList;
   if (!funIsArray) singleFunList = [fun];
   for (var i = 0; i < margins.length; i++) {
-    addMargin(margins[i], (funIsArray ? fun[i] : singleFunList));
-    currentDim[margins[i]] += (funIsArray ? fun[i].length : 1);
+    if (funIsArray) {
+      addMargin(margins[i], fun[i]);
+      currentDim[margins[i]] += fun[i].length;
+    } else {
+      addMargin(margins[i], singleFunList);
+      currentDim[margins[i]]++;
+    }
   }
-  debugger;
 
   return Object.freeze(new Table(dim, dimnames, array));
 };