transforms: fix logic for outside intervals

- add a missing test cases for semi-open intervals
- replace verb 'filter' by 'keep' in operation description

Author: etpinard

src/transforms/filter.js

@@ -43,26 +43,26 @@ exports.attributes = {
         description: [
             'Sets the filter operation.',
 
-            '*=* filters items equal to `value`',
+            '*=* keeps items equal to `value`',
 
-            '*<* filters items less than `value`',
-            '*<=* filters items less than or equal to `value`',
+            '*<* keeps items less than `value`',
+            '*<=* keeps items less than or equal to `value`',
 
-            '*>* filters items greater than `value`',
-            '*>=* filters items greater than or equal to `value`',
+            '*>* keeps items greater than `value`',
+            '*>=* keeps items greater than or equal to `value`',
 
-            '*[]* filters items inside `value[0]` to value[1]` including both bounds`',
-            '*()* filters items inside `value[0]` to value[1]` excluding both bounds`',
-            '*[)* filters items inside `value[0]` to value[1]` including `value[0]` but excluding `value[1]',
-            '*(]* filters items inside `value[0]` to value[1]` excluding `value[0]` but including `value[1]',
+            '*[]* keeps items inside `value[0]` to value[1]` including both bounds`',
+            '*()* keeps items inside `value[0]` to value[1]` excluding both bounds`',
+            '*[)* keeps items inside `value[0]` to value[1]` including `value[0]` but excluding `value[1]',
+            '*(]* keeps items inside `value[0]` to value[1]` excluding `value[0]` but including `value[1]',
 
-            '*][* filters items outside `value[0]` to value[1]` and not equal to both bounds`',
-            '*)(* filters items outside `value[0]` to value[1]`',
-            '*](* filters items outside `value[0]` to value[1]` and not equal to `value[0]`',
-            '*)[* filters items outside `value[0]` to value[1]` and not equal to `value[1]`',
+            '*][* keeps items outside `value[0]` to value[1]` and equal to both bounds`',
+            '*)(* keeps items outside `value[0]` to value[1]`',
+            '*](* keeps items outside `value[0]` to value[1]` and equal to `value[0]`',
+            '*)[* keeps items outside `value[0]` to value[1]` and equal to `value[1]`',
 
-            '*{}* filters items present in a set of values',
-            '*}{* filters items not present in a set of values'
+            '*{}* keeps items present in a set of values',
+            '*}{* keeps items not present in a set of values'
         ].join(' ')
     },
     value: {
@@ -237,25 +237,25 @@ function getFilterFunc(opts, d2c) {
         case '][':
             return function(v) {
                 var cv = d2c(v);
-                return cv < coercedValue[0] || cv > coercedValue[1];
+                return cv <= coercedValue[0] || cv >= coercedValue[1];
             };
 
         case ')(':
             return function(v) {
                 var cv = d2c(v);
-                return cv <= coercedValue[0] || cv >= coercedValue[1];
+                return cv < coercedValue[0] || cv > coercedValue[1];
             };
 
         case '](':
             return function(v) {
                 var cv = d2c(v);
-                return cv < coercedValue[0] || cv >= coercedValue[1];
+                return cv <= coercedValue[0] || cv > coercedValue[1];
             };
 
         case ')[':
             return function(v) {
                 var cv = d2c(v);
-                return cv <= coercedValue[0] || cv > coercedValue[1];
+                return cv < coercedValue[0] || cv >= coercedValue[1];
             };
 
         case '{}':

test/jasmine/tests/transform_filter_test.js

@@ -173,18 +173,53 @@ describe('filter transforms calc:', function() {
                 }]
             })]);
 
-            _assert(
-                out,
+            _assert(out,
                 [-1, 0, 1],
                 [2, 1, 2],
                 [0.2, 0.1, 0.2]
             );
         });
 
+        it('+ *within* + with RHS open', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    operation: '[)',
+                    value: [-1, 1],
+                    filtersrc: 'x'
+                }]
+            })]);
+
+            _assert(out, [-1, 0], [2, 1], [0.2, 0.1]);
+        });
+
+        it('+ *within* + with LHS open', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    operation: '(]',
+                    value: [-1, 1],
+                    filtersrc: 'x'
+                }]
+            })]);
+
+            _assert(out, [0, 1], [1, 2], [0.1, 0.2]);
+        });
+
+        it('+ *within* + with both sides open', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    operation: '()',
+                    value: [-1, 1],
+                    filtersrc: 'x'
+                }]
+            })]);
+
+            _assert(out, [0], [1], [0.1]);
+        });
+
         it('+ *notwithin*', function() {
             var out = _transform([Lib.extendDeep({}, _base, {
                 transforms: [{
-                    operation: '][',
+                    operation: ')(',
                     value: [-1, 1],
                     filtersrc: 'x'
                 }]
@@ -197,6 +232,54 @@ describe('filter transforms calc:', function() {
             );
         });
 
+        it('+ *notwithin* with RHS closed', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    operation: ')[',
+                    value: [-1, 1],
+                    filtersrc: 'x'
+                }]
+            })]);
+
+            _assert(out,
+                [-2, -2, 1, 2, 3],
+                [1, 3, 2, 3, 1],
+                [0.1, 0.3, 0.2, 0.3, 0.4]
+            );
+        });
+
+        it('+ *notwithin* with LHS closed', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    operation: '](',
+                    value: [-1, 1],
+                    filtersrc: 'x'
+                }]
+            })]);
+
+            _assert(out,
+                [-2, -1, -2, 2, 3],
+                [1, 2, 3, 3, 1],
+                [0.1, 0.2, 0.3, 0.3, 0.4]
+            );
+        });
+
+        it('+ *notwithin* with both sides closed', function() {
+            var out = _transform([Lib.extendDeep({}, _base, {
+                transforms: [{
+                    operation: '][',
+                    value: [-1, 1],
+                    filtersrc: 'x'
+                }]
+            })]);
+
+            _assert(out,
+                [-2, -1, -2, 1, 2, 3],
+                [1, 2, 3, 2, 3, 1],
+                [0.1, 0.2, 0.3, 0.2, 0.3, 0.4]
+            );
+        });
+
         it('+ *in*', function() {
             var out = _transform([Lib.extendDeep({}, _base, {
                 transforms: [{
@@ -279,7 +362,7 @@ describe('filter transforms calc:', function() {
         it('+ *notwithin*', function() {
             var out = _transform([Lib.extendDeep({}, _base, {
                 transforms: [{
-                    operation: '][',
+                    operation: ')(',
                     value: ['a', 'c'],
                     filtersrc: 'x'
                 }]
@@ -389,7 +472,7 @@ describe('filter transforms calc:', function() {
         it('+ *notwithin*', function() {
             var out = _transform([Lib.extendDeep({}, _base, {
                 transforms: [{
-                    operation: '][',
+                    operation: ')(',
                     value: ['2016-08-01', '2016-10-01'],
                     filtersrc: 'x'
                 }]