earth 0.3.1 → 0.3.2

data/lib/earth/air/flight_segment/data_miner.rb

@@ -164,7 +164,7 @@ FlightSegment.class_eval do
       integer  'departures_performed'
       integer  'passengers'
       integer  'total_seats'
-      float    'payload'        # this needs to be a float because the import includes a units conversion
+      float    'payload'        # theoretical max freight + mail + passengers; needs to be a float because the import includes a units conversion
       string   'payload_units'
       float    'freight'        # this needs to be a float because the import includes a units conversion
       string   'freight_units'
@@ -299,8 +299,8 @@ FlightSegment.class_eval do
       end
     end
     
-    process "Derive freight share as a fraction of payload" do
-      update_all 'freight_share = (freight + mail) / payload', 'payload > 0'
+    process "Derive freight share as a fraction of the total weight carried" do
+      update_all 'freight_share = (freight + mail) / (freight + mail + (passengers * 90.718474))', '(freight + mail + passengers) > 0'
     end
     
     process "Derive load factor, which is passengers divided by the total seats available" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -19,233 +20,15 @@ cert_chain: []
 date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: earth
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta4
-        version: 3.0.0.beta4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: data_miner
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 6
-        version: 0.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: falls_back_on
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: geokit
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: cohort_scope
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 7
-        version: 0.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: conversions
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 5
-        version: 1.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: weighted_average
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: loose_tight_dictionary
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 8
-        version: 0.0.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 17
-        version: 2.0.0.beta.17
-  type: :development
-  prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :development
   prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: -1848230024
         segments: 
         - 3
         - 0
@@ -253,120 +36,128 @@ dependencies:
         - beta4
         version: 3.0.0.beta4
   type: :runtime
-  prerelease: false
-  version_requirements: *id016
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: data_miner
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 5
         - 6
         version: 0.5.6
   type: :runtime
-  prerelease: false
-  version_requirements: *id017
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: falls_back_on
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 0
         - 3
         version: 0.0.3
   type: :runtime
-  prerelease: false
-  version_requirements: *id018
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: geokit
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
         version: 1.5.0
   type: :runtime
-  prerelease: false
-  version_requirements: *id019
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cohort_scope
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 0
         - 7
         version: 0.0.7
   type: :runtime
-  prerelease: false
-  version_requirements: *id020
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: conversions
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 4
         - 5
         version: 1.4.5
   type: :runtime
-  prerelease: false
-  version_requirements: *id021
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: weighted_average
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
         - 4
         version: 0.0.4
   type: :runtime
-  prerelease: false
-  version_requirements: *id022
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: loose_tight_dictionary
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 0
         - 8
         version: 0.0.8
   type: :runtime
-  prerelease: false
-  version_requirements: *id023
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196417
         segments: 
         - 2
         - 0
@@ -375,77 +166,81 @@ dependencies:
         - 17
         version: 2.0.0.beta.17
   type: :development
-  prerelease: false
-  version_requirements: *id024
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id025
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
         - 5
         - 0
         version: 1.5.0
   type: :development
-  prerelease: false
-  version_requirements: *id026
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id027 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id027
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id028 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id028
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &id029 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
         - 0
         version: 1.3.0
   type: :development
-  prerelease: false
-  version_requirements: *id029
+  version_requirements: *id014
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables: []
@@ -630,18 +425,18 @@ files:
 - vendor/geokit-rails/test/schema.rb
 - vendor/geokit-rails/test/tasks.rake
 - vendor/geokit-rails/test/test_helper.rb
-- Gemfile
-- Gemfile.lock
 - spec/earth/air/aircraft_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
+- Gemfile
+- Gemfile.lock
 has_rdoc: true
 homepage: http://github.com/brighterplanet/earth
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -649,7 +444,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 408286639
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -658,6 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -669,8 +465,8 @@ signing_key:
 specification_version: 3
 summary: Land, sky, and sea
 test_files: 
-- Gemfile
-- Gemfile.lock
 - spec/earth/air/aircraft_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
+- Gemfile
+- Gemfile.lock