keso 0.1.3 → 0.1.4

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Gemfile

@@ -0,0 +1,4 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem 'jeweler'

data/Rakefile

@@ -1,3 +1,6 @@
+require 'bundler'
+Bundler.setup(:default,:rake)
+
 require 'rubygems'
 require 'rake'
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/keso.gemspec

@@ -1,59 +1,61 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{keso}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darwin"]
-  s.date = %q{2010-10-29}
+  s.date = %q{2011-03-20}
   s.description = %q{Cottage cheees with lots of relational theory. Or mabye not so much theory =(}
   s.email = %q{darwin@markkonsulter.se}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
+    ".bundle/config",
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "keso.gemspec",
-     "lib/keso.rb",
-     "lib/realvar.rb",
-     "lib/values/attribute.rb",
-     "lib/values/heading.rb",
-     "lib/values/immutable_hash.rb",
-     "lib/values/immutable_set.rb",
-     "lib/values/relation.rb",
-     "lib/values/tuple.rb",
-     "spec/attribute_spec.rb",
-     "spec/heading_spec.rb",
-     "spec/immutable_hash_spec.rb",
-     "spec/immutable_set_spec.rb",
-     "spec/relation_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/tuple_spec.rb"
+    ".rspec",
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "keso.gemspec",
+    "lib/keso.rb",
+    "lib/realvar.rb",
+    "lib/values/attribute.rb",
+    "lib/values/heading.rb",
+    "lib/values/immutable_hash.rb",
+    "lib/values/immutable_set.rb",
+    "lib/values/relation.rb",
+    "lib/values/tuple.rb",
+    "spec/attribute_spec.rb",
+    "spec/heading_spec.rb",
+    "spec/immutable_hash_spec.rb",
+    "spec/immutable_set_spec.rb",
+    "spec/relation_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/tuple_spec.rb",
+    "timeit.rb",
+    "timeit/relation_bench.rb"
   ]
   s.homepage = %q{http://github.com/bjornblomqvist/keso}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Cottage cheees with lots of relational theory}
   s.test_files = [
     "spec/attribute_spec.rb",
-     "spec/heading_spec.rb",
-     "spec/immutable_hash_spec.rb",
-     "spec/immutable_set_spec.rb",
-     "spec/relation_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/tuple_spec.rb"
+    "spec/heading_spec.rb",
+    "spec/immutable_hash_spec.rb",
+    "spec/immutable_set_spec.rb",
+    "spec/relation_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/tuple_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -61,11 +63,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/lib/values/immutable_set.rb

@@ -5,55 +5,44 @@ class ImmutableSet
   
   def initialize(*args) 
     
-    @set = Set.new;
-    
-    args.each do |value|
-      if value.is_a? ImmutableSet
-        @set.merge value.set
-      elsif value.is_a? Set
-        @set.merge value
-      elsif value.is_a? Array
-        @set.merge value
-      elsif not value.nil?
-        @set.add value
+    if args.first.is_a? ImmutableSet::SetChange
+      @set_change = args.first
+    else
+      @set = Set.new;
+
+      args.each do |value|
+        if value.is_a? ImmutableSet
+          @set.merge value.set
+        elsif value.is_a? Set
+          @set.merge value
+        elsif value.is_a? Array
+          @set.merge value
+        elsif not value.nil?
+          @set.add value
+        end
       end
     end
     
   end
   
   def size
-    @set.size
+    self.set.size
   end
   
   alias :count :size
   
   def each &block
-    @set.to_a.each do |value|
+    self.set.to_a.each do |value|
       block.call value
     end
   end
   
   def add *values
-    
-    new_set = @set.clone
-    
-    values.each do |value|
-      if value.is_a? ImmutableSet
-        new_set.merge(value.to_a)
-      elsif value.is_a? Set
-        new_set.merge(value)
-      elsif value.is_a? Array
-        new_set.merge(value)
-      else
-        new_set.add(value)
-      end
-    end
-    
-    ImmutableSet.new(new_set)
+    ImmutableSet.new(SetChange.new(values,@set || @set_change.set,true,@set_change))
   end
   
   def hash
-    @set.hash
+    self.set.hash
   end
   
   def eql? other
@@ -71,32 +60,17 @@ class ImmutableSet
   end
   
   def delete *values
-    
-    new_set = @set.clone
-    
-    values.each do |value|
-      if value.is_a? ImmutableSet
-        new_set.subtract(value.to_a)
-      elsif value.is_a? Set
-        new_set.subtract(value)
-      elsif value.is_a? Array
-        new_set.subtract(value)
-      else
-        new_set.delete(value)
-      end
-    end
-    
-    ImmutableSet.new(new_set)
+    ImmutableSet.new(SetChange.new(values,@set || @set_change.set,false,@set_change))
   end
   
   alias :remove :delete
   
   def to_a
-    @set.to_a
+    self.set.to_a
   end
   
   def include? value
-    @set.include? value
+    self.set.include? value
   end
   
   
@@ -144,7 +118,78 @@ class ImmutableSet
   protected
   
   def set
-    @set
+    @set ||= @set_change.unrole
+  end
+  
+  class SetChange
+    
+    def initialize values,set,add,set_change
+      
+      raise "set must be supplied" unless set
+      raise "values must be supplied" unless values
+      
+      @values = values
+      @set = set
+      @add = add
+      @set_change = set_change
+      @depth = 0
+      
+      if set_change
+        # We need to unrole when we have a depth of more than 500 so that we dont couse a SystemStackError
+        if set_change.depth > 4000
+          @set_change = nil
+          @set = set_change.unrole
+        else
+          @depth = set_change.depth + 1
+        end
+      end
+    end
+    
+    def set
+      @set
+    end
+    
+    def depth
+      @depth
+    end
+    
+    def add_change_to_set set
+      
+      @set_change.add_change_to_set(set) if @set_change
+      
+      if @add
+        @values.each do |value|
+          if value.is_a? ImmutableSet
+            set.merge(value.to_a)
+          elsif value.is_a? Set
+            set.merge(value)
+          elsif value.is_a? Array
+            set.merge(value)
+          else
+            set.add(value)
+          end
+        end
+      else
+        @values.each do |value|
+          if value.is_a? ImmutableSet
+            set.subtract(value.to_a)
+          elsif value.is_a? Set
+            set.subtract(value)
+          elsif value.is_a? Array
+            set.subtract(value)
+          else
+            set.delete(value)
+          end
+        end
+      end
+      
+      set
+    end
+    
+    def unrole
+      self.add_change_to_set(@set.clone)
+    end
+    
   end
   
 end

data/lib/values/relation.rb

@@ -100,6 +100,14 @@ class Relation
       else
         throw 'its not of the same heading!'+", #{tuple.heading.inspect} != #{@heading.inspect}"
       end
+    elsif tuple.is_a?(Array) && tuple.first.is_a?(Tuple)
+      # Check that all tuples are valid
+      tuple.each do |t| 
+        if t.heading != @heading
+          throw 'its not of the same heading!'+", #{t.heading.inspect} != #{@heading.inspect}"
+        end
+      end
+      Relation.new(@heading).set_body(@body.add tuple)
     else
       throw "Only tuples are supported"
     end

data/spec/relation_spec.rb

@@ -31,8 +31,12 @@ describe Relation do
       
       lambda { company = company.add(Tuple.new({:name => 'Nordea AB',:employes => person})) }.should_not raise_error(ArgumentError)
       lambda { company = company.add(Tuple.new({:name => 'SEB AB',:employes => person_with_length})) }.should raise_error(ArgumentError)
-      
-      
+    end
+    
+    it 'returns a new relation with the added tuples' do 
+       r = Relation.new(Tuple.new({:name => 'Bjorn',:age => 29}))
+       r = r.add([Tuple.new({:name => 'Emma',:age => 30}),Tuple.new({:name => 'Emma',:age => 31})])
+       r.count.should eql 3
     end
     
   end

data/spec/spec_helper.rb

@@ -2,9 +2,8 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'keso'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  config.mock_with :rspec
 end

data/timeit.rb

@@ -0,0 +1,28 @@
+
+
+old_puts = puts
+@tab_count = 0
+
+def puts object
+  super "\t"*@tab_count + object.to_s
+end
+
+def timeit name, &block
+  
+  @tab_count += 1
+  start_time = Time.now
+  puts ""
+  puts "(#{name}) runing"
+  yield block
+  puts "(#{name}) total time: #{Time.now - start_time}"
+  puts ""
+  
+  @tab_count -= 1
+end
+
+load 'timeit/relation_bench.rb'
+
+
+
+
+

data/timeit/relation_bench.rb

@@ -0,0 +1,125 @@
+require './lib/keso.rb'
+
+
+timeit "Tuple" do
+  
+  timeit "Create 1000 tuples" do
+    
+    r = []
+    
+    1000.times do |i|
+     r << Tuple.new({:name => 'Emma',:age => i})
+    end
+  end
+  
+  timeit "Create 20000 tuples" do
+
+     r = []
+
+     20000.times do |i|
+      r << Tuple.new({:name => 'Emma',:age => i})
+     end
+   end
+  
+end
+
+
+timeit "ImmutableSet" do
+  
+  timeit "Add 1000 tuples" do
+    
+    iset = ImmutableSet.new
+    
+    1000.times do |i|
+      iset = iset.add(Tuple.new({:name => 'Emma',:age => i})) 
+    end
+    
+    iset.count
+    
+  end
+  
+  timeit "Add 2000 tuples" do
+    
+    iset = ImmutableSet.new
+    
+    2000.times do |i|
+      iset = iset.add(Tuple.new({:name => 'Emma',:age => i})) 
+    end
+    
+    iset.count
+    
+  end
+  
+  timeit "Add 20000 tuples" do
+    
+    iset = ImmutableSet.new
+    
+    20000.times do |i|
+      iset = iset.add(Tuple.new({:name => 'Emma',:age => i})) 
+    end
+    
+    iset.count
+    
+  end
+  
+end
+
+
+timeit "Relation" do
+  
+  timeit "Adding 1000 tuples" do
+    
+    r = Relation.new(Tuple.new({:name => 'Bjorn',:age => 29}))
+    
+    1000.times do |i|
+     r = r.add(Tuple.new({:name => 'Emma',:age => i})) 
+    end
+    
+    r.count
+     
+  end
+  
+  timeit "Adding 2000 tuples" do
+    
+    r = Relation.new(Tuple.new({:name => 'Bjorn',:age => 29}))
+    
+    2000.times do |i|
+     r = r.add(Tuple.new({:name => 'Emma',:age => i})) 
+    end
+    
+    r.count
+     
+  end
+  
+  timeit "Adding 20000 tuples" do
+    
+    r = Relation.new(Tuple.new({:name => 'Bjorn',:age => 29}))
+    
+    20000.times do |i|
+     r = r.add(Tuple.new({:name => 'Emma',:age => i})) 
+    end
+    
+    r.count
+     
+  end
+  
+  timeit "Adding 20000 tuples as one array" do
+    
+    r = Relation.new(Tuple.new({:name => 'Bjorn',:age => 29}))
+    a = []
+    
+    20000.times do |i|
+     a << Tuple.new({:name => 'Emma',:age => i})
+    end
+    
+    r.add(a)
+    
+    r.count
+    
+  end
+  
+end
+
+
+
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Darwin
@@ -14,13 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2011-03-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: jeweler
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,7 +43,8 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id002
 description: Cottage cheees with lots of relational theory. Or mabye not so much theory =(
 email: darwin@markkonsulter.se
 executables: []
@@ -42,8 +55,10 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .bundle/config
 - .document
-- .gitignore
+- .rspec
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -62,16 +77,17 @@ files:
 - spec/immutable_hash_spec.rb
 - spec/immutable_set_spec.rb
 - spec/relation_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/tuple_spec.rb
+- timeit.rb
+- timeit/relation_bench.rb
 has_rdoc: true
 homepage: http://github.com/bjornblomqvist/keso
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -79,6 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -3964452428481869928
       segments: 
       - 0
       version: "0"

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC