dbd 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a631ac1b673b24327126207b5898c6132a08f41f
-  data.tar.gz: 2abdda7d7da624dace39c486381130a813c28e92
+  metadata.gz: 75b2bc30c49af7b08d577c827026747f15cbd445
+  data.tar.gz: 4cefc94a588e2f53b2b8a42d259eee98f10567f8
 SHA512:
-  metadata.gz: 03eac42ce2d9216371065f46a2ab8ab0dc19a88b9270f59cdcd50496d771dc4852fd30f471514028b00da6ed1de71787c8767388c697158e21b73e0e625b636a
-  data.tar.gz: 4baa8c0d598d1982442ee8c31a1e612939b5ae39c0167eb32eab25ebfa919c3a37523bb3a249a35f504d4bd67a08cdd65bdc76a2d9010846420ba7a3ab1fc265
+  metadata.gz: 17ccb9cc70e2e7f17b2b5d5ed944ab68ab88d7350bcbc9aad17205a37f120bee1c344aa499661b5481cf6b7e31451fb6d5a38e22e96a330e271f787a6b36e6be
+  data.tar.gz: c9dcd9ac5be891a80101230f09ba9ce250d61db2bdba25883a7648efb2034ea14285489f4272d312bcd2a8382d2b1f89f2a38bf6b733f6ca266adb06ebc27e9a

data/HISTORY.txt

@@ -96,3 +96,9 @@
 ======
 
 * better exception message for an OutOfOrder exception
+
+0.0.16 (26 Aug 2013)
+======
+
+* add Graph#from_unsorted_CSV_file (sorts in temp file)
+* adds minimal delay (test_7 on 100K facts from 18.2 to 18.8 s)

data/bin/test_7.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+# This implementation streams from disk
+#
+# See test_5.rb for usage and basic performance test
+
+filename = ARGV[0]
+unless filename
+  puts "Give a 'filename' as argument."
+  exit(1)
+end
+
+require 'dbd'
+
+start = Time.now
+
+graph = Dbd::Graph.new.from_unsorted_CSV_file(filename)
+
+puts "Graph is ready (took #{Time.now - start}s)."
+
+puts "graph.size is #{graph.size}"
+
+puts "first fact is:"
+puts graph.first.string_values
+
+puts "last fact is:"
+puts graph.last.string_values

data/lib/dbd/graph.rb

@@ -1,4 +1,5 @@
 require 'csv'
+require 'tempfile'
 
 module Dbd
 
@@ -54,7 +55,9 @@ module Dbd
     end
 
     ##
-    # Import a graph from a CSV IO stream
+    # Import a graph from a sorted CSV IO stream
+    #
+    # time_stamps need to be strictly monotonic increasing
     #
     # Tokens "backslash n" in the CSV fields will be unescaped to newlines.
     # Tokens "double backslash" in the CSV fields will be unescaped to single backslash
@@ -68,6 +71,20 @@ module Dbd
       self
     end
 
+    ##
+    # Import a graph from an unsorted CSV file (by filename)
+    #
+    # time_stamps need to be unique (but can be random order)
+    #
+    # Tokens "backslash n" in the CSV fields will be unescaped to newlines.
+    # Tokens "double backslash" in the CSV fields will be unescaped to single backslash
+    #
+    # @param [String] filename the filename of the unsorted CSV file
+    # @return [Graph] the imported graph
+    def from_unsorted_CSV_file(filename)
+      on_sorted_file(filename) { |sorted_file| from_CSV(sorted_file) }
+    end
+
   private
 
     ##
@@ -89,5 +106,17 @@ module Dbd
       end
     end
 
+    def on_sorted_file(filename)
+      Tempfile.open('foo', 'data/') do |sorted_file|
+        create_sorted_file(filename, sorted_file)
+        yield(sorted_file)
+      end
+    end
+
+    def create_sorted_file(filename, sorted_file)
+      temp_name = sorted_file.path
+      `sort #{filename} > #{temp_name}`
+    end
+
   end
 end

data/lib/dbd/version.rb

@@ -1,3 +1,3 @@
 module Dbd
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/lib/dbd/graph/from_csv_spec.rb

@@ -96,7 +96,43 @@ module Dbd
         csv = 'foo, bar'
         lambda { described_class.new.from_CSV(csv) }.should raise_error IndexError
       end
+    end
+
+    describe '#from_unsorted_CSV_file' do
+
+      let(:graph_context) { TestFactories::Graph.only_context }
+      let(:graph_facts) { TestFactories::Graph.only_facts(graph_context.first.subject) }
+      let(:graph_facts_csv) { graph_facts.to_CSV }
+      let(:inverted_graph_facts_csv) do
+        graph_facts_csv.split("\n").reverse.join("\n")
+      end
 
+      it "inverted_graph_facts_csv is really inverted" do
+        first_line = inverted_graph_facts_csv.split("\n").first
+        last_line = inverted_graph_facts_csv.split("\n").last
+        first_line.should > last_line
+      end
+
+      it "reads the inverted_graph" do
+        filename = 'data/reverse.csv'
+        File.open(filename, 'w') do |f|
+          f << inverted_graph_facts_csv
+        end
+
+        graph = Graph.new
+        graph.from_unsorted_CSV_file(filename)
+        graph.first.time_stamp.should < graph.last.time_stamp
+      end
+
+      it "returns a graph" do
+        filename = 'data/reverse.csv'
+        File.open(filename, 'w') do |f|
+          f << inverted_graph_facts_csv
+        end
+
+        graph = Graph.new
+        graph.from_unsorted_CSV_file(filename).should be_a(described_class)
+      end
     end
   end
 end

data/spec/lib/dbd/time_stamp/methods_spec.rb

@@ -42,5 +42,7 @@ module Dbd
         lambda{ described_class.new(time: time_CET) }.should raise_error ArgumentError
       end
     end
+
+    #NOTE: for '+' and '-' see the comparisons_spec.rb
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbd
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Peter Vandenabeele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,6 +145,7 @@ executables:
 - test_4.rb
 - test_5.rb
 - test_6.rb
+- test_7.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -163,6 +164,7 @@ files:
 - bin/test_4.rb
 - bin/test_5.rb
 - bin/test_6.rb
+- bin/test_7.rb
 - data/.gitkeep
 - dbd.gemspec
 - docs/rationale.md