Merge branch '1.1.0'

Trakkasure · Sep 16, 2012 · 0a7bf20 · 0a7bf20
2 parents 47d26fc + 10eb079
commit 0a7bf20
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 9 deletions.
diff --git a/crossfilter.js b/crossfilter.js
@@ -1,5 +1,5 @@
 (function(exports){
-crossfilter.version = "1.0.3";
+crossfilter.version = "1.1.0";
 function crossfilter_identity(d) {
   return d;
 }
@@ -557,6 +557,7 @@ function crossfilter() {
       filterRange: filterRange,
       filterAll: filterAll,
       top: top,
+      bottom: bottom,
       group: group,
       groupAll: groupAll
     };
@@ -721,7 +722,7 @@ function crossfilter() {
       return filterIndex((refilter = crossfilter_filterAll)(values));
     }
 
-    // Returns the top K selected records, based on this dimension's order.
+    // Returns the top K selected records based on this dimension's order.
     // Note: observes this dimension's filter, unlike group and groupAll.
     function top(k) {
       var array = [],
@@ -738,6 +739,24 @@ function crossfilter() {
       return array;
     }
 
+    // Returns the bottom K selected records based on this dimension's order.
+    // Note: observes this dimension's filter, unlike group and groupAll.
+    function bottom(k) {
+      var array = [],
+          i = lo0,
+          j;
+
+      while (i < hi0 && k > 0) {
+        if (!filters[j = index[i]]) {
+          array.push(data[j]);
+          --k;
+        }
+        i++;
+      }
+
+      return array;
+    }
+
     // Adds a new group to this dimension, using the specified key function.
     function group(key) {
       var group = {

diff --git a/crossfilter.min.js b/crossfilter.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crossfilter",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Fast multidimensional filtering for coordinated views.",
   "keywords": [
     "square",

diff --git a/src/crossfilter.js b/src/crossfilter.js
@@ -42,6 +42,7 @@ function crossfilter() {
       filterRange: filterRange,
       filterAll: filterAll,
       top: top,
+      bottom: bottom,
       group: group,
       groupAll: groupAll
     };
@@ -206,7 +207,7 @@ function crossfilter() {
       return filterIndex((refilter = crossfilter_filterAll)(values));
     }
 
-    // Returns the top K selected records, based on this dimension's order.
+    // Returns the top K selected records based on this dimension's order.
     // Note: observes this dimension's filter, unlike group and groupAll.
     function top(k) {
       var array = [],
@@ -223,6 +224,24 @@ function crossfilter() {
       return array;
     }
 
+    // Returns the bottom K selected records based on this dimension's order.
+    // Note: observes this dimension's filter, unlike group and groupAll.
+    function bottom(k) {
+      var array = [],
+          i = lo0,
+          j;
+
+      while (i < hi0 && k > 0) {
+        if (!filters[j = index[i]]) {
+          array.push(data[j]);
+          --k;
+        }
+        i++;
+      }
+
+      return array;
+    }
+
     // Adds a new group to this dimension, using the specified key function.
     function group(key) {
       var group = {

diff --git a/src/version.js b/src/version.js
@@ -1 +1 @@
-crossfilter.version = "1.0.3";
+crossfilter.version = "1.1.0";