bmg 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed20ed6694b6def37acde708b49e546e93057fba
-  data.tar.gz: 11112aa3a19301a61ab63f33d3d8e336f35fb770
+  metadata.gz: 4972b019d398ba2be5f7cb73765f120849e0365e
+  data.tar.gz: 153fbe99bc8947f23919686afe475d955674d8e5
 SHA512:
-  metadata.gz: 027be153336eea476e1a6958f8114e234c399627a416f76e17e96dcce519191ba01ac183132d728b80d39733d84806a4bda1fcae1a5a0486ea509bd7f02c5fe9
-  data.tar.gz: cfc2a227c20a55746da3dade630ded932ba037b7105513b01992939329fcc8bf927a172fb5a3043ed428c01c4f8273df1a21340dd000bc8feb66e1788a32153b
+  metadata.gz: e39d912e26e824d715375c90420a182a6b35de4cadd5d7afb668fe3c761ac19f3bd9384b2843c935b21184fce7ce524a874783298778b43b2360333e2ab47471
+  data.tar.gz: 6d738735211d6d22e60fce0210bc188d5abf37304e3c7f1311a27b7051fe05919cb691c00c771eeb4fa6b5566ebe9cf5498e2d0c018d39a0dce205cd44a07870

data/lib/bmg/algebra.rb

@@ -7,7 +7,9 @@ module Bmg
       :autosummarize,
       :constants,
       :extend,
+      :group,
       :image,
+      :matching,
       :project,
       :rename,
       :restrict,
@@ -59,6 +61,15 @@ module Bmg
     end
     protected :_extend
 
+    def group(attrs, as = :group, options = {})
+      _group self.type.group(attrs, as), attrs, as, options
+    end
+
+    def _group(type, attrs, as, options)
+      Operator::Group.new(type, self, attrs, as, options)
+    end
+    protected :_group
+
     def image(right, as = :image, on = [], options = {})
       _image self.type.image(right, as, on, options), right, as, on, options
     end

data/lib/bmg/operator.rb

@@ -70,9 +70,10 @@ require_relative 'operator/autosummarize'
 require_relative 'operator/autowrap'
 require_relative 'operator/constants'
 require_relative 'operator/extend'
+require_relative 'operator/group'
 require_relative 'operator/image'
+require_relative 'operator/matching'
 require_relative 'operator/project'
 require_relative 'operator/rename'
 require_relative 'operator/restrict'
 require_relative 'operator/union'
-require_relative 'operator/matching'

data/lib/bmg/operator/group.rb

@@ -0,0 +1,88 @@
+module Bmg
+  module Operator
+    #
+    # Group operator.
+    #
+    # Groups some operand attributes as a new Relation-valued
+    # attribute
+    #
+    class Group
+      include Operator::Unary
+
+      DEFAULT_OPTIONS = {
+
+        # Whether we need to convert each group as an Array,
+        # instead of keeping a Relation instance
+        array: false
+
+      }
+
+      def initialize(type, operand, attrs, as, options)
+        @type = type
+        @operand = operand
+        @attrs = attrs
+        @as = as
+        @options = DEFAULT_OPTIONS.merge(options)
+      end
+
+    protected
+
+      attr_reader :attrs, :as, :options
+
+    public
+
+      def each(&bl)
+        index = Hash.new{|h,k| h[k] = k.merge(as => empty_group) }
+        operand.each do |tuple|
+          key = TupleAlgebra.allbut(tuple, attrs)
+          sub = TupleAlgebra.project(tuple, attrs)
+          index[key][as].operand << sub
+        end
+        if options[:array]
+          index.values.each do |tuple|
+            tuple[as] = tuple[as].to_a
+            yield(tuple)
+          end
+        else
+          index.values.each(&bl)
+        end
+      end
+
+      def to_ast
+        [ :group, operand.to_ast, attrs.dup, as, options.dup ]
+      end
+
+    protected ### optimization
+
+      def _restrict(type, predicate)
+        top, bottom = predicate.and_split([as])
+        if top == predicate
+          super
+        else
+          op = operand
+          op = op.restrict(bottom)
+          op = op.group(attrs, as, options)
+          op = op.restrict(top)
+          op
+        end
+      end
+
+    protected ### inspect
+
+      def args
+        [ attrs, as, options ]
+      end
+
+    private
+
+      def empty_group
+        Relation::InMemory.new(group_type, Set.new)
+      end
+
+      def group_type
+        type.project(attrs)
+      end
+
+    end # class Extend
+  end # module Operator
+end # module Bmg

data/lib/bmg/operator/matching.rb

@@ -1,9 +1,10 @@
 module Bmg
   module Operator
     #
-    # Image operator.
+    # Matching operator.
     #
-    # Extends each tuple with its image in right.
+    # Filters tuples of left operand to those matching at least
+    # one tuple in right operand.
     #
     class Matching
       include Operator::Binary

data/lib/bmg/type.rb

@@ -33,6 +33,10 @@ module Bmg
       ANY
     end
 
+    def group(attrs, as)
+      ANY
+    end
+
     def image(right, as, on, options)
       ANY
     end

data/lib/bmg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -114,6 +114,7 @@ files:
 - lib/bmg/operator/autowrap.rb
 - lib/bmg/operator/constants.rb
 - lib/bmg/operator/extend.rb
+- lib/bmg/operator/group.rb
 - lib/bmg/operator/image.rb
 - lib/bmg/operator/matching.rb
 - lib/bmg/operator/project.rb