keso 0.1.4 → 0.2.0

data/Gemfile.lock

@@ -0,0 +1,15 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jeweler

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/values/heading.rb

@@ -8,6 +8,8 @@ class Heading
       @attributes = @attributes.add values
     elsif values.is_a? ImmutableSet
       @attributes = values
+    elsif values.is_a? Array
+      @attributes = ImmutableSet.new values
     elsif values.is_a? Hash
       @attributes = @attributes.add(Attribute.new(values))
     elsif values.is_a? Heading
@@ -19,6 +21,11 @@ class Heading
     else
       raise 'Invalid parameter, expected a hash with name and type or a attribute'
     end
+    
+    # Validate
+    @attributes.each do |a|
+      raise "Invalid input, all values must be an attribute or hash that creats an attribute" unless a.is_a? Attribute
+    end
   end
   
   def names

data/lib/values/immutable_hash.rb

@@ -5,13 +5,19 @@ class ImmutableHash
     
     @hash = {}
     
-    if key_or_hash.is_a?(ImmutableHash) || key_or_hash.is_a?(Hash)
-      key_or_hash.keys.each do |key|
-        @hash[key] = key_or_hash[key]
+    if key_or_hash.is_a?(ImmutableHash)
+      @hash = key_or_hash.inner_hash
+    elsif key_or_hash.is_a?(Hash)
+      if(key_or_hash.frozen?) 
+        @hash = key_or_hash
+      else
+        @hash = key_or_hash.dup
       end
     elsif !key_or_hash.nil?
       @hash[key_or_hash] = value
     end
+    
+    @hash.freeze
   end
   
   def [] key
@@ -50,7 +56,7 @@ class ImmutableHash
   
   def delete *to_remove
     
-    newHash = @hash.clone
+    newHash = @hash.dup
     
     to_remove.each do |to_remove|
       if to_remove.is_a?(ImmutableHash) || to_remove.is_a?(Hash)
@@ -66,20 +72,20 @@ class ImmutableHash
       end
     end
     
-    ImmutableHash.new newHash
+    ImmutableHash.new newHash.freeze
   end
   
   def add key_or_hash,value = nil
     if key_or_hash.is_a?(ImmutableHash) || key_or_hash.is_a?(Hash)
-      newHash = @hash.clone
+      newHash = @hash.dup
       key_or_hash.keys.each do |key|
         newHash[key] = key_or_hash[key]
       end
-      ImmutableHash.new(newHash)
+      ImmutableHash.new(newHash.freeze)
     else
-      newHash = @hash.clone
+      newHash = @hash.dup
       newHash[key_or_hash] = value
-      ImmutableHash.new newHash
+      ImmutableHash.new newHash.freeze
     end
   end
   

data/lib/values/tuple.rb

@@ -5,9 +5,22 @@ class Tuple
   @hash = nil
   
   def initialize *args
-    hash = ImmutableHash.new *args
-    @hash = ImmutableHash.new
-    @heading = Heading.new
+    
+    # Fix so that we have the input as a hash
+    hash = args.first
+    unless(hash.is_a?(Hash) || hash.is_a?(ImmutableHash))  
+      hash = {args[0] => args[1]}
+    end
+    
+    if args.length == 0
+      hash = {}
+    end
+    
+    
+    # Validate and put the input as we want it
+    values = {}
+    heading = []
+    
     hash.each do |name_or_attribute,value| 
       if name_or_attribute.is_a? Attribute
         
@@ -17,18 +30,22 @@ class Tuple
           throw "#{value} is not the same as #{name_or_attribute.type}" if value.class != name_or_attribute.type
         end
         
-        @heading = @heading.add(name_or_attribute)
-        @hash = @hash.add(name_or_attribute,value)
+        heading << name_or_attribute
       else
         if value.is_a? Relation
-          @heading = @heading.add(Attribute.new(name_or_attribute,value.heading))
-          @hash = @hash.add(Attribute.new(name_or_attribute,value.heading),value)
+          heading << Attribute.new(name_or_attribute,value.heading)
         else
-          @heading = @heading.add(Attribute.new(name_or_attribute,value.class))
-          @hash = @hash.add(Attribute.new(name_or_attribute,value.class),value)
+          heading << Attribute.new(name_or_attribute,value.class)
         end
       end
+      
+      values[heading.last] = value
     end
+    
+    # set it
+    @hash = ImmutableHash.new values
+    @heading = Heading.new heading
+    
   end
   
   def count

data/timeit.rb

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

data/timeit/relation_bench.rb

@@ -20,9 +20,49 @@ timeit "Tuple" do
       r << Tuple.new({:name => 'Emma',:age => i})
      end
    end
+   
+   timeit "Add 2000 values to a tuple" do
+      r = []
+      t = Tuple.new
+
+      2000.times do |i|
+        r << t
+        t = t.add({"name_#{i}".to_sym => i})
+      end
+   end
   
 end
 
+timeit "ImmutableHash" do
+  
+  timeit "Add 1000 values" do 
+    
+    ihash = ImmutableHash.new
+    
+    1000.times do |i|
+      ihash = ihash.add({"bal#{i}" => i})
+    end
+  end
+  
+  timeit "Add 2000 values" do 
+    
+    ihash = ImmutableHash.new
+    
+    2000.times do |i|
+      ihash = ihash.add({"bal#{i}" => i})
+    end
+  end
+  
+  timeit "Add 10000 values" do 
+    
+    ihash = ImmutableHash.new
+    
+    10000.times do |i|
+      ihash = ihash.add({"bal#{i}" => i})
+    end
+  end
+  
+end
 
 timeit "ImmutableSet" do
   

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: keso
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Darwin
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-20 00:00:00 +01:00
+date: 2011-04-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   prerelease: false
@@ -37,10 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   prerelease: false
@@ -59,6 +49,7 @@ files:
 - .document
 - .rspec
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -95,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3964452428481869928
+      hash: 2938014607106573032
       segments: 
       - 0
       version: "0"
@@ -104,13 +95,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Cottage cheees with lots of relational theory