lrjew 1.0 → 1.3

data/bin/lrjew

@@ -1,20 +1,17 @@
 #!/bin/env ruby
 
-require 'lru'
+require 'lrjew'
 
-lru_size = ARGV[0] || 100_000
+lru_size   = (ARGV.shift || 100_000).to_i
+print_freq = (ARGV.shift || 50_000).to_i
 
-lru = Lru.new(lru_size)
+indexed_stack = IndexedBoundedStack.new(BoundedStack.new(LinkedList.new, lru_size))
 
-hits = 0
+lru = Lru.new(indexed_stack)
 
-GC.disable
-
-ARGF.each_with_index do |line, idx|
+$stdin.each_with_index do |line, idx|
   lru.include?(line)
-  if (idx+1) % 50_000 == 0
-    puts "#{Time.now}: #{lru.inspect}"
-    GC.start
-    GC.disable
+  if (idx+1) % print_freq == 0
+    p lru
   end
 end

data/lib/lrjew.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'lru/linked_list'
-require 'lru/bounded_stack'
-require 'lru/indexed_bounded_stack'
-require 'lru/lru'
+require 'lrjew/linked_list'
+require 'lrjew/bounded_stack'
+require 'lrjew/indexed_bounded_stack'
+require 'lrjew/lru'

data/lib/lrjew/bounded_stack.rb

@@ -20,15 +20,16 @@ class BoundedStack
     [node, shifted]
   end
 
+  def delete(data)
+    @list.delete(data)
+    @current_size -= 1
+  end
+
   def length
     @current_size
   end
-
   alias_method :size, :length
 
-  def method_missing(method, *args, &block)
-    @list.send(method, *args, &block)
-  end
 
   def each(&block)
     @list.each(&block)

data/lib/lrjew/lru.rb

@@ -1,4 +1,5 @@
 class Lru
+  include Enumerable
   attr_reader :evictions, :hits, :misses, :gets
 
   def initialize(indexed_bounded_stack)
@@ -14,12 +15,16 @@ class Lru
       @stack.push(item)
     else
       @misses += 1
-      node, shifted = @stack.push(item)
+      _, shifted = @stack.push(item)
       @evictions += 1 if shifted
     end
     included
   end
 
+  def each(&block)
+    @stack.each(&block)
+  end
+
   def inspect
     [
       "gets", @gets,

data/spec/bounded_stack_spec.rb

@@ -26,4 +26,14 @@ describe BoundedStack do
       end
     end
   end
+
+  describe '#delete' do
+    it "decrements the size" do
+      @bounded_stack.push(1)
+      @bounded_stack.push(2)
+      @bounded_stack.size.should == 2
+      @bounded_stack.delete(2)
+      @bounded_stack.size.should == 1
+    end
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lrjew
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 9
   prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Steve Jenson