daru 0.1.5 → 0.3

data/lib/daru/io/sql_data_source.rb

@@ -73,6 +73,8 @@ module Daru
         query = String.try_convert(query) or
           raise ArgumentError, "Query must be a string, #{query.class} received"
 
+        db = attempt_sqlite3_connection(db) if db.is_a?(String) && Pathname(db).exist?
+
         case db
         when DBI::DatabaseHandle
           DbiAdapter.new(db, query)
@@ -82,6 +84,14 @@ module Daru
           raise ArgumentError, "Unknown database adapter type #{db.class}"
         end
       end
+
+      def attempt_sqlite3_connection(db)
+        DBI.connect("DBI:SQLite3:#{db}")
+      rescue SQLite3::NotADatabaseException
+        raise ArgumentError, "Expected #{db} to point to a SQLite3 database"
+      rescue NameError
+        raise NameError, "In order to establish a connection to #{db}, please require 'dbi'"
+      end
     end
   end
 end

data/lib/daru/iruby/templates/dataframe.html.erb

@@ -1,52 +1,5 @@
-<table>
-  <tr>
-    <th colspan='<%= @vectors.size+1 %>'>Daru::DataFrame<%= name ? ": #{name} " : ''%>(<%=nrows%>x<%=ncols%>)</th>
-  </tr>
-
-  <% if @vectors.is_a? MultiIndex %>
-    <% Daru::IRuby::Helpers.tuples_with_colspans(@vectors).each_with_index do |tuple, idx| %>
-      <tr>
-        <% if idx.zero? %>
-          <th rowspan="<%= @vectors.width %>"></th>
-        <% end %>
-        <% tuple.each do |idx, span| %>
-          <th colspan="<%= span %>"><%= idx %></th>
-        <% end %>
-      </tr>
-    <% end %>
-  <% else %>
-    <tr>
-      <th></th>
-      <% @vectors.each do |vector| %>
-        <th><%=vector%></th>
-      <% end %>
-    </tr>
-  <% end %>
-
-  <% @index.first(threshold).each_with_index do |index, pos| %>
-    <tr>
-      <td><%= index %></td>
-      <% row.at(pos).each do |element| %>
-        <td><%= element.to_s %></td>
-      <% end %>
-    </tr>
-  <% end %>
-
-  <% if nrows > threshold %>
-    <tr>
-      <% (@vectors.size + 1).times do %>
-        <td>...</td>
-      <% end %>
-    </tr>
-
-    <% last_index = @index.to_a.last
-       last_row = row_at @index.size-1 %>
-
-    <tr>
-      <td><%= last_index %></td>
-        <% last_row.each do |element| %>
-          <td><%= element.to_s %></td>
-        <% end %>
-    </tr>
-  <% end %>
+<b> Daru::DataFrame<%= name ? ": #{name} " : ''%>(<%=nrows%>x<%=ncols%>) </b>
+<table border="1" class="dataframe">
+  <%= table_thead %>
+  <%= table_tbody %>
 </table>

data/lib/daru/iruby/templates/dataframe_mi.html.erb

@@ -1,58 +1,5 @@
+<b> Daru::DataFrame<%= name ? ": #{name} " : ''%>(<%=nrows%>x<%=ncols%>) </b>
 <table>
-  <tr>
-    <th colspan='<%= @vectors.size+index.width %>'>Daru::DataFrame<%= name ? ": #{name} " : ''%>(<%=nrows%>x<%=ncols%>)</th>
-  </tr>
-  <% if @vectors.is_a? MultiIndex %>
-    <% Daru::IRuby::Helpers.tuples_with_colspans(@vectors).each_with_index do |tuple, idx| %>
-      <tr>
-        <% if idx.zero? %>
-          <th colspan="<%= index.width %>" rowspan="<%= @vectors.width %>"></th>
-        <% end %>
-        <% tuple.each do |idx, span| %>
-          <th colspan="<%= span %>"><%= idx %></th>
-        <% end %>
-      </tr>
-    <% end %>
-  <% else %>
-    <tr>
-      <th colspan="<%= index.width %>"></th>
-      <% @vectors.each do |vector| %>
-        <th><%=vector%></th>
-      <% end %>
-    </tr>
-  <% end %>
-
-  <% Daru::IRuby::Helpers.tuples_with_rowspans(@index).first(threshold).zip(@index.to_a).each do |tuple, index| %>
-    <tr>
-      <% tuple.each do |idx, span| %>
-        <th rowspan="<%= span %>"><%= idx %></th>
-      <% end %>
-      <% row[index].each do |element| %>
-        <td><%= element.to_s %></td>
-      <% end %>
-    </tr>
-  <% end %>
-
-  <% if nrows > threshold %>
-    <tr>
-      <% index.width.times do %>
-        <th>...</th>
-      <% end %>
-      <% @vectors.size.times do %>
-        <td>...</td>
-      <% end %>
-    </tr>
-
-    <% last_index = @index.to_a.last
-       last_row = row[last_index] %>
-
-    <tr>
-      <% last_index.each do |idx| %>
-        <th><%= idx %></td>
-      <% end %>
-      <% last_row.each do |element| %>
-        <td><%= element.to_s %></td>
-      <% end %>
-    </tr>
-  <% end %>
+  <%= table_thead %>
+  <%= table_tbody %>
 </table>

data/lib/daru/iruby/templates/dataframe_mi_tbody.html.erb

@@ -0,0 +1,35 @@
+<tbody>
+  <% Daru::IRuby::Helpers.tuples_with_rowspans(@index).first(threshold).zip(@index.to_a).each do |tuple, index| %>
+    <tr>
+      <% tuple.each do |idx, span| %>
+        <th rowspan="<%= span %>"><%= idx %></th>
+      <% end %>
+      <% row[index].each do |element| %>
+        <td><%= element.to_s %></td>
+      <% end %>
+    </tr>
+  <% end %>
+
+  <% if nrows > threshold %>
+    <tr>
+      <% index.width.times do %>
+        <th>...</th>
+      <% end %>
+      <% @vectors.size.times do %>
+        <td>...</td>
+      <% end %>
+    </tr>
+
+    <% last_index = @index.to_a.last
+       last_row = row[last_index] %>
+
+    <tr>
+      <% last_index.each do |idx| %>
+        <th><%= idx %></td>
+      <% end %>
+      <% last_row.each do |element| %>
+        <td><%= element.to_s %></td>
+      <% end %>
+    </tr>
+  <% end %>
+</tbody>

data/lib/daru/iruby/templates/dataframe_mi_thead.html.erb

@@ -0,0 +1,21 @@
+<thead>
+  <% if @vectors.is_a? MultiIndex %>
+    <% Daru::IRuby::Helpers.tuples_with_colspans(@vectors).each_with_index do |tuple, idx| %>
+      <tr>
+        <% if idx.zero? %>
+          <th colspan="<%= index.width %>" rowspan="<%= @vectors.width %>"></th>
+        <% end %>
+        <% tuple.each do |idx, span| %>
+          <th colspan="<%= span %>"><%= idx %></th>
+        <% end %>
+      </tr>
+    <% end %>
+  <% else %>
+    <tr>
+      <th colspan="<%= index.width %>"></th>
+      <% @vectors.each do |vector| %>
+        <th><%=vector%></th>
+      <% end %>
+    </tr>
+  <% end %>
+</thead>

data/lib/daru/iruby/templates/dataframe_tbody.html.erb

@@ -0,0 +1,28 @@
+<tbody>
+  <% @index.first(threshold).each_with_index do |index, pos| %>
+    <tr>
+      <td><%= index %></td>
+      <% row.at(pos).each do |element| %>
+        <td><%= element.to_s %></td>
+      <% end %>
+    </tr>
+  <% end %>
+
+  <% if nrows > threshold %>
+    <tr>
+      <% (@vectors.size + 1).times do %>
+        <td>...</td>
+      <% end %>
+    </tr>
+
+    <% last_index = @index.to_a.last
+       last_row = row_at @index.size-1 %>
+
+    <tr>
+      <td><%= last_index %></td>
+        <% last_row.each do |element| %>
+          <td><%= element.to_s %></td>
+        <% end %>
+    </tr>
+  <% end %>
+</tbody>

data/lib/daru/iruby/templates/dataframe_thead.html.erb

@@ -0,0 +1,21 @@
+<thead>
+  <% if @vectors.is_a? MultiIndex %>
+    <% Daru::IRuby::Helpers.tuples_with_colspans(@vectors).each_with_index do |tuple, idx| %>
+      <tr>
+        <% if idx.zero? %>
+          <th rowspan="<%= @vectors.width %>"></th>
+        <% end %>
+        <% tuple.each do |idx, span| %>
+          <th colspan="<%= span %>"><%= idx %></th>
+        <% end %>
+      </tr>
+    <% end %>
+  <% else %>
+    <tr>
+      <th></th>
+      <% @vectors.each do |vector| %>
+        <th><%=vector%></th>
+      <% end %>
+    </tr>
+  <% end %>
+</thead>

data/lib/daru/iruby/templates/vector.html.erb

@@ -1,27 +1,5 @@
+<b> Daru::Vector(<%= size %>)<%= ':category' if category? %> </b>
 <table>
-  <tr>
-    <th colspan="2">Daru::Vector(<%= size %>)<%= ':category' if category? %></th>
-  </tr>
-  <% if name %>
-    <tr>
-        <th> </th>
-        <th><%= name %></th>
-    </tr>
-  <% end %>
-
-  <% @index.each_with_index.first(threshold).each do |index, pos| %>
-    <tr>
-      <td><%= index %></td>
-      <td><%= self.at(pos) %></td>
-    </tr>
-  <% end %>
-
-  <% if size > threshold %>
-    <% last_index = @index.size-1 %>
-    <tr><td>...</td><td>...</td></tr>
-    <tr>
-      <td><%= last_index %></td>
-      <td><%= self.at last_index %></td>
-    </tr>
-  <% end %>
+  <%= table_thead %>
+  <%= table_tbody %>
 </table>

data/lib/daru/iruby/templates/vector_mi.html.erb

@@ -1,36 +1,5 @@
+<b> Daru::Vector(<%= size %>)<%= ':category' if category? %> </b>
 <table>
-  <tr>
-    <th colspan="<%= index.width+1 %>">Daru::Vector(<%= size %>)<%= ':category' if category? %></th>
-  </tr>
-  <% if name %>
-    <tr>
-        <th colspan="<%= index.width %>"> </th>
-        <th><%= name %></th>
-    </tr>
-  <% end %>
-
-  <% Daru::IRuby::Helpers.tuples_with_rowspans(@index).first(threshold).zip(to_a).each do |tuple, value| %>
-    <tr>
-      <% tuple.each do |idx, span| %>
-        <th rowspan="<%= span %>"><%= idx %></th>
-      <% end %>
-      <td><%= value %></td>
-    </tr>
-  <% end %>
-
-  <% if size > threshold %>
-    <% last_index = @index.to_a.last %>
-    <tr>
-      <% last_index.size.times do %>
-        <th>...</th>
-      <% end %>
-      <td>...</td>
-    </tr>
-    <tr>
-      <% last_index.each do |idx| %>
-        <th><%= idx %></td>
-      <% end %>
-      <td><%= self[last_index] %></td>
-    </tr>
-  <% end %>
+  <%= table_thead %>
+  <%= table_tbody %>
 </table>

data/lib/daru/iruby/templates/vector_mi_tbody.html.erb

@@ -0,0 +1,26 @@
+<tbody>
+  <% Daru::IRuby::Helpers.tuples_with_rowspans(@index).first(threshold).zip(to_a).each do |tuple, value| %>
+    <tr>
+      <% tuple.each do |idx, span| %>
+        <th rowspan="<%= span %>"><%= idx %></th>
+      <% end %>
+      <td><%= value %></td>
+    </tr>
+  <% end %>
+
+  <% if size > threshold %>
+    <% last_index = @index.to_a.last %>
+    <tr>
+      <% last_index.size.times do %>
+        <th>...</th>
+      <% end %>
+      <td>...</td>
+    </tr>
+    <tr>
+      <% last_index.each do |idx| %>
+        <th><%= idx %></td>
+      <% end %>
+      <td><%= self[last_index] %></td>
+    </tr>
+  <% end %>
+</tbody>

data/lib/daru/iruby/templates/vector_mi_thead.html.erb

@@ -0,0 +1,8 @@
+<thead>
+  <% if name %>
+    <tr>
+        <th colspan="<%= index.width %>"> </th>
+        <th><%= name %></th>
+    </tr>
+  <% end %>
+</thead>

data/lib/daru/iruby/templates/vector_tbody.html.erb

@@ -0,0 +1,17 @@
+<tbody>
+  <% @index.each_with_index.first(threshold).each do |index, pos| %>
+    <tr>
+      <td><%= index %></td>
+      <td><%= self.at(pos) %></td>
+    </tr>
+  <% end %>
+
+  <% if size > threshold %>
+    <% last_index = @index.size-1 %>
+    <tr><td>...</td><td>...</td></tr>
+    <tr>
+      <td><%= last_index %></td>
+      <td><%= self.at last_index %></td>
+    </tr>
+  <% end %>
+</tbody>

data/lib/daru/iruby/templates/vector_thead.html.erb

@@ -0,0 +1,8 @@
+<thead>
+  <% if name %>
+    <tr>
+        <th> </th>
+        <th><%= name %></th>
+    </tr>
+  <% end %>
+</thead>

data/lib/daru/maths/arithmetic/vector.rb

@@ -42,6 +42,34 @@ module Daru
           recode { |e| e.round(precision) unless e.nil? }
         end
 
+        # Add specified vector.
+        #
+        # @param other [Daru::Vector] The vector thats added to this.
+        # @param opts [Boolean] :skipnil if true treats nils as 0.
+        #
+        # @example
+        #
+        #    v0 = Daru::Vector.new [1, 2, nil, nil]
+        #    v1 = Daru::Vector.new [2, 1, 3, nil]
+        #
+        #    irb> v0.add v1
+        #    =>  #<Daru::Vector(4)>
+        #          0   3
+        #          1   3
+        #          2 nil
+        #          3 nil
+        #
+        #    irb> v0.add v1, skipnil: true
+        #    =>  #<Daru::Vector(4)>
+        #          0   3
+        #          1   3
+        #          2   3
+        #          3   0
+        #
+        def add other, opts={}
+          v2v_binary :+, other, skipnil: opts.fetch(:skipnil, false)
+        end
+
         private
 
         def math_unary_op operation
@@ -62,19 +90,27 @@ module Daru
             name: @name, index: @index
         end
 
-        def v2v_binary operation, other
+        def v2v_binary operation, other, opts={}
           # FIXME: why the sorting?.. - zverok, 2016-05-18
           index = (@index.to_a | other.index.to_a).sort
 
           elements = index.map do |idx|
             this = self.index.include?(idx) ? self[idx] : nil
             that = other.index.include?(idx) ? other[idx] : nil
-
+            this, that = zero_nil_args(this, that, opts.fetch(:skipnil, false))
             this && that ? this.send(operation, that) : nil
           end
 
           Daru::Vector.new(elements, name: @name, index: index)
         end
+
+        def zero_nil_args(this, that, skipnil)
+          if skipnil
+            this = 0 if this.nil?
+            that = 0 if that.nil?
+          end
+          [this, that]
+        end
       end
     end
   end