Merge pull request #810 from null-a/disallow-empty-batches

Don't allow empty batches, except when data is empty.
probmods · Apr 4, 2017 · afeae3e · afeae3e
2 parents 505c710 + 24ccf25
commit afeae3e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/inference/elbo.ad.js b/src/inference/elbo.ad.js
@@ -307,7 +307,12 @@ module.exports = function(env) {
     mapDataFetch: function(data, opts, address) {
 
       var batchSize = opts.batchSize !== undefined ? opts.batchSize : data.length;
-      if (batchSize < 0 || batchSize > data.length) {
+      var minBatchSize = _.isEmpty(data) ? 0 : 1;
+      var maxBatchSize = data.length;
+
+      if (!(util.isInteger(batchSize) &&
+            minBatchSize <= batchSize &&
+            batchSize <= maxBatchSize)) {
         throw new Error('ELBO: Invalid batchSize.');
       }