RubyGems - SimpleOutput - Versions diffs - 1.0.1 → 1.0.2 - Mend

SimpleOutput 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dabf64a2f40b67501750813071a68bb813282841
-  data.tar.gz: 2ee609d2217d23d835217e9e8e242c676ebebe41
+  metadata.gz: e7ebf0691394ba5cf34bb6e47d6afe3598e2fa03
+  data.tar.gz: 800416135fda502c21d9c79f957b91fe96b43c71
 SHA512:
-  metadata.gz: 5a749e77cb1011758d526d5ca52733d9476e27ba67b80626d30a09cb5b645de1f64ea182020f3f85b9f69d53854b62789ab599a7faac5d6759eda0e1c1ef1ca0
-  data.tar.gz: 6120f548b60baa12d598826aa5974fc6b9d63b6092dd7d2408ee579dd444865bd353f36a20738d800b73db2ac228a9cf3c3657df107e048c644a81a59188901f
+  metadata.gz: 1d59d2d9dc4fa97e42029ded815c5653ce715bc26b939c51b170688c7292c6e3d667cec2b6ef96493464a00466f6fd59e0cb67c97c1f4073bbcd78819afe3bd0
+  data.tar.gz: 8b2cd13fe965ed7678dfa315d280c52a0e443b6688cd50025d7a4976d3c282bfb11c6e65614998fdbcbad1aca1845168efc707ee41fa7b390b4dc72fc00c8dea

data/lib/simplechartkick.rb CHANGED Viewed

@@ -23,17 +23,34 @@ class SimpleChartkick < SimpleOutput::SimpleOutputPlugin
   def initialize(filename="results.html", title="Html Results Page", javascript_path="../include")
     super()
     @filename = filename
-    @chart_type = {}
+    @metadata = {}
     chartkick_path = javascript_path + ((javascript_path[-1] == "/") ? "chartkick.js" : "/chartkick.js");
     @html = "<html>\n<title>\n#{title}\n</title>\n<script src='http://www.google.com/jsapi'></script>\n
                 <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js'></script>
                 <script src='#{chartkick_path}'></script>\n<body>\n"
   end
+  def new_data_callback(name)
+    @metadata[name] = {'chart_type' => 'LineChart', 'bincount' => 10}
+  end
   def options_callback(options)
     if options.has_key?("chart_type")
-      @chart_type[@current_name] = options['chart_type']
+      @metadata[@current_name]['chart_type'] = options['chart_type']
+    end
+    if options.has_key?('histogram')
+      if options['histogram']
+        @metadata[@current_name]['chart_type'] = 'Histogram'
+      end
+    end
+    if options.has_key?('bincount')
+      @metadata[@current_name]['bincount'] = options['bincount']
+    end
+    if options.has_key?('ymin')
+      @metadata[@current_name]['ymin'] = options['ymin']
+    end
+    if options.has_key?('ymax')
+      @metadata[@current_name]['ymax'] = options['ymax']
     end
   end
@@ -120,9 +137,43 @@ class SimpleChartkick < SimpleOutput::SimpleOutputPlugin
     @js_block = ""
     self.getMultiSeriesHashes.each_pair do |(chart_name, chart_series)|
-      type = @chart_type.has_key?(chart_name) ? @chart_type[chart_name] : "LineChart"
+      if !@metadata.has_key?(chart_name)
+        @metadata[chart_name] = {'chart_type' => 'LineChart', 'bincount' => 10}
+      end
+      type = @metadata[chart_name].has_key?('chart_type') ? @metadata[chart_name]['chart_type'] : 'LineChart'
       if type == "PieChart"
         chart_series = chart_series[0]['data']
+      elsif type == "Histogram"
+        type = 'ColumnChart'
+        bins =  @metadata[chart_name]['bincount']
+        #Reorder data
+        chart_series.each do |series|
+          name = series['name']
+          series_data = series['data']
+          hist_data = {}
+          ypoints = []
+          series_data.each_pair do |(x, y)|
+            ypoints << y
+          end
+          min = @metadata[chart_name].has_key?('ymin') ? @metadata[chart_name]['ymin'] : ypoints.min
+          max = @metadata[chart_name].has_key?('ymax') ? @metadata[chart_name]['ymax'] : ypoints.max
+          width = (max.to_f-min.to_f)/bins.to_f
+          bins.times do |i|
+            index = (width*i).round(2)
+            hist_data[index] = 0
+            ypoints.delete_if do |value|
+              if value >= width*i && value < width*(i+1)
+                hist_data[index] += 1
+                true
+              else
+                false
+              end
+            end
+          end
+          series['data'] = hist_data
+        end
       end
       self.chart_div(chart_series, type, chart_name)
       if @annotations.has_key?(chart_name)

data/lib/simplelog.rb ADDED Viewed

@@ -0,0 +1,169 @@
+=begin
+SimpleCSV
+   Copyright 2014 Austen Higgins-Cassidy
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+=end
+require 'time'
+class SimpleLog < SimpleOutput::SimpleOutputPlugin
+   #Only supports annotation
+   def initialize(name = "log", format="txt")
+      filename = name + self.getTimestamp() + "." + format
+      @file = File.new(filename, "w")
+      @series_names = {}
+      @data_id = 0
+      @annotations = {}
+      @current_name = ""
+      @series_id = 0
+   end
+   def translate_name(name)
+         if name == nil
+            name = @current_name
+         end
+         return name
+      end
+   def setXData(data, name, options={})
+   end
+   def setYData(data, name, options={})
+   end
+   def newData( x=[], y=[],name=nil, options={})
+   end
+   #Interface Functions ===================================
+   def appendXY( x=[], y=[],name=nil, options={})
+      log_name(name)
+      log_var(x, "Appending X Data")
+      log_var(y, "Appending Y Data")
+   end
+   def setXY(x=[], y=[], name=nil, options={})
+      log_name(name)
+      log_var(x, "Setting X Data")
+      log_var(y, "Setting Y Data")
+   end
+   def appendPoints(points =[], name=nil, options={})
+      log_name(name)
+      log_var(points, "Appending (points)")
+   end
+   def setPoints(points = [], name=nil, options={})
+      log_name(name)
+      log_var(points, "Setting (points)")
+   end
+   def appendHash(hash = {}, name=nil, options={})
+      log_name(name)
+      log_var(hash, "Appending (hash)")
+   end
+   def setHash(hash ={}, name=nil, options={})
+      log_name(name)
+      log_var(hash, "Setting (hash)")
+   end
+   def setOptions(name=nil, options = {})
+      log_var(option, "Options")
+   end
+   def annotate(annotation, name=nil, options = {})
+      name = translate_name(name)
+      log(annotation, name)
+      self.options_callback(options)
+   end
+   def log(content, name = nil)
+      if name != nil
+         logtext = self.getTimestamp() + " #{name}: #{content}"
+      else
+         logtext = self.getTimestamp() + " #{content}"
+      end
+      puts logtext
+      @file.syswrite("#{logtext}\n")
+   end
+   def log_name(name = nil)
+      name = translate_name(name)
+      log("<For #{name}>:")
+   end
+   def log_var(var, name=nil)
+      log("value:", name)
+      str = parse_var(var,1)
+      puts str
+      @file.syswrite("#{str}\n")
+   end
+   def parse_var(var, indent)
+      string = ""
+      case var
+      when Hash
+         string += self.put_at_indent("Hash:", indent)
+         var.each_pair do |(key, value)|
+            string += self.put_at_indent(key.to_s, indent+1)
+            string += self.parse_var(value, indent+1)
+         end
+      when Array
+         string += self.put_at_indent("Array:", indent)
+         var.each do |value|
+            string += self.parse_var(value, indent+1)
+         end
+      when Numeric
+         string += self.put_at_indent(var.to_s, indent)
+      when String
+         string += self.put_at_indent(var, indent)
+      else
+         string += self.put_at_indent(var.to_s, indent)
+      end
+      string
+   end
+   def put_at_indent(content, indent)
+      string = ""
+      indent.times { string += "  "}
+      string += content + "\n"
+   end
+   def getTimestamp()
+      Time.now.strftime("%Y-%m-%d-%H%M%S")
+   end
+   def getDataAsPoints
+      [[0,0]]
+   end
+   def getDataAsXY
+      [[0],[0]]
+   end
+   def getSeriesHashes
+      {0 => 0}
+   end
+   def save()
+      @file.close
+   end
+end

data/lib/simpleoutput.rb CHANGED Viewed

@@ -182,6 +182,10 @@ module SimpleOutput
          self.options_callback(options)
       end
+      def setOptions(name=nil, options = {})
+         self.options_callback(options)
+      end
       #Internal Helpers
       def getDataAsPoints
          series_data = {}

data/lib/simpleplot.rb CHANGED Viewed

@@ -35,6 +35,27 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
     if options.has_key?('ylabel')
       @metadata[@current_name]['ylabel'] = options['ylabel']
     end
+    if options.has_key?('histogram')
+      @metadata[@current_name]['histogram'] = options['histogram']
+    end
+    if options.has_key?('xmin')
+      @metadata[@current_name]['xmin'] = options['xmin']
+    end
+    if options.has_key?('xmax')
+      @metadata[@current_name]['xmax'] = options['xmax']
+    end
+    if options.has_key?('ymin')
+      @metadata[@current_name]['ymin'] = options['ymin']
+    end
+    if options.has_key?('ymax')
+      @metadata[@current_name]['ymax'] = options['ymax']
+    end
+    if options.has_key?('bincount')
+      @metadata[@current_name]['bincount'] = options['binscount']
+    end
+    if options.has_key?('normalized')
+      @metadata[@current_name]['normalized'] = options['normalized']
+    end
   end
   def check_title(name, options)
@@ -47,7 +68,7 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
   end
   def new_data_callback(name)
-    @metadata[name] = {'xlabel' => 'x', 'ylabel' => 'y', 'xmin' => 0 , 'xmax' => 10, 'ymin' => 0, 'ymax' => 10, 'series_titles' => []}
+    @metadata[name] = {'length' => 0, 'xlabel' => 'x', 'ylabel' => 'y', 'xmin' => 0 , 'xmax' => 10, 'ymin' => 0, 'ymax' => 10, 'series_titles' => [], 'histogram' => false, 'bincount' => 10, 'normalized' => false}
   end
   def set_x_callback(data, name, options)
@@ -55,6 +76,7 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
     xmax = data.max
     @metadata[name]['xmin'] = xmin
     @metadata[name]['xmax'] = xmax
+    @metadata[name]['length'] = (@metadata[name]['length'] < data.size) ? data.size : @metadata[name]['length']
     check_title(name, options)
   end
@@ -71,8 +93,9 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
     ymin = y.min
     ymax = y.max
     if !@metadata.has_key?(name)
-      new_series_callback(name)
+      new_data_callback(name)
     end
+    @metadata[name]['length'] = @metadata[name]['length'] < x.size ? x.size : @metadata[name]['length']
     @metadata[name]['xmin'] = xmin < @metadata[name]['xmin'] ? xmin : @metadata[name]['xmin']
     @metadata[name]['xmax'] = xmax > @metadata[name]['xmax'] ? xmax : @metadata[name]['xmax']
     @metadata[name]['ymin'] = ymin < @metadata[name]['ymin'] ? ymin : @metadata[name]['ymin']
@@ -94,14 +117,39 @@ class SimplePlot < SimpleOutput::SimpleOutputPlugin
           plot.xlabel @metadata[set_name]['xlabel']
           plot.ylabel @metadata[set_name]['ylabel']
-          plot.xrange "[#{@metadata[set_name]['xmin']}:#{@metadata[set_name]['xmax']}]"
-          plot.yrange "[#{@metadata[set_name]['ymin']}:#{@metadata[set_name]['ymax']}]"
           plot.data = []
+          if @metadata[set_name]['histogram']
+            size = @metadata[set_name]['length']
+            bins = @metadata[set_name]['bincount']
+            max = @metadata[set_name]['ymax']
+            min = @metadata[set_name]['ymin']
+            width = (max-min).to_f/bins.to_f
+            #bins = size.to_f/width.to_f
+            plot.yrange '[0:]'
+            plot.xrange "[#{min}:#{max}]"
+            plot.set('boxwidth',width*0.9)
+            plot.set('offset', 'graph 0.05,0.05,0.05,0.0')
+            plot.set('xtics' " #{min}, #{width.to_f}, #{max}")
+            plot.set('tics', 'out nomirror')
+            plot.set('style', 'fill solid 0.5')
+          else
+            plot.xrange "[#{@metadata[set_name]['xmin']}:#{@metadata[set_name]['xmax']}]"
+            plot.yrange "[#{@metadata[set_name]['ymin']}:#{@metadata[set_name]['ymax']}]"
+          end
           series.each_with_index do |line, index|
+            if @metadata[set_name]['histogram']
+              line = line[1]
+            end
             d = Gnuplot::DataSet.new(line)
             d.title = @metadata[set_name]['series_titles'][index]
-            d.with = "linespoints"
-            d.linewidth = 2
+            if @metadata[set_name]['histogram']
+              d.using = "(#{width}*floor($1/#{width})+#{width}/2.0):(1.0) smooth freq w boxes lc rgb\"blue\""
+            else
+               d.with = "linespoints"
+               d.linewidth = 2
+            end
             plot.data << d
           end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: SimpleOutput
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Austen Higgins-Cassidy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies: []
 description: A pluging based graphing and report rendering system with multiple simultanous
   output systems supported
@@ -20,6 +20,7 @@ files:
 - LICENSE
 - include/chartkick.js
 - lib/simplechartkick.rb
+- lib/simplelog.rb
 - lib/simpleoutput.rb
 - lib/simpleplot.rb
 homepage: https://github.com/Plasmarobo/simpleoutput