fds 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7197a33674f63af8e1198fd11e98bb245166eeff
-  data.tar.gz: 6443d278baeb5fa132bd34f1e75c09e74818b312
+  metadata.gz: 754d8788b1b59154ab908e35ef3c4c8c449c10a7
+  data.tar.gz: f3be19ef9cc46fb2abb89ff25650f3032a95d885
 SHA512:
-  metadata.gz: 38d024bfabb21720ec9a64dcb4c0562b1999f0757d245ee04a1ed24344f1b0a640b01b90d0b226241c9f7f140ac9130295556cec2deef19f212df45e707eabc3
-  data.tar.gz: 67660c36874db7a0f4f7e012bd3343c4070ef3bba5496a0e4825089396ac7617ce273e8de7e79feaea7087d82f024444dcaf7aec48479bb4801e471b676e931f
+  metadata.gz: d6f3ffee9b435e745c78a2d96acaae03e1a4b8fdd1a99844ebbc795d39c48c528380f1577efe9e3687c56830616aa226fc5449cf7c9ad329892fe5dd7e5f3d45
+  data.tar.gz: 86ff877b9a3f381423f888b2a8f8b648f076552ed0c8db54f25c10029ac4ed46c10040d8024a1cbd78c7f875cb5f358d7d6c6e1f8fc9d56e8f20af2db536068d

data/lib/fds/unordered_set.rb

@@ -1,22 +1,114 @@
 class FDS::UnorderedSet
   def initialize
-    @data = Hash.new { |h, e| h[e] = h.size }
+    @index = 0
+    @data = Hash.new do |h, e|
+      h[e] = @index
+      @index += 1
+    end
   end
 
-  def add(e); @data[e]; self; end
-  def find_index(e); @data[e] if @data.has_key?(e); end
-  def remove(e); @data[e] = nil; end
-  def size; @data.size; end
+  def add(e)
+    @data[e]
+    self
+  end
 
-  [:to_s, :first, :last, :to_a].each do |function|
-    define_method function do
-      @data.keys.send(function)
+  def find_index(e)
+    # @data.has_key? is needed otherwise @data will create a new element,
+    # see @data definition in #initialize.
+    @data[e] if @data.has_key?(e)
+  end
+
+  def delete(e)
+    @data.delete(e)
+    self
+  end
+
+  def size
+    @data.size
+  end
+
+  def each
+    @data.each_key(&proc)
+  end
+
+  def include?(e)
+    find_index(e) != nil
+  end
+
+  def delete_if
+    @data.delete_if { |k, _| yield k }
+    self
+  end
+
+  def keep_if
+    @data.keep_if { |k, _| yield k }
+    self
+  end
+
+  def |(other)
+    if self.size > other.size
+      result = self.dup
+      smaller_set = other
+    else
+      result = other.dup
+      smaller_set = self
+    end
+
+    smaller_set.each do |e|
+      result << e
     end
+
+    result
+  end
+
+  def &(other)
+    if self.size < other.size
+      result = self.dup
+      bigger_set = other
+    else
+      result = other.dup
+      bigger_set = self
+    end
+
+    result.keep_if do |e|
+      bigger_set.include?(e)
+    end
+
+    result
+  end
+
+  def first
+    @data.each_key { |k| return k }
+    nil
+  end
+
+  def last
+    # All keys are read through, but no intermediate array is created as
+    # whereas "keys.last" accumulates all keys for nothing.
+    # We can't use @data.each_key.last, because there's no Enumerable#last. :/
+    @data.reverse_each { |k, _| return k }
+    nil
+  end
+
+  def to_a
+    @data.keys
+  end
+
+  def to_s
+    to_a.to_s
+  end
+
+=begin
+  [:to_s, :first, :last, :to_a].each do |function|
+    class_eval(<<-EOF, __FILE__, __LINE__ + 1)
+      def #{function}
+        @data.keys.#{function}
+      end
+    EOF
   end
+=end
 
   alias_method :<<, :add
-  alias_method :+, :add # Should probably try to copy original Set behaviour
-  alias_method :rm, :remove
-  alias_method :del, :remove
-  alias_method :delete, :remove
+  alias_method :union, :|
+  alias_method :intersection, :&
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fds
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Thomas Charbonnel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-09 00:00:00.000000000 Z
 dependencies: []
 description: Providing fast data structures for everyday Ruby
 email: thomas@charbonnel.email