speed it up (#86)

Author: cigolpl

dist/itemsjs.js

@@ -2879,13 +2879,20 @@ var matrix = function matrix(facets, filters) {
   }); // cross all facets with conjunctive index
 
 
-  _.mapValues(temp_facet['bits_data_temp'], function (values, key) {
-    _.mapValues(temp_facet['bits_data_temp'][key], function (facet_indexes, key2) {
-      if (conjunctive_index) {
+  if (conjunctive_index) {
+    _.mapValues(temp_facet['bits_data_temp'], function (values, key) {
+      _.mapValues(temp_facet['bits_data_temp'][key], function (facet_indexes, key2) {
         temp_facet['bits_data_temp'][key][key2] = temp_facet['bits_data_temp'][key][key2].new_intersection(conjunctive_index);
-      }
+      });
     });
-  });
+  } // cross all combination indexes with conjunctive index
+
+  /*if (conjunctive_index) {
+    _.mapValues(disjunctive_indexes, function(disjunctive_index, disjunctive_key) {
+      disjunctive_indexes[disjunctive_key] = conjunctive_index.new_intersection(disjunctive_indexes[disjunctive_key]);
+    });
+  }*/
+
   /**
    * process only negative filters
    */
@@ -2916,12 +2923,6 @@ var matrix = function matrix(facets, filters) {
     });
   });
 
-  _.mapValues(temp_facet['bits_data_temp'], function (values, key) {
-    _.mapValues(temp_facet['bits_data_temp'][key], function (facet_indexes, key2) {
-      temp_facet['data'][key][key2] = temp_facet['bits_data_temp'][key][key2].array();
-    });
-  });
-
   return temp_facet;
 };
 

dist/itemsjs.min.js

@@ -1,6 +1,6 @@
 {
   "name": "itemsjs",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "Created to perform fast search on small json dataset (up to 1000 elements).",
   "main": "lib/index.js",
   "scripts": {

package.json

@@ -86,14 +86,20 @@ const matrix = function(facets, filters) {
 
 
   // cross all facets with conjunctive index
-  _.mapValues(temp_facet['bits_data_temp'], function(values, key) {
-    _.mapValues(temp_facet['bits_data_temp'][key], function(facet_indexes, key2) {
-
-      if (conjunctive_index) {
+  if (conjunctive_index) {
+    _.mapValues(temp_facet['bits_data_temp'], function(values, key) {
+      _.mapValues(temp_facet['bits_data_temp'][key], function(facet_indexes, key2) {
         temp_facet['bits_data_temp'][key][key2] = temp_facet['bits_data_temp'][key][key2].new_intersection(conjunctive_index);
-      }
+      });
     });
-  });
+  }
+
+  // cross all combination indexes with conjunctive index
+  /*if (conjunctive_index) {
+    _.mapValues(disjunctive_indexes, function(disjunctive_index, disjunctive_key) {
+      disjunctive_indexes[disjunctive_key] = conjunctive_index.new_intersection(disjunctive_indexes[disjunctive_key]);
+    });
+  }*/
 
   /**
    * process only negative filters
@@ -128,12 +134,6 @@ const matrix = function(facets, filters) {
     });
   });
 
-  _.mapValues(temp_facet['bits_data_temp'], function(values, key) {
-    _.mapValues(temp_facet['bits_data_temp'][key], function(facet_indexes, key2) {
-      temp_facet['data'][key][key2] = temp_facet['bits_data_temp'][key][key2].array();
-    });
-  });
-
   return temp_facet;
 };