predicate 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710a45c31d1350beeded48ea522d3e868925e600
-  data.tar.gz: 8e9acddd67b337218c749aa6744940b26ca8568e
+  metadata.gz: 61fec1238a5307709753d2214ed0bf4b07af3790
+  data.tar.gz: 8ca0232c14c907971c4bc39b10ddbe3629f2f529
 SHA512:
-  metadata.gz: e3d92a4dfa7227cbac8dc6b9dc9e4856861983103e2840ad041721269a66ecce74980750293178b3c3cdc9f34c06aa2d5a396880634f47e84a0b03aaac3a202d
-  data.tar.gz: ff1eee7dcc029585926d897eb5f3da17b68dd6f392f6e2c73bb50208ae00d22aedf0422feccea4cf747d869555b37dfa720407aa73746dd74935cfd52384f8de
+  metadata.gz: a66b05a35406d025a78fa0bc44c1508c3c74906eff4ef2270b8fcc4177aeaf88b9f54ff11d259eaa17aa30bb8b728d00ca08a038efcb98b4e735fecde2ad844e
+  data.tar.gz: 88029e029b342093b92a7925ef0ca7edd618e440fc33d99eaf2f128b4cbf0e344639e62aa2768621507582e24f007faff03727bde874b6b0c729e0519d1638c8

data/lib/predicate/nodes/and.rb

@@ -6,6 +6,15 @@ class Predicate
       :'&&'
     end
 
+    def &(other)
+      case other
+      when Tautology     then self
+      when Contradiction then other
+      when And           then sexpr(dup + other[1..-1])
+      else               dup << other
+      end
+    end
+
     def and_split(attr_list)
       # Say we are X = X1 & X2 & X3
       # We will split each term: X = (X1 & Y1) & (X2 & Y2) & (X3 & Y3)
@@ -34,5 +43,15 @@ class Predicate
       end
     end
 
+    def constants
+      sexpr_body.each_with_object({}) do |op, cs|
+        cs.merge!(op.constants){|k,v1,v2| v1 }
+      end
+    end
+
+    def evaluate(tuple)
+      sexpr_body.all?{|operand| operand.evaluate(tuple) }
+    end
+
   end
 end

data/lib/predicate/nodes/contradiction.rb

@@ -18,6 +18,10 @@ class Predicate
       other
     end
 
+    def dyadic_priority
+      1000
+    end
+
     def priority
       100
     end
@@ -30,5 +34,9 @@ class Predicate
       { nil => self }
     end
 
+    def evaluate(tuple)
+      false
+    end
+
   end
 end

data/lib/predicate/nodes/eq.rb

@@ -6,10 +6,46 @@ class Predicate
       :==
     end
 
+    def &(other)
+      case other
+      when Eq
+        if free_variables == other.free_variables
+          return self if constants == other.constants
+          contradiction
+        else
+          super
+        end
+      when In
+        return self if free_variables == other.free_variables
+        super
+      else
+        super
+      end
+    end
+
     def constant_variables
       fv = free_variables
       fv.size == 1 ? fv : []
     end
 
+    def constants
+      left, right = sexpr(self.left), sexpr(self.right)
+      if left.identifier? && right.literal?
+        { left.name => right.value }
+      elsif right.identifier? && left.literal?
+        { right.name => left.value }
+      else
+        {}
+      end
+    end
+
+    def dyadic_priority
+      900
+    end
+
+    def evaluate(tuple)
+      left.evaluate(tuple) == right.evaluate(tuple)
+    end
+
   end
 end

data/lib/predicate/nodes/expr.rb

@@ -19,13 +19,26 @@ class Predicate
       false
     end
 
+    def literal?
+      sexpr_type == :literal
+    end
+
+    def identifier?
+      sexpr_type == :identifier
+    end
+
     def !
       sexpr([:not, self])
     end
 
+    def dyadic_priority
+      0
+    end
+
     def &(other)
       return other if other.contradiction?
       return self  if other.tautology?
+      return other & self if other.dyadic_priority > self.dyadic_priority
       sexpr([:and, self, other])
     end
 
@@ -64,6 +77,10 @@ class Predicate
       []
     end
 
+    def constants
+      {}
+    end
+
     def to_ruby_code(scope = 't')
       code = ToRubyCode.call(self, scope: scope)
       "->(t){ #{code} }"

data/lib/predicate/nodes/gt.rb

@@ -6,5 +6,9 @@ class Predicate
       :>
     end
 
+    def evaluate(tuple)
+      left.evaluate(tuple) > right.evaluate(tuple)
+    end
+
   end
 end

data/lib/predicate/nodes/gte.rb

@@ -6,5 +6,9 @@ class Predicate
       :>=
     end
 
+    def evaluate(tuple)
+      left.evaluate(tuple) >= right.evaluate(tuple)
+    end
+
   end
 end

data/lib/predicate/nodes/identifier.rb

@@ -14,5 +14,9 @@ class Predicate
       @free_variables ||= [ name ]
     end
 
+    def evaluate(tuple)
+      tuple[name]
+    end
+
   end
 end

data/lib/predicate/nodes/in.rb

@@ -14,6 +14,27 @@ class Predicate
       self[2]
     end
 
+    def &(other)
+      case other
+      when In
+        fv = free_variables
+        if fv.size == 1 && fv == other.free_variables
+          intersection = values & other.values
+          if intersection.empty?
+            Factory.contradiction
+          elsif intersection.size == 1
+            Factory.eq(fv.first, [:literal, intersection.first])
+          else
+            Factory.in(fv.first, intersection)
+          end
+        else
+          super
+        end
+      else
+        super
+      end
+    end
+
     def free_variables
       @free_variables ||= identifier.free_variables
     end
@@ -22,5 +43,17 @@ class Predicate
       values.size == 1 ? free_variables : []
     end
 
+    def constants
+      values.size == 1 ? { identifier.name => values.first } : {}
+    end
+
+    def dyadic_priority
+      800
+    end
+
+    def evaluate(tuple)
+      values.include?(left.evaluate(tuple))
+    end
+
   end
 end

data/lib/predicate/nodes/intersect.rb

@@ -22,5 +22,10 @@ class Predicate
       values.size == 1 ? free_variables : []
     end
 
+    def evaluate(tuple)
+      t_x = left.evaluate(tuple)
+      t_x && !(tx & right.evaluate(tuple)).empty?
+    end
+
   end
 end

data/lib/predicate/nodes/literal.rb

@@ -14,5 +14,9 @@ class Predicate
       last
     end
 
+    def evaluate(tuple)
+      value
+    end
+
   end
 end

data/lib/predicate/nodes/lt.rb

@@ -6,5 +6,9 @@ class Predicate
       :<
     end
 
+    def evaluate(tuple)
+      left.evaluate(tuple) < right.evaluate(tuple)
+    end
+
   end
 end

data/lib/predicate/nodes/lte.rb

@@ -6,5 +6,9 @@ class Predicate
       :<=
     end
 
+    def evaluate(tuple)
+      left.evaluate(tuple) <= right.evaluate(tuple)
+    end
+
   end
 end

data/lib/predicate/nodes/native.rb

@@ -36,6 +36,10 @@ class Predicate
       proc
     end
 
+    def evaluate(tuple)
+      proc.call(tuple)
+    end
+
     def free_variables
       raise NotSupportedError
     end

data/lib/predicate/nodes/neq.rb

@@ -6,5 +6,9 @@ class Predicate
       :'!='
     end
 
+    def evaluate(tuple)
+      left.evaluate(tuple) != right.evaluate(tuple)
+    end
+
   end
 end

data/lib/predicate/nodes/not.rb

@@ -18,5 +18,9 @@ class Predicate
       @free_variables ||= last.free_variables
     end
 
+    def evaluate(tuple)
+      !last.evaluate(tuple)
+    end
+
   end
 end

data/lib/predicate/nodes/or.rb

@@ -6,5 +6,9 @@ class Predicate
       :'||'
     end
 
+    def evaluate(tuple)
+      sexpr_body.any?{|op| op.evaluate(tuple) }
+    end
+
   end
 end

data/lib/predicate/nodes/qualified_identifier.rb

@@ -18,5 +18,9 @@ class Predicate
       @free_variables ||= [ name ]
     end
 
+    def evaluate(tuple)
+      tuple[name]
+    end
+
   end
 end

data/lib/predicate/nodes/tautology.rb

@@ -18,6 +18,10 @@ class Predicate
       self
     end
 
+    def dyadic_priority
+      1000
+    end
+
     def priority
       100
     end
@@ -30,5 +34,9 @@ class Predicate
       {}
     end
 
+    def evaluate(tuple)
+      true
+    end
+
   end
 end

data/lib/predicate/processors/to_ruby_code.rb

@@ -50,7 +50,8 @@ class Predicate
     end
 
     def on_intersect(sexpr)
-      "!(#{apply(sexpr.identifier)} & #{to_ruby_literal(sexpr.values)}).empty?"
+      t_x = apply(sexpr.identifier)
+      "!#{t_x}.nil? && !(#{t_x} & #{to_ruby_literal(sexpr.values)}).empty?"
     end
 
     def on_literal(sexpr)

data/lib/predicate/version.rb

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

data/lib/predicate.rb

@@ -60,6 +60,10 @@ class Predicate
     expr.constant_variables
   end
 
+  def constants
+    expr.constants
+  end
+
   def &(other)
     return self  if other.tautology? or other==self
     return other if tautology?
@@ -85,7 +89,7 @@ class Predicate
   end
 
   def evaluate(tuple)
-    to_proc.call(tuple)
+    expr.evaluate(tuple)
   end
 
   # Splits this predicate, say P, as too predicates P1 & P2

data/spec/nodes/and/test_and.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+class Predicate
+  describe And, "&" do
+
+    let(:left){
+      Factory.eq(:x, 2) & Factory.eq(:y, 3)
+    }
+
+    subject{ left & right }
+
+    context 'with another predicate' do
+      let(:right) {
+        Factory.eq(:z, 4)
+      }
+
+      it 'collects it' do
+        expect(subject).to be_a(And)
+        expect(subject.size).to eql(4)
+      end
+
+      it 'is as expected' do
+        expect(subject.to_ruby_code).to eql("->(t){ (t[:x] == 2) && (t[:y] == 3) && (t[:z] == 4) }")
+      end
+    end
+
+    context 'with another and' do
+      let(:right) {
+        Factory.eq(:w, 5) & Factory.eq(:z, 4)
+      }
+
+      it 'collects it' do
+        expect(subject).to be_a(And)
+        expect(subject.size).to eql(5)
+      end
+
+      it 'is as expected' do
+        expect(subject.to_ruby_code).to eql("->(t){ (t[:x] == 2) && (t[:y] == 3) && (t[:w] == 5) && (t[:z] == 4) }")
+      end
+    end
+
+  end
+end

data/spec/nodes/eq/test_and.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+class Predicate
+  describe Eq, "&" do
+
+    let(:left){
+      Factory.eq(:x, 2)
+    }
+
+    subject{ left & right }
+
+    context 'with an eq leading to a contradiction' do
+      let(:right){ Factory.eq(:x, 3) }
+
+      it{ should be_a(Contradiction) }
+    end
+
+  end
+end

data/spec/nodes/in/test_and.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+class Predicate
+  describe In, "&" do
+
+    let(:left){
+      Factory.in(:x, [2, 4, 8])
+    }
+
+    subject{ left & right }
+
+    context 'with an eq on same variable' do
+      let(:right){ Factory.eq(:x, 3) }
+
+      it{ should be(right) }
+    end
+
+    context 'with an in on same variable' do
+      let(:right){ Factory.in(:x, [2, 4, 5]) }
+
+      it{ should eql(Factory.in(:x, [2, 4])) }
+    end
+
+    context 'with an in on same variable, leading to a singleton' do
+      let(:right){ Factory.in(:x, [2, 5]) }
+
+      it{ should eql(Factory.eq(:x, 2)) }
+    end
+
+    context 'with an in on same variable, leading to a empty set' do
+      let(:right){ Factory.in(:x, [5]) }
+
+      it{ should eql(Factory.contradiction) }
+    end
+
+  end
+end

data/spec/predicate/test_bool_and.rb

@@ -30,5 +30,21 @@ class Predicate
       end
     end
 
+    context 'with tautology' do
+      let(:right){ Predicate.tautology }
+
+      it 'returns self' do
+        expect(subject).to eql(left)
+      end
+    end
+
+    context 'with contradiction' do
+      let(:right){ Predicate.contradiction }
+
+      it 'returns contradiction' do
+        expect(subject).to eql(right)
+      end
+    end
+
   end
 end

data/spec/predicate/test_constants.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "constants" do
+
+    let(:p){ Predicate }
+    subject{ pred.constants }
+
+    context "on tautology" do
+      let(:pred){ p.tautology }
+
+      it{ should eq({}) }
+    end
+
+    context "on contradiction" do
+      let(:pred){ p.contradiction }
+
+      it{ should eq({}) }
+    end
+
+    context "on eq(identifier,value)" do
+      let(:pred){ p.eq(:x, 2) }
+
+      it{ should eq({x: 2}) }
+    end
+
+    context "on eq(value,identifier)" do
+      let(:pred){ p.eq(2, :x) }
+
+      it{ should eq({x: 2}) }
+    end
+
+    context "on eq(identifier,identifier)" do
+      let(:pred){ p.eq(:x, :y) }
+
+      it{ should eq({}) }
+    end
+
+    context "on not" do
+      let(:pred){ !p.eq(:x, 2) }
+
+      it{ should eq({}) }
+    end
+
+    context "on neq" do
+      let(:pred){ p.neq(:x, 2) }
+
+      it{ should eq({}) }
+    end
+
+    context "on gt" do
+      let(:pred){ p.gt(:x, 2) }
+
+      it{ should eq({}) }
+    end
+
+    context "on in (singleton)" do
+      let(:pred){ p.in(:x, [2]) }
+
+      it{ should eq({x: 2}) }
+    end
+
+    context "on in (multiples)" do
+      let(:pred){ p.in(:x, [2, 3]) }
+
+      it{ should eq({}) }
+    end
+
+    context "on and (two eqs)" do
+      let(:pred){ p.eq(:x, 2) & p.eq(:y, 4) }
+
+      it{ should eq({x: 2, y: 4}) }
+    end
+
+    context "on and (one eq)" do
+      let(:pred){ p.eq(:x, 2) & p.in(:y, [4,8]) }
+
+      it{ should eq({x: 2}) }
+    end
+
+    context "on and (one eq, one in, same variable)" do
+      let(:pred){ p.in(:x, [4,8]) & p.eq(:x, 2) }
+
+      it{ should eq({x: 2}) }
+    end
+
+    context "on and (contradiction)" do
+      let(:pred){ p.eq(:x, 2) & p.eq(:x, 4) }
+
+      it{ should eq({}) }
+    end
+
+    context "on intersect" do
+      let(:pred){ p.intersect(:x, [4,8]) }
+
+      it{ should eq({}) }
+    end
+
+    context "on or (two eqs)" do
+      let(:pred){ p.eq(:x, 2) | p.eq(:y, 4) }
+
+      it{ should eq({}) }
+    end
+
+    context "on native" do
+      let(:pred){ p.native(->(t){}) }
+
+      it{ should eq({}) }
+    end
+
+  end
+end

data/spec/predicate/test_factory_methods.rb

@@ -76,7 +76,7 @@ class Predicate
     context 'intersect' do
       subject{ Predicate.intersect(:x, [7,8]) }
 
-      specify{ subject.to_ruby_code.should eq("->(t){ !(t[:x] & [7, 8]).empty? }") }
+      specify{ subject.to_ruby_code.should eq("->(t){ !t[:x].nil? && !(t[:x] & [7, 8]).empty? }") }
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -148,12 +148,15 @@ files:
 - spec/factory/test_tautology.rb
 - spec/grammar/test_match.rb
 - spec/grammar/test_sexpr.rb
+- spec/nodes/and/test_and.rb
 - spec/nodes/and/test_and_split.rb
 - spec/nodes/and/test_attr_split.rb
 - spec/nodes/dyadic_comp/test_and_split.rb
+- spec/nodes/eq/test_and.rb
 - spec/nodes/identifier/test_and_split.rb
 - spec/nodes/identifier/test_free_variables.rb
 - spec/nodes/identifier/test_name.rb
+- spec/nodes/in/test_and.rb
 - spec/nodes/nadic_bool/test_free_variables.rb
 - spec/nodes/or/test_and_split.rb
 - spec/nodes/qualified_identifier/test_and_split.rb
@@ -167,6 +170,7 @@ files:
 - spec/predicate/test_bool_or.rb
 - spec/predicate/test_coerce.rb
 - spec/predicate/test_constant_variables.rb
+- spec/predicate/test_constants.rb
 - spec/predicate/test_contradiction.rb
 - spec/predicate/test_evaluate.rb
 - spec/predicate/test_factory_methods.rb