geoptima 0.0.8 → 0.0.9

data/bin/csv_chart

@@ -5,15 +5,22 @@ $: << 'lib'
 $: << '../lib'
 
 require 'geoptima/chart'
+require 'geoptima/version'
 require 'geoptima/options'
 require 'fileutils'
 
+Geoptima::assert_version("0.0.9")
+
 $export_dir = '.'
+$diversity = 40.0
 
 $files = Geoptima::Options.process_args do |option|
   option.m {$merge_all = true}
+  option.a {$create_all = true}
   option.D {$export_dir = ARGV.shift}
   option.N {$merged_name = ARGV.shift}
+  option.S {$specfile = ARGV.shift}
+  option.P {$diversity = ARGV.shift.to_f}
 end
 
 FileUtils.mkdir_p $export_dir
@@ -21,12 +28,15 @@ FileUtils.mkdir_p $export_dir
 $help = true unless($files.length>0)
 if $help
   puts <<EOHELP
-Usage: csv_chart <-dhm> <-N name> <-D dir> files...
+Usage: csv_chart <-dham> <-S specfile> <-N name> <-D dir> files...
  -d  debug mode #{cw $debug}
  -h  print this help #{cw $help}
+ -a  automatically create charts for all properties #{cw $create_all}
  -m  merge all files into single stats #{cw $merge_all}
  -N  use specified name for merged dataset: #{$merged_name}
  -D  export charts to specified directory: #{$export_dir}
+ -S  use chart specification in specified file: #{$specfile}
+ -P  diversity threshold in percentage for automatic reports: #{$diversity}
 Files to import: #{$files.join(', ')}
 EOHELP
   exit
@@ -42,8 +52,16 @@ class Stats
     @data = fields.map{|h| []}
     @numerical = fields.map{|h| true}
   end
+  def add_header(h)
+    @headers << h
+    @stats << {}
+    @data << []
+    @numerical << true
+    @headers.length - 1
+  end
   def add(field,index)
-    if field =~ /\w/
+    puts "\tAdding field '#{field}' at index #{index}" if($debug)
+    if field && field =~ /\w/
       @numerical[index] &&= is_number?(field)
       puts "\tField[#{index}]: #{field}" if($debug)
       stats = @stats[index]
@@ -69,7 +87,7 @@ class Stats
     100.0 * @stats[index].length.to_f / @data[index].length.to_f
   end
   def diverse?(index)
-    @stats[index].length>500 || diversity(index) > 40.0
+    @stats[index].length>500 || diversity(index) > $diversity
   end
   def numerical?(index)
     @numerical[index]
@@ -78,6 +96,139 @@ end
 
 $stats = {}
 
+module Geoptima
+  class StatSpec
+    attr_reader :header, :index, :indices, :fields, :options, :proc
+    def initialize(header,*fields,&block)
+      @header = header
+      @fields = fields
+      @proc = block
+      if @fields[-1].is_a?(Hash)
+        @options = @fields.pop
+      else
+        @options = {}
+      end
+      puts "Created StatSpec: #{self}"
+    end
+    def mk_range(val)
+      if val =~ /\w/
+        div = options[:div].to_i
+        div = 1 if(div<1)
+        min = val.to_i/div * div
+        "#{min}..#{min+div}"
+      else
+        val
+      end
+    end
+    def map(values)
+      if @indices
+        puts "StatSpec[#{self}]: #{options.inspect}" if($debug)
+        vals = @indices.map{|i| values[i]}
+        if options[:div]
+          vals.map!{|v| mk_range(v)}
+        end
+        puts "StatSpec[#{self}]: #{vals.inspect}" if($debug)
+        val = proc.call(*vals)
+        puts "StatSpec[#{self}]: #{vals.inspect} --> #{val.inspect}" if($debug)
+        val
+      end
+    end
+    def prepare_indices(stats)
+      if stats.headers.index(header)
+        puts "Header '#{header}' already exists, cannot create #{self}"
+      else
+        @index = stats.add_header(header)
+        @indices = @fields.map{|h| stats.headers.index(h) || stats.headers.index(h.downcase) }
+        puts "#{self}: Header[#{@index}], Indices[#{@indices.join(',')}]" if($debug)
+        if @indices.compact.length < @fields.length
+          puts "Unable to find some headers for #{self}, ignoring stats"
+          @indices = nil
+        end
+      end
+    end
+    def to_s
+      "#{header}[#{index}]<-#{fields.inspect}(#{indices && indices.join(',')})"
+    end
+  end
+  class ChartSpec
+    attr_reader :chart_type, :header, :options
+    def initialize(chart_type,header,options={})
+      @header = header
+      @chart_type = chart_type
+      @options = options
+    end
+    def process(stats)
+      puts "Charting #{header} using stats.headers: #{stats.headers}"
+      index = stats.headers.index(header)
+      index ||= stats.headers.index(header.downcase)
+      unless index
+        puts "Cannot find statistics for '#{header}' - ignoring chart"
+        return
+      end
+      puts "Charting #{header} at index #{index} and options #{options.inspect}"
+      puts "Charting #{header} with diversity #{stats.diversity(index)}"
+      hist = stats.stats[index]
+      title = options[:title]
+      if options[:top]
+        keys = hist.keys.sort{|a,b| hist[b] <=> hist[a]}[0..(options[:top].to_i)]
+        title ||= "#{header} Top #{options[:top]}"
+      else
+        keys = hist.keys.sort{|a,b| a.to_i <=> b.to_i}
+      end
+      values = keys.map{|k| hist[k]}
+      title ||= "#{header} Distribution"
+      options.merge!( :title => title, :width => 1024 )
+      legend = $merge_all ? "ALL" : stats.name
+      g = Geoptima::Chart.send "draw_#{chart_type}_chart", stats.name, keys, values, options
+      g.write("#{$export_dir}/Chart_#{stats.name}_#{header}_distribution.png")
+    end
+    def to_s
+      "#{chart_type.upcase}-#{header}"
+    end
+  end
+  class StatsSpecs
+    attr_reader :chart_specs, :stat_specs
+    def initialize(specfile)
+      @chart_specs = []
+      @stat_specs = []
+      instance_eval(File.open(specfile).read)
+    end
+    def category_chart(header,options={})
+      chart(:category, header, options)
+    end
+    def histogram_chart(header,options={})
+      chart(:histogram, header, options)
+    end
+    def line_chart(header,options={})
+      chart(:line, header, options)
+    end
+    def chart(chart_type,header,options={})
+      @chart_specs << ChartSpec.new(chart_type,header,options)
+    end
+    def stats(header,*fields,&block)
+      @stat_specs << StatSpec.new(header,*fields,&block)
+    end
+    def add_stats(stats)
+      stat_specs.each do |stat_spec|
+        stat_spec.prepare_indices(stats)
+      end
+    end
+    def add_fields(stats,fields)
+      $specs.stat_specs.each do |stat_spec|
+        stats.add(
+          stat_spec.map(fields),
+          stat_spec.index
+        )
+      end
+    end
+    def to_s
+      "Charts[#{chart_specs.length}]: #{@chart_specs.join(', ')}"
+    end
+  end
+end
+
+$specfile && $specs = Geoptima::StatsSpecs.new($specfile)
+
 $files.each do |file|
   lines = 0
   filename = File.basename(file)
@@ -92,15 +243,22 @@ $files.each do |file|
       fields.each_with_index do |field,index|
         $stats[file].add(field,index)
       end
+      $specs && $specs.add_fields($stats[file],fields)
     elsif($merge_all && $stats.length>0)
       file = $stats.values[0].file
     else
       $stats[file] = Stats.new(filename,name,fields)
+      $specs && $specs.add_stats($stats[file])
     end
   end
 end
 
 $stats.each do |file,stats|
+  if $specs
+    $specs.chart_specs.each do |chart_spec|
+      chart_spec.process(stats)
+    end
+  else
   stats.headers.each_with_index do |header,index|
     puts "Charting #{header} with diversity #{stats.diversity(index)}"
     case header
@@ -136,7 +294,7 @@ $stats.each do |file,stats|
 
     else
       if stats.diverse?(index)
-        puts "Ingnoring high diversity field #{header}"
+        puts "Ignoring high diversity field #{header}"
       else
         puts "Charting field: #{header} with length #{stats.length(index)} and diversity #{stats.diversity(index)}"
         hist = stats.stats[index]
@@ -156,5 +314,6 @@ $stats.each do |file,stats|
       end
     end
   end
+  end
 end
 

data/bin/show_geoptima

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.0.8")
+Geoptima::assert_version("0.0.9")
 
 $debug=false
 

data/examples/csv_chart.rb

@@ -5,15 +5,22 @@ $: << 'lib'
 $: << '../lib'
 
 require 'geoptima/chart'
+require 'geoptima/version'
 require 'geoptima/options'
 require 'fileutils'
 
+Geoptima::assert_version("0.0.9")
+
 $export_dir = '.'
+$diversity = 40.0
 
 $files = Geoptima::Options.process_args do |option|
   option.m {$merge_all = true}
+  option.a {$create_all = true}
   option.D {$export_dir = ARGV.shift}
   option.N {$merged_name = ARGV.shift}
+  option.S {$specfile = ARGV.shift}
+  option.P {$diversity = ARGV.shift.to_f}
 end
 
 FileUtils.mkdir_p $export_dir
@@ -21,12 +28,15 @@ FileUtils.mkdir_p $export_dir
 $help = true unless($files.length>0)
 if $help
   puts <<EOHELP
-Usage: csv_chart <-dhm> <-N name> <-D dir> files...
+Usage: csv_chart <-dham> <-S specfile> <-N name> <-D dir> files...
  -d  debug mode #{cw $debug}
  -h  print this help #{cw $help}
+ -a  automatically create charts for all properties #{cw $create_all}
  -m  merge all files into single stats #{cw $merge_all}
  -N  use specified name for merged dataset: #{$merged_name}
  -D  export charts to specified directory: #{$export_dir}
+ -S  use chart specification in specified file: #{$specfile}
+ -P  diversity threshold in percentage for automatic reports: #{$diversity}
 Files to import: #{$files.join(', ')}
 EOHELP
   exit
@@ -42,8 +52,16 @@ class Stats
     @data = fields.map{|h| []}
     @numerical = fields.map{|h| true}
   end
+  def add_header(h)
+    @headers << h
+    @stats << {}
+    @data << []
+    @numerical << true
+    @headers.length - 1
+  end
   def add(field,index)
-    if field =~ /\w/
+    puts "\tAdding field '#{field}' at index #{index}" if($debug)
+    if field && field =~ /\w/
       @numerical[index] &&= is_number?(field)
       puts "\tField[#{index}]: #{field}" if($debug)
       stats = @stats[index]
@@ -69,7 +87,7 @@ class Stats
     100.0 * @stats[index].length.to_f / @data[index].length.to_f
   end
   def diverse?(index)
-    @stats[index].length>500 || diversity(index) > 40.0
+    @stats[index].length>500 || diversity(index) > $diversity
   end
   def numerical?(index)
     @numerical[index]
@@ -78,6 +96,139 @@ end
 
 $stats = {}
 
+module Geoptima
+  class StatSpec
+    attr_reader :header, :index, :indices, :fields, :options, :proc
+    def initialize(header,*fields,&block)
+      @header = header
+      @fields = fields
+      @proc = block
+      if @fields[-1].is_a?(Hash)
+        @options = @fields.pop
+      else
+        @options = {}
+      end
+      puts "Created StatSpec: #{self}"
+    end
+    def mk_range(val)
+      if val =~ /\w/
+        div = options[:div].to_i
+        div = 1 if(div<1)
+        min = val.to_i/div * div
+        "#{min}..#{min+div}"
+      else
+        val
+      end
+    end
+    def map(values)
+      if @indices
+        puts "StatSpec[#{self}]: #{options.inspect}" if($debug)
+        vals = @indices.map{|i| values[i]}
+        if options[:div]
+          vals.map!{|v| mk_range(v)}
+        end
+        puts "StatSpec[#{self}]: #{vals.inspect}" if($debug)
+        val = proc.call(*vals)
+        puts "StatSpec[#{self}]: #{vals.inspect} --> #{val.inspect}" if($debug)
+        val
+      end
+    end
+    def prepare_indices(stats)
+      if stats.headers.index(header)
+        puts "Header '#{header}' already exists, cannot create #{self}"
+      else
+        @index = stats.add_header(header)
+        @indices = @fields.map{|h| stats.headers.index(h) || stats.headers.index(h.downcase) }
+        puts "#{self}: Header[#{@index}], Indices[#{@indices.join(',')}]" if($debug)
+        if @indices.compact.length < @fields.length
+          puts "Unable to find some headers for #{self}, ignoring stats"
+          @indices = nil
+        end
+      end
+    end
+    def to_s
+      "#{header}[#{index}]<-#{fields.inspect}(#{indices && indices.join(',')})"
+    end
+  end
+  class ChartSpec
+    attr_reader :chart_type, :header, :options
+    def initialize(chart_type,header,options={})
+      @header = header
+      @chart_type = chart_type
+      @options = options
+    end
+    def process(stats)
+      puts "Charting #{header} using stats.headers: #{stats.headers}"
+      index = stats.headers.index(header)
+      index ||= stats.headers.index(header.downcase)
+      unless index
+        puts "Cannot find statistics for '#{header}' - ignoring chart"
+        return
+      end
+      puts "Charting #{header} at index #{index} and options #{options.inspect}"
+      puts "Charting #{header} with diversity #{stats.diversity(index)}"
+      hist = stats.stats[index]
+      title = options[:title]
+      if options[:top]
+        keys = hist.keys.sort{|a,b| hist[b] <=> hist[a]}[0..(options[:top].to_i)]
+        title ||= "#{header} Top #{options[:top]}"
+      else
+        keys = hist.keys.sort{|a,b| a.to_i <=> b.to_i}
+      end
+      values = keys.map{|k| hist[k]}
+      title ||= "#{header} Distribution"
+      options.merge!( :title => title, :width => 1024 )
+      legend = $merge_all ? "ALL" : stats.name
+      g = Geoptima::Chart.send "draw_#{chart_type}_chart", stats.name, keys, values, options
+      g.write("#{$export_dir}/Chart_#{stats.name}_#{header}_distribution.png")
+    end
+    def to_s
+      "#{chart_type.upcase}-#{header}"
+    end
+  end
+  class StatsSpecs
+    attr_reader :chart_specs, :stat_specs
+    def initialize(specfile)
+      @chart_specs = []
+      @stat_specs = []
+      instance_eval(File.open(specfile).read)
+    end
+    def category_chart(header,options={})
+      chart(:category, header, options)
+    end
+    def histogram_chart(header,options={})
+      chart(:histogram, header, options)
+    end
+    def line_chart(header,options={})
+      chart(:line, header, options)
+    end
+    def chart(chart_type,header,options={})
+      @chart_specs << ChartSpec.new(chart_type,header,options)
+    end
+    def stats(header,*fields,&block)
+      @stat_specs << StatSpec.new(header,*fields,&block)
+    end
+    def add_stats(stats)
+      stat_specs.each do |stat_spec|
+        stat_spec.prepare_indices(stats)
+      end
+    end
+    def add_fields(stats,fields)
+      $specs.stat_specs.each do |stat_spec|
+        stats.add(
+          stat_spec.map(fields),
+          stat_spec.index
+        )
+      end
+    end
+    def to_s
+      "Charts[#{chart_specs.length}]: #{@chart_specs.join(', ')}"
+    end
+  end
+end
+
+$specfile && $specs = Geoptima::StatsSpecs.new($specfile)
+
 $files.each do |file|
   lines = 0
   filename = File.basename(file)
@@ -92,15 +243,22 @@ $files.each do |file|
       fields.each_with_index do |field,index|
         $stats[file].add(field,index)
       end
+      $specs && $specs.add_fields($stats[file],fields)
     elsif($merge_all && $stats.length>0)
       file = $stats.values[0].file
     else
       $stats[file] = Stats.new(filename,name,fields)
+      $specs && $specs.add_stats($stats[file])
     end
   end
 end
 
 $stats.each do |file,stats|
+  if $specs
+    $specs.chart_specs.each do |chart_spec|
+      chart_spec.process(stats)
+    end
+  else
   stats.headers.each_with_index do |header,index|
     puts "Charting #{header} with diversity #{stats.diversity(index)}"
     case header
@@ -136,7 +294,7 @@ $stats.each do |file,stats|
 
     else
       if stats.diverse?(index)
-        puts "Ingnoring high diversity field #{header}"
+        puts "Ignoring high diversity field #{header}"
       else
         puts "Charting field: #{header} with length #{stats.length(index)} and diversity #{stats.diversity(index)}"
         hist = stats.stats[index]
@@ -156,5 +314,6 @@ $stats.each do |file,stats|
       end
     end
   end
+  end
 end
 

data/examples/show_geoptima.rb

@@ -7,7 +7,7 @@ $: << '../lib'
 require 'date'
 require 'geoptima'
 
-Geoptima::assert_version("0.0.8")
+Geoptima::assert_version("0.0.9")
 
 $debug=false
 

data/lib/geoptima/chart.rb

@@ -47,7 +47,8 @@ module Geoptima
     end
     def self.draw_histogram_chart(legend,keys,values,options={})
       puts "Creating a chart with legend #{legend} for #{keys.length} keys and #{values.length} values"
-      g = make_chart(:bar, options)
+      chart_type = options[:side] ? :side_bar : :bar
+      g = make_chart(chart_type, options)
       g.data(legend, values)
       g.minimum_value = 0
       g.labels = keys.inject({}){|a,v| a[a.length] = v;a}
@@ -91,6 +92,8 @@ module Geoptima
           @chart.hide_lines = !options[:show_lines]
         when 'bar'
           @chart = Gruff::Bar.new(options[:width])
+        when 'side_bar'
+          @chart = Gruff::SideBar.new(options[:width])
         else
           raise "Unsupported chart type: #{chart_type}"
         end

data/lib/geoptima/options.rb

@@ -45,6 +45,7 @@ module Geoptima
 
     def self.process_args(debug=nil)
       options = Options.new(debug)
+      options.add('v') {$print_version = true}
       options.add('d') {$debug = true}
       options.add('h') {$help = true}
       puts "Processing options: #{options}" if(debug)
@@ -58,6 +59,7 @@ module Geoptima
           options.args << arg
         end
       end
+      puts "Geoptima Gem Version: #{Geoptima::VERSION}" if($print_version)
       options.args
     end
 

data/lib/geoptima/version.rb

@@ -1,6 +1,6 @@
 module Geoptima
 
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 
   def self.version_as_int(ver)
     base = 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoptima
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-19 00:00:00 +01:00
-default_executable: 
+date: 2012-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -91,7 +90,6 @@ files:
 - CONTRIBUTORS
 - Gemfile
 - geoptima.gemspec
-has_rdoc: true
 homepage: http://github.com/craigtaverner/geoptima.rb
 licenses: []
 
@@ -129,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geoptima
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby access to Geoptima JSON files