predicate 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f717f6bf0c4cddf18b0a7762f6a85dd47200ec21c274fb974755319862420f1
-  data.tar.gz: 48ce7004023d6121f650ab05d9893c2d25ff3a60324450b773ec4629e643b752
+  metadata.gz: db81e00071c6190ac6692ccd9a3b5cd384ba7c0ee9a636d4b4b75c841a84f628
+  data.tar.gz: dbcf66021eee203a6f943f2ca5ca02a101a9306aa8ee4b1ffaeb3131d0d0c524
 SHA512:
-  metadata.gz: eb29761546c30faca593aa4dd5749367fce9e3a3d85404a49d32db310c73471a9008b01f046828070583cb043f3142e1e10688be06a2a5dca4d318c144b1f33a
-  data.tar.gz: d8852634d7c9d33199544fa2ee0ef70f92198b379d6f7e6ed670d40266e8799e7ff7d804551cb1bcaf19c4b6390715217e665e8a03b4c50a5213be10c3e3c626
+  metadata.gz: cfef5e3953b9b9416be3a72305b0a33ebf063548735bd7a477f1f41aadac0936ef4cfc477092c5de4946e0df77b53706d306579f17aacfd91a7a6b97371f0ece
+  data.tar.gz: 664b4ee4aba8a4e354b70021944fdf76796a8aee3558616d7f58472e0f11a607b4ae23694d15a44af203f56e960c06d22a04393db24eb5c92d25452be7b8585d

data/lib/predicate/nodes/dyadic_comp.rb

@@ -22,5 +22,9 @@ class Predicate
       @free_variables ||= left.free_variables | right.free_variables
     end
 
+    def var_against_literal?
+      left.identifier? && right.literal?
+    end
+
   end
 end

data/lib/predicate/nodes/eq.rb

@@ -13,9 +13,14 @@ class Predicate
         return self if constants == other.constants
         return contradiction
       when In
-        return self if other.right.literal?
+        return super unless var_against_literal? && other.var_against_literal?
+        mine = self.right.value
+        hers = other.right.value
+        return self if hers.include?(mine)
+        contradiction
+      else
+        super
       end
-      super
     rescue NotSupportedError
       super
     end

data/lib/predicate/nodes/in.rb

@@ -16,23 +16,27 @@ class Predicate
     end
 
     def &(other)
-      # we only optimize with another In
-      return super unless other.is_a?(In)
+      case other
+      when Eq
+        other & self
+      when In
+        # we only optimize is same free variables
+        fv = free_variables
+        return super unless fv.size == 1 && fv == other.free_variables
 
-      # we only optimize is same free variables
-      fv = free_variables
-      return super unless fv.size == 1 && fv == other.free_variables
+        # we only optimize if both right terms are literals
+        return super unless right.literal? and other.right.literal?
 
-      # we only optimize if both right terms are literals
-      return super unless right.literal? and other.right.literal?
-
-      intersection = right.value & other.right.value
-      if intersection.empty?
-        Factory.contradiction
-      elsif intersection.size == 1
-        Factory.eq(fv.first, [:literal, intersection.first])
+        intersection = right.value & other.right.value
+        if intersection.empty?
+          Factory.contradiction
+        elsif intersection.size == 1
+          Factory.eq(fv.first, [:literal, intersection.first])
+        else
+          Factory.in(fv.first, intersection)
+        end
       else
-        Factory.in(fv.first, intersection)
+        super
       end
     end
 
@@ -65,5 +69,9 @@ class Predicate
       values.include?(identifier.evaluate(tuple))
     end
 
+    def var_against_literal?
+      left.identifier? && right.literal?
+    end
+
   end
 end

data/lib/predicate/version.rb

@@ -2,7 +2,7 @@ class Predicate
   module Version
     MAJOR = 2
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/nodes/eq/test_and.rb

@@ -15,7 +15,7 @@ class Predicate
     end
 
     context 'with an IN on same variable and literal' do
-      let(:right){ Factory.in(:x, [3,4]) }
+      let(:right){ Factory.in(:x, [2,4]) }
 
       it{ should be(left) }
     end
@@ -27,4 +27,4 @@ class Predicate
     end
 
   end
-end
+end

data/spec/nodes/in/test_and.rb

@@ -9,11 +9,17 @@ class Predicate
     subject{ left & right }
 
     context 'with an eq on same variable' do
-      let(:right){ Factory.eq(:x, 3) }
+      let(:right){ Factory.eq(:x, 2) }
 
       it{ should be(right) }
     end
 
+    context 'with an eq on same variable yielding a contradiction' do
+      let(:right){ Factory.eq(:x, 3) }
+
+      it{ should eql(Factory.contradiction) }
+    end
+
     context 'with an in on same variable' do
       let(:right){ Factory.in(:x, [2, 4, 5]) }
 
@@ -21,6 +27,12 @@ class Predicate
     end
 
     context 'with an in on same variable, leading to a singleton' do
+      let(:right){ Factory.in(:x, [2]) }
+
+      it{ should eql(Factory.eq(:x, 2)) }
+    end
+
+    context 'with an eq on same variable, leading to a singleton' do
       let(:right){ Factory.in(:x, [2, 5]) }
 
       it{ should eql(Factory.eq(:x, 2)) }

data/spec/predicate/test_constants.rb

@@ -84,11 +84,17 @@ class Predicate
     end
 
     context "on and (one eq, one in, same variable)" do
-      let(:pred){ p.in(:x, [4,8]) & p.eq(:x, 2) }
+      let(:pred){ p.in(:x, [2,8]) & p.eq(:x, 2) }
 
       it{ should eq({x: 2}) }
     end
 
+    context "on and (one eq, one in, yielding contradiction)" do
+      let(:pred){ p.in(:x, [3,8]) & p.eq(:x, 2) }
+
+      it{ should eq({}) }
+    end
+
     context "on and (contradiction)" do
       let(:pred){ p.eq(:x, 2) & p.eq(:x, 4) }
 

data/spec/test_predicate.rb

@@ -117,6 +117,12 @@ describe "Predicate.and" do
   subject{ Predicate.and(Predicate.eq(:x, 12), Predicate.eq(:y, 12)) }
 
   it_should_behave_like "a predicate"
+
+  it 'detects contraditions' do
+    p1 = Predicate.in(:a, [10,11])
+    p2 = Predicate.eq(:a, 7)
+    expect(p1 & p2).to eq(Predicate.contradiction)
+  end
 end
 
 describe "Predicate.or" do
@@ -130,4 +136,3 @@ describe "Predicate.not" do
 
   it_should_behave_like "a predicate"
 end
-  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexpr