analytica 0.0.12 → 0.0.13

data/lib/analytica.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), 'computation')
 require File.join(File.dirname(__FILE__), 'visualization')
 
 module Analytica
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 
   include Strict
 
@@ -15,8 +15,16 @@ module Analytica
 
   register_supertype(:dataset_array, dataset_array_handler)
 
+  string_array_2d_handler = proc do |data, context|
+    enforce_primitive!(Array, data, context)
+    data.each {|item| enforce!(:string_array, item, context)}
+  end
+
+  register_supertype(:string_array_2d, string_array_2d_handler)
+
   class DataSet < Array
     include Analytica::Computation
+    include Analytica::Visualization::Common
     include Analytica::Visualization::DataSet
 
     def initialize(datapoints=[])
@@ -45,11 +53,15 @@ module Analytica
   end
 
   class DataSystem < Array
+    include Analytica::Visualization::Common
     include Analytica::Visualization::DataSystem
 
     def initialize(datasets=[])
       enforce!(:dataset_array, datasets)
 
+      @labels = []
+      @labels_set = false
+
       super datasets
     end
 

data/lib/computation.rb

@@ -32,7 +32,7 @@ module Analytica
       sum.to_f / size
     end
 
-    def linear_mean(params)
+    def linear_mean(params={})
       enforce_map!({
         :bias => [:last, :first],
         :samples => :natural_number}, params)
@@ -56,7 +56,7 @@ module Analytica
       numerator / denominator
     end
 
-    def exponential_mean(params)
+    def exponential_mean(params={})
       enforce_map!({
         :bias => [:last, :first],
         :alpha => :numeric,
@@ -89,7 +89,7 @@ module Analytica
     end
 
 
-    def average_filter(params)
+    def average_filter(params={})
       enforce_map!({
         :decay => [:simple, :linear, :exponential],
         :offset => :natural_number, # offset from latest data point
@@ -130,7 +130,7 @@ module Analytica
 
     alias_method(:avg, :average_filter)
 
-    def moving_average(params)
+    def moving_average(params={})
       enforce_map!({
         :decay => [:simple, :linear, :exponential],
         :samples => :natural_number}, params)
@@ -150,7 +150,7 @@ module Analytica
       d.reverse
     end
 
-    def simple_moving_average(params)
+    def simple_moving_average(params={})
       enforce_map!({
         :samples => :natural_number}, params)
       moving_average(:decay => :simple, :samples => params[:samples])
@@ -158,7 +158,7 @@ module Analytica
 
     alias_method :sma, :simple_moving_average
 
-    def linear_moving_average(params)
+    def linear_moving_average(params={})
       enforce_map!({
         :samples => :natural_number}, params)
       moving_average(:decay => :linear, :samples => params[:samples])
@@ -166,7 +166,7 @@ module Analytica
 
     alias_method :lma, :linear_moving_average
 
-    def exponential_moving_average(params)
+    def exponential_moving_average(params={})
       enforce_map!({
         :samples => :integer,
         :alpha => :float}, params)

data/lib/visualization.rb

@@ -7,6 +7,37 @@ module Analytica
       {:width => 25, :spacing => 10, :group_spacing => 12}
     end
 
+    module Common
+      def set_title(params)
+        enforce_map!({
+          :title => :string,
+          :title_size => :natural_number,
+          :title_color => :hex_color}, params)
+
+        @title = params
+        @title_set = true
+      end
+
+      def common_options
+        options = {}
+
+        if @labels_set
+          label = {
+            :axis_with_labels => ['x', 'y'],
+            :axis_labels => [@labels, ["#{0}", "#{(datamax*0.25).to_i}", "#{(datamax*0.5).to_i}", "#{(datamax*0.75).to_i}", "#{datamax.to_i}"]]
+          }
+
+          options.merge!(label)
+        end
+
+        if @title_set
+          options.merge!(@title)
+        end
+
+        options
+      end
+    end
+
     module DataSet
       include Strict
 
@@ -21,7 +52,7 @@ module Analytica
       (max > 0) ? (1.25*max) : 1
       end
 
-      def to_linegraph(params)
+      def to_linegraph(params={})
         enforce_map!({
           :width => :natural_number,
           :height => :natural_number,
@@ -44,14 +75,6 @@ module Analytica
 
         options.merge!(base)
 
-        title = {
-          :title => params[:title],
-          :title_color => params[:title_color],
-          :title_size => params[:title_size]
-        }
-
-        #options.merge!(title)
-
         color = {
           :line_colors => params[:color],
           :background => params[:background_color],
@@ -60,19 +83,12 @@ module Analytica
 
         options.merge!(color)
 
-        label = {
-          :legend => ['x', 'y'], # TODO number of datasets
-          :axis_with_labels => ['x','r'], #TODO number of datasets
-          :axis_labels => [[],[]] # TODO
-        }
-        
-        
-        #options.merge!(label)
+        options.merge!(common_options)
 
         Gchart.line(options)
       end
 
-      def to_sparkline(params)
+      def to_sparkline(params={})
         enforce_map!({
           :width => :natural_number,
           :height => :natural_number,
@@ -95,14 +111,6 @@ module Analytica
 
         options.merge!(base)
 
-        title = {
-          :title => params[:title],
-          :title_color => params[:title_color],
-          :title_size => params[:title_size]
-        }
-
-        #options.merge!(title)
-
         color = {
           :line_colors => params[:color],
           :background => params[:background_color],
@@ -111,19 +119,13 @@ module Analytica
 
         options.merge!(color)
 
-        label = {
-          :legend => ['x', 'y'], # TODO number of datasets
-          :axis_with_labels => ['x','r'], #TODO number of datasets
-          :axis_labels => [[],[]] # TODO
-        }
-        
-        #options.merge!(label)
+        options.merge!(common_options)
 
         Gchart.sparkline(options)
       end
 
 
-      def to_bargraph(params)
+      def to_bargraph(params={})
         enforce_map!({
           :width => :natural_number,
           :height => :natural_number,
@@ -145,14 +147,6 @@ module Analytica
 
         options.merge!(base)
 
-        title = {
-          :title => params[:title],
-          :title_color => params[:title_color],
-          :title_size => params[:title_size]
-        }
-
-        #options.merge!(title)
-
         color = {
           :bar_colors => params[:color],
           :background => params[:background_color],
@@ -161,25 +155,26 @@ module Analytica
 
         options.merge!(color)
 
-        label = {
-          :legend => ['x', 'y'], # TODO number of datasets
-          :axis_with_labels => ['x','r'], #TODO number of datasets
-          :axis_labels => [[],[]] # TODO
-        }
-
-        #options.merge!(label)
-
+        options.merge!(common_options)
 
         return Gchart.bar(options)
       end
     end
 
     module DataSystem
+
+      def set_labels(labels)
+      enforce!(:string_array_2d, labels)
+
+        @labels = labels
+        @labels_set = true
+      end
+
       def datamax
         (self.map{|dset| dset.datamax}).max
       end
 
-      def to_linegraph(params)
+      def to_linegraph(params={})
         enforce_map!({
           :width => :natural_number,
           :height => :natural_number,
@@ -202,14 +197,6 @@ module Analytica
 
         options.merge!(base)
 
-        title = {
-          :title => params[:title],
-          :title_color => params[:title_color],
-          :title_size => params[:title_size]
-        }
-
-        #options.merge!(title)
-
         color = {
           :line_colors => params[:colors],
           :background => params[:background_color],
@@ -218,19 +205,12 @@ module Analytica
 
         options.merge!(color)
 
-        if @labels_set
-          label = {
-            :axis_with_labels => ['x', 'y' ,'r'],
-            :axis_labels => @labels
-          }
-
-          options.merge!(label)
-        end
+        options.merge!(common_options)
 
         Gchart.line(options)
       end
 
-      def to_bargraph(params)
+      def to_bargraph(params={})
         enforce_map!({
           :width => :natural_number,
           :height => :natural_number,
@@ -253,14 +233,6 @@ module Analytica
 
         options.merge!(base)
 
-        title = {
-          :title => params[:title],
-          :title_color => params[:title_color],
-          :title_size => params[:title_size]
-        }
-
-        #options.merge!(title)
-
         color = {
           :bar_colors => params[:colors],
           :background => params[:background_color],
@@ -269,14 +241,7 @@ module Analytica
 
         options.merge!(color)
 
-        label = {
-          :legend => ['x', 'y'], # TODO number of datasets
-          :axis_with_labels => ['x','r'], #TODO number of datasets
-          :axis_labels => [[],[]] # TODO
-        }
-
-        #options.merge!(label)
-
+        options.merge!(common_options)
 
         return Gchart.bar(options)
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytica
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Raeez Lorgat
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 +00:00
+date: 2010-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency