factbase 0.15.2 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85e37453d7e238f20d15017e452fc39e2068cf86bc1c0bc0c5689439bf732c81
-  data.tar.gz: dc91da500dd5e512e041de74ad677dbf98ce24a84cb1972bc910884ddb3c48f3
+  metadata.gz: 60e6653254c72f386c6b5654e3d13ab0d88c3107cbcf88553832515e969c850e
+  data.tar.gz: eaeff76eef8504359dc2841d29fed6d7f1b31da34d7fc349a3f3369e8f5d7548
 SHA512:
-  metadata.gz: 323d7a269d425e503365cd694cdafb224ee9bab256992d740af40c4151245d729cd183aba297f6bc963984d8e3d743ffe6e6099e6fbf3b0514a7994876d00533
-  data.tar.gz: 2ede879be19ca0faf61506cdfb9672117f767d66528c8fa5aa52237180848a011202eef6c3982b102e1b56430ebf9777b94fdfaf9b76e96738b25d45d1a549a3
+  metadata.gz: 6036b63bbf2a719329d0a81379257b5a048aa720b819801500fbef660c83599f95a5106a649ff8d05ff3babc7a89416de9a575d81f43ee4df64afd132e78bb6d
+  data.tar.gz: d0df44073dcf267f734b137a7a2d6f5ac824497d9635b829d280a8343072185f5b981be78bedddf68f37ba466d9fe8a6d7a233f261634c89c07208a16e9ddb8e

data/lib/factbase/indexed/indexed_term.rb

@@ -153,7 +153,7 @@ module Factbase::IndexedTerm
           end
           if r.nil?
             r = n
-          else
+          elsif n.size < r.size * 5 # to skip some obvious matchings
             r &= n.to_a
           end
           break if r.empty?

data/lib/factbase/term.rb

@@ -121,7 +121,7 @@ class Factbase::Term
   rescue NoMethodError => e
     raise "Probably the term '#{@op}' is not defined at #{self}: #{e.message}"
   rescue StandardError => e
-    raise "#{e.message} at #{self}"
+    raise "#{e.message.inspect} at #{self} at #{e.backtrace[0]}"
   end
 
   # Simplify it if possible.

data/lib/factbase/terms/ordering.rb

@@ -20,24 +20,35 @@ module Factbase::Ordering
   end
 
   def unique(fact, maps, fb)
-    @uniques = {} if @uniques.nil?
+    @seen = Set.new if @seen.nil?
     raise "Too few operands for 'unique' (at least 1 expected)" if @operands.empty?
-    dups = 0
-    @operands.each_with_index do |_, i|
-      @uniques[i] = [] if @uniques[i].nil?
-      vv = _values(i, fact, maps, fb)
-      return false if vv.nil?
-      vv = [vv] unless vv.respond_to?(:to_a)
-      exists = false
-      vv.each do |v|
-        if @uniques[i].include?(v)
-          exists = true
-        else
-          @uniques[i] << v
-        end
-      end
-      dups += 1 if exists
+    vv = (0..(@operands.size - 1)).map { |i| _values(i, fact, maps, fb) }
+    return false if vv.any?(nil)
+    pass = true
+    _cartesian(vv).each do |t|
+      pass = false if @seen.include?(t)
+      @seen << t
+    end
+    pass
+  end
+
+  private
+
+  # Multiplies arrays and returns a list of all possible combinations
+  # of their elements. If this array is provided:
+  #
+  #  [ [4, 3], [2, 88, 13] ]
+  #
+  # This will be the result:
+  #
+  # [ [4, 2], [4, 88], [4, 13], [3, 2], [3, 88], [3, 13]]
+  def _cartesian(vv)
+    ff = vv.first.zip
+    if vv.one?
+      ff
+    else
+      tail = _cartesian(vv[1..])
+      ff.map { |f| tail.map { |t| f + t } }
     end
-    dups < @operands.size
   end
 end

data/lib/factbase/version.rb

@@ -9,5 +9,5 @@
 # License:: MIT
 class Factbase
   # Current version of the gem (changed by .rultor.yml on every release)
-  VERSION = '0.15.2' unless const_defined?(:VERSION)
+  VERSION = '0.15.4' unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factbase
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.4
 platform: ruby
 authors:
 - Yegor Bugayenko