rust 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 985f7e940ab123fa452dae63792bde90613b134176ff4eaf5b59a719dd8a1ed5
-  data.tar.gz: bef0bb5028c99cb43c8e5453fdbbaf687bad65f8e6b54b06f949e5df6fb61bda
+  metadata.gz: ca9e5aaa6bcfff9d1b261c5a3ced5cf74b7731085b4b094dba55df72884aca9a
+  data.tar.gz: 8c90363b44a0c95abc9610fb78c3c632c6ae4265ad2260ff7e9740777245f63e
 SHA512:
-  metadata.gz: 418181b9357665ecc654e9a765e24aa792d6287dd5998b1b1bd8f3278e6951d785fff8afe9594c6c95e1f7a384cb08f844939728b62a96ab416259de1c14512b
-  data.tar.gz: 810f14821924bd1b0cebf4fbf9f52e510abc0e935be6cc2852294fd374d54411bcd2a1943f5b60d2ce93501abcaff9cac25dd458e1a8b354b665aab199705a4a
+  metadata.gz: 0ca17e2c0dda2188138f11e1ae4becaa8a5c4b0d2cc12273775b9ade1fefbc860f3ccee2251fbe353b9dbde55eded960e8cf26642af042070d979ed192b332e3
+  data.tar.gz: 28dacd36f814acf51d222c8e746f65b94ef53ab5f24902ba6f654b05267c926e8db03cca82a876ca1183f55293da96d60ec862c5bfa26f6abd430d1f5e998709

data/lib/rust-basics.rb

@@ -10,13 +10,14 @@ module Rust:: Correlation
                 Rust['correlation.a'] = d1
                 Rust['correlation.b'] = d2
                 
-                Rust._eval("correlation.result <- cor.test(correlation.a, correlation.b, method='p')")
+                _, warnings = Rust._eval("correlation.result <- cor.test(correlation.a, correlation.b, method='p')", true)
                 
                 result = Result.new
                 result.name             = "Pearson's product-moment correlation"
                 result.statistics['t']  = Rust._pull('correlation.result$statistic')
                 result.pvalue           = Rust._pull('correlation.result$p.value')
                 result.correlation      = Rust._pull('correlation.result$estimate')
+                result.exact            = !warnings.include?("Cannot compute exact p-value with ties")
                 
                 return result
             end
@@ -36,13 +37,14 @@ module Rust:: Correlation
                 Rust['correlation.a'] = d1
                 Rust['correlation.b'] = d2
                 
-                Rust._eval("correlation.result <- cor.test(correlation.a, correlation.b, method='s')")
+                _, warnings = Rust._eval("correlation.result <- cor.test(correlation.a, correlation.b, method='s')", true)
                 
                 result = Result.new
                 result.name             = "Spearman's rank correlation rho"
                 result.statistics['S']  = Rust._pull('correlation.result$statistic')
                 result.pvalue           = Rust._pull('correlation.result$p.value')
                 result.correlation      = Rust._pull('correlation.result$estimate')
+                result.exact            = !warnings.include?("Cannot compute exact p-value with ties")
                 
                 return result
             end
@@ -62,13 +64,14 @@ module Rust:: Correlation
                 Rust['correlation.a'] = d1
                 Rust['correlation.b'] = d2
                 
-                Rust._eval("correlation.result <- cor.test(correlation.a, correlation.b, method='p')")
+                _, warnings = Rust._eval("correlation.result <- cor.test(correlation.a, correlation.b, method='p')", true)
                 
                 result = Result.new
                 result.name             = "Kendall's rank correlation tau"
                 result.statistics['T']  = Rust._pull('correlation.result$statistic')
                 result.pvalue           = Rust._pull('correlation.result$p.value')
                 result.correlation      = Rust._pull('correlation.result$estimate')
+                result.exact            = !warnings.include?("Cannot compute exact p-value with ties")
                 
                 return result
             end
@@ -84,11 +87,13 @@ module Rust:: Correlation
         attr_accessor   :statistics
         attr_accessor   :pvalue
         attr_accessor   :correlation
+        attr_accessor   :exact
         
         alias :estimate :correlation
         
         def initialize
             @statistics = {}
+            @exact = true
         end
         
         def [](name)
@@ -101,6 +106,7 @@ module Rust:: Correlation
                 
         def to_s
             return "#{name}. Correlation = #{correlation}, P-value = #{pvalue} " +
+                    (!@exact ? "P-value is not exact. " : "") + 
                     "#{ statistics.map { |k, v| k.to_s + " -> " + v.to_s  }.join(", ") }."
         end
     end

data/lib/rust-core.rb

@@ -581,3 +581,7 @@ module Rust::RBindings
         Rust::DataFrame.new(*args)
     end
 end
+
+def bind_r!
+    include Rust::RBindings
+end

data/lib/rust-descriptive.rb

@@ -13,15 +13,17 @@ module Rust::Descriptive
         def standard_deviation(data)
             raise TypeError, "Expecting Array of numerics" if !data.is_a?(Array) || !data.all? { |e| e.is_a?(Numeric) }
             
-            # TODO implement
+            return Math.sqrt(variance(data))
         end
         alias :sd     :standard_deviation
         alias :stddev :standard_deviation
         
         def variance(data)
             raise TypeError, "Expecting Array of numerics" if !data.is_a?(Array) || !data.all? { |e| e.is_a?(Numeric) }
+            return Float::NAN if data.size < 2
             
-            # TODO implement
+            mean = mean(data)
+            return data.map { |v| (v - mean) ** 2 }.sum.to_f / (data.size - 1)
         end
         alias :var     :variance
         
@@ -39,6 +41,12 @@ module Rust::Descriptive
             end
         end
         
+        def sum(data)
+            raise TypeError, "Expecting Array of numerics" if !data.is_a?(Array) || !data.all? { |e| e.is_a?(Numeric) }
+            
+            return data.sum
+        end
+        
         def quantile(data, percentiles=[0.0, 0.25, 0.5, 0.75, 1.0])
             raise TypeError, "Expecting Array of numerics" if !data.is_a?(Array) || !data.all? { |e| e.is_a?(Numeric) }
             raise TypeError, "Expecting Array of numerics" if !percentiles.is_a?(Array) || !percentiles.all? { |e| e.is_a?(Numeric) }

data/lib/rust-plots.rb

@@ -4,8 +4,9 @@ require_relative 'rust-calls'
 module Rust::Plots
     class BasePlot
         def initialize
-            @plugins = []
+            @renderables = []
             @options = Rust::Options.new
+            @override_options = true
         end
         
         def x_label(label)
@@ -36,7 +37,13 @@ module Rust::Plots
             @options['xaxt'] = 'n'
             @options['yaxt'] = 'n'
             
-            self.plug(axis)
+            self._add_renderable(axis)
+            
+            return self
+        end
+        
+        def grid(grid)
+            self._add_renderable(grid)
             
             return self
         end
@@ -53,21 +60,25 @@ module Rust::Plots
             return self
         end
         
-        def plug(plugin)
-            raise TypeError, "Expected Plugin" unless plugin.is_a?(Plugin)
-            @plugins << plugin
+        def _add_renderable(renderable)
+            raise TypeError, "Expected Renderable" unless renderable.is_a?(Renderable)
+            @renderables << renderable
             
             return self
         end
         
         def []=(option, value)
-            @options[option] = value
+            @options[option.to_s] = value
+        end
+        
+        def _do_not_override_options!
+            @override_options = false
         end
         
         def show()
             Rust.exclusive do
                 self._show
-                self._run_plugins
+                self._render_others
             end
             
             return self
@@ -82,7 +93,7 @@ module Rust::Plots
             Rust.exclusive do
                 pdf_function.call
                 self._show
-                self._run_plugins
+                self._render_others
                 Rust._eval("dev.off()")
             end
             
@@ -94,9 +105,9 @@ module Rust::Plots
             raise "You are trying to show a BasePlot"
         end
         
-        def _run_plugins()
-            @plugins.each do |plugin|
-                plugin._run()
+        def _render_others()
+            @renderables.each do |renderable|
+                renderable._render()
             end
             
             return self
@@ -106,7 +117,7 @@ module Rust::Plots
             result = @options.clone
             
             options.each do |key, value|
-                result[key] = value
+                result[key] = value if !result[key] || @override_options
             end
             
             result.select! { |k, v| v != nil }
@@ -221,7 +232,7 @@ module Rust::Plots
         end
     end
     
-    class Plugin
+    class Renderable
         def initialize
             @options = Rust::Options.new
         end
@@ -233,12 +244,12 @@ module Rust::Plots
         end
         
         protected
-        def _run()
-            raise "You are trying to run an abstract Plugin"
+        def _render()
+            raise "You are trying to run an abstract Renderable"
         end
     end
     
-    class Axis < Plugin
+    class Axis < Renderable
         BELOW = 1
         LEFT  = 2
         ABOVE = 3
@@ -276,7 +287,7 @@ module Rust::Plots
             return self
         end
         
-        def _run()
+        def _render()
             function = Rust::Function.new("axis")
             function.options = @options
             
@@ -286,7 +297,7 @@ module Rust::Plots
         end
     end
     
-    class Grid < Plugin
+    class Grid < Renderable
         def initialize
             super()
             
@@ -330,7 +341,7 @@ module Rust::Plots
             return self
         end
         
-        def _run()
+        def _render()
             function = Rust::Function.new("grid")
             
             function.arguments << @x
@@ -345,7 +356,30 @@ module Rust::Plots
 end
 
 module Rust::RBindings
-    def plot(x, y)
-        Rust::Plots::ScatterPlot.new(x, y).show
+    def plot(x, y=(1..x.size).to_a, **options)
+        result = Rust::Plots::ScatterPlot.new(x, y)
+        
+        options.each do |k, v|
+            result[k] = v
+        end
+        
+        result._do_not_override_options!
+        
+        result.show
+    end
+    
+    def boxplot(*args, **options)
+        result = Rust::Plots::BoxPlot.new
+        options.each do |k, v|
+            result[k] = v
+        end
+        
+        result._do_not_override_options!
+        
+        args.each do |s|
+            result.series(s)
+        end
+        
+        result.show
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rust
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Simone Scalabrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rinruby