geoptima 0.0.1 → 0.0.2

data/README.rdoc

@@ -20,7 +20,7 @@ This script simply imports the JSON files on the command-line and then:
 
 Which event types to include and various other options are available using the command-line. Run it with the -h option to get a full list of options. The current version should support:
 
-Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file <files>
+  Usage: ./show_geoptima.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file <files>
   -d  debug mode (output more context during processing) (false)
   -p  print mode (print out final results to console) 
   -v  verbose mode (output extra information to console) 
@@ -31,7 +31,7 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -E  comma-seperated list of event types to show and export (default: all; current: )
   -T  time range to limit results to (default: all; current: )
 
-Currently the script also locates events that are close enough in time to GPS events.
+Currently the script also locates events that are close enough in time to GPS events. We hope to improve this with interpolation in the near future to be more compatible with the results from the commercial solutions.
 
 == show_geoptima_sos.rb
 
@@ -54,9 +54,9 @@ The examples directory includes a few sample Ruby scripts for various import/exp
 
   git clone git@github.com:craigtaverner/geoptima.rb.git
   cd geoptima.rb/examples
-  ./geoptima.rb -x craig.json
+  ./show_geoptima.rb -x sample_geoptima.json
 
-This should produce a file called ####.txt containing a CSV version of the Geoptima events for importing into Excel or OpenOffice.Calc for further processing.
+This should produce a file called 357841036600753.csv containing a CSV version of the Geoptima events for importing into Excel or OpenOffice.Calc for further processing. The number is the IMEI of the phone used, and if you process many JSON files in one go, you will get as many output files as there are phones represented by the data.
 
 === Contributing
 

data/examples/show_geoptima.rb

@@ -17,7 +17,7 @@ def cw(val)
   val.nil? ? '' : "(#{val})"
 end
 
-while arg=ARGV.shift:
+while arg=ARGV.shift do
   if arg =~ /^\-(\w+)/
     $1.split(//).each do |aa|
       case aa
@@ -33,6 +33,8 @@ while arg=ARGV.shift:
         $export=true
       when 's'
         $seperate=true
+      when 'o'
+        $export_stats=true
       when 'E'
         $event_names += ARGV.shift.split(/[\,\;\:\.]+/)
       when 'T'
@@ -63,6 +65,7 @@ Usage: ./showGeoptimaEvents.rb <-dvxEh> <-L limit> <-E types> <-T min,max> file
   -p  print mode (print out final results to console) #{cw $print}
   -v  verbose mode (output extra information to console) #{cw $verbose}
   -x  export IMEI specific CSV files for further processing #{cw $export}
+  -o  export field statistis #{cw $export_stats}
   -s  seperate the export files by event type #{cw $seperate}
   -h  show this help
   -L  limit verbose output to specific number of lines #{cw $print_limit}
@@ -76,8 +79,9 @@ $verbose = $verbose || $debug
 $datasets = Geoptima::Dataset.make_datasets($files, :locate => true, :time_range => $time_range)
 
 class Export
-  attr_reader :files, :names, :headers
+  attr_reader :files, :imei, :names, :headers
   def initialize(imei,names,dataset)
+    @imei = imei
     @names = names
     if $export
       if $seperate
@@ -91,6 +95,7 @@ class Export
     end
     @headers = names.inject({}) do |a,name|
       a[name] = dataset.header([name]).reject{|h| h === 'timeoffset'}
+      a[name] = a[name].map{|h| "#{name}.#{h}"} unless($separate)
       puts "Created header for name #{name}: #{a[name].join(',')}" if($debug)
       a
     end
@@ -104,6 +109,17 @@ class Export
       end
     end
   end
+  def export_stats(stats)
+    File.open("#{imei}_stats.csv",'w') do |out|
+      stats.keys.sort.each do |header|
+        out.puts header
+        values = stats[header].keys.sort
+        out.puts values.join("\t")
+        out.puts values.map{|v| stats[header][v]}.join("\t")
+        out.puts
+      end
+    end
+  end
   def header(name=nil)
     @headers[name]
   end
@@ -146,6 +162,7 @@ $datasets.keys.sort.each do |imei|
     names = $event_names
     names = dataset.events_names if(names.length<1)
     export = Export.new(imei,names,dataset)
+    export.export_stats(dataset.stats) if($export_stats)
     events.each do |event|
       names.each do |name|
         if event.name === name

data/geoptima.gemspec

@@ -22,10 +22,11 @@ then rather consider the NetView and Customer IQ applications from AmanziTel at
 EOF
 
   s.require_path = 'lib'
-  s.files        = Dir.glob("{bin,lib,examples}/**/*").reject{|x| x=~/(tmp|target|test-data)/} + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile geoptima.gemspec)
+  s.files        = Dir.glob("{bin,lib,examples}/**/*").reject{|x| x=~/(tmp|target|test-data|kurt|357|012)/} + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile geoptima.gemspec)
   s.executables  = ['show_geoptima']
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options = ["--quiet", "--title", "geoptima.rb", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
-  s.required_ruby_version = ">= 1.8.7"
+  s.add_dependency('json',">= 1.6.5")
+  s.required_ruby_version = ">= 1.8.6"
 end

data/lib/geoptima/data.rb

@@ -54,7 +54,7 @@ module Geoptima
       utc.strftime("%Y-%m-%d %H:%M:%S.%3N")
     end
     def [](key)
-      @fields[key]
+      @fields[key] || @fields[key.gsub(/#{name}\./,'')]
     end
     def -(other)
       (self.time - other.time) * SPERDAY
@@ -81,10 +81,12 @@ module Geoptima
       @path = path
       @json = JSON.parse(File.read(path))
       if $debug
-        puts "Read Geoptima: #{geoptima}"
+        puts "Read Geoptima: #{geoptima.to_json}"
         puts "\tSubscriber: #{subscriber.to_json}"
         puts "\tIMSI: #{imsi}"
         puts "\tIMEI: #{imei}"
+        puts "\tMCC: #{subscriber['MCC']}"
+        puts "\tMNC: #{subscriber['MNC']}"
         puts "\tStart: #{start}"
       end
     end
@@ -131,9 +133,14 @@ module Geoptima
       events.keys.sort
     end
     def make_hash(name)
+      puts "About to process json hash: #{geoptima[name].to_json}" if($debug)
       geoptima[name].inject({}) do |a,md|
-        key = md.keys[0]
-        a[key]=md[key]
+        if md.respond_to? 'keys'
+          key = md.keys[0]
+          a[key]=md[key]
+        else
+          puts "Invalid hash format for '#{name}': #{md.to_json[0..70]}..."
+        end
         a
       end
     end
@@ -252,6 +259,28 @@ module Geoptima
       end.flatten
     end
 
+    def stats
+      merge_events unless @sorted
+      unless @stats
+        @stats = {}
+        event_count = 0
+        sorted.each do |event|
+          event_count += 1
+          event.header.each do |field|
+            key = "#{event.name}.#{field}"
+            value = event[field]
+            @stats[key] ||= {}
+            @stats[key][value] ||= 0
+            @stats[key][value] += 1
+          end
+        end
+      end
+      @stats.reject! do |k,v|
+        v.length > 500 || v.length > 10 && v.length > event_count / 2
+      end
+      @stats
+    end
+
     def events_names
       @data.map{ |v| v.events_names }.flatten.uniq.sort
     end
@@ -280,6 +309,7 @@ module Geoptima
       prev_gps = nil
       sorted.each do |event|
         if event.name === 'gps'
+          event.locate(event)
           prev_gps = event
         elsif prev_gps
           event.locate_if_closer_than(prev_gps,60)

data/lib/geoptima/version.rb

@@ -1,3 +1,3 @@
 module Geoptima
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geoptima
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Craig Taverner
@@ -15,9 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 Z
-dependencies: []
-
+date: 2012-03-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 6
+        - 5
+        version: 1.6.5
+  type: :runtime
+  version_requirements: *id001
 description: |
   Geoptima is a suite of applications for measuring and locating mobile/cellular subscriber experience on GPS enabled smartphones.
   It is produced by AmanziTel AB in Helsingborg, Sweden, and supports many phone manufacturers, with free downloads from the
@@ -70,12 +85,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
+      hash: 59
       segments: 
       - 1
       - 8
-      - 7
-      version: 1.8.7
+      - 6
+      version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: