flight 0.0.19 → 0.0.20

data/lib/flight/carbon_model.rb

@@ -66,19 +66,41 @@ module BrighterPlanet
                 passengers + flight_segment.passengers
               end
 
-              m3 = flight_segments.inject(0) do |m3, flight_segment|
-                aircraft = Aircraft.find_by_bts_aircraft_type_code flight_segment.bts_aircraft_type_code
-                m3 + (aircraft.m3 * flight_segment.passengers)
+              flight_segment_aircraft = flight_segments.inject({}) do |hsh, flight_segment|
+                bts_code = flight_segment.bts_aircraft_type_code
+                key = flight_segment.row_hash
+                hsh[key] = Aircraft.find_by_bts_aircraft_type_code bts_code
+                hsh
               end
               
-              m2 = flight_segments.inject(0) do |m2, flight_segment|
-                aircraft = Aircraft.find_by_bts_aircraft_type_code flight_segment.bts_aircraft_type_code
-                m2 + (aircraft.m2 * flight_segment.passengers)
+              if flight_segment_aircraft.values.map(&:m3).any?
+                m3 = flight_segments.inject(0) do |m3, flight_segment|
+                  aircraft = flight_segment_aircraft[flight_segment.row_hash]
+                  aircraft_m3 = aircraft.m3 || 0
+                  m3 + (aircraft_m3 * flight_segment.passengers)
+                end
+              else
+                m3 = Aircraft.fallback.m3
+              end
+              
+              if flight_segment_aircraft.values.map(&:m2).any?
+                m2 = flight_segments.inject(0) do |m2, flight_segment|
+                  aircraft = Aircraft.find_by_bts_aircraft_type_code flight_segment.bts_aircraft_type_code
+                  aircraft_m2 = aircraft.m2 || 0
+                  m2 + (aircraft_m2 * flight_segment.passengers)
+                end
+              else
+                m2 = Aircraft.fallback.m2
               end
 
-              m1 = flight_segments.inject(0) do |m1, flight_segment|
-                aircraft = Aircraft.find_by_bts_aircraft_type_code flight_segment.bts_aircraft_type_code
-                m1 + (aircraft.m1 * flight_segment.passengers)
+              if flight_segment_aircraft.values.map(&:m1).any?
+                m1 = flight_segments.inject(0) do |m1, flight_segment|
+                  aircraft = Aircraft.find_by_bts_aircraft_type_code flight_segment.bts_aircraft_type_code
+                  aircraft_m1 = aircraft.m1 || 0
+                  m1 + (aircraft_m1 * flight_segment.passengers)
+                end
+              else
+                m1 = Aircraft.fallback.m1
               end
 
               endpoint_fuel = flight_segments.inject(0) do |endpoint_fuel, flight_segment|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flight
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -04:00
+date: 2010-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,12 +141,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 14
-        version: 0.1.14
+        - 2
+        - 0
+        version: 0.2.0
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -182,7 +182,6 @@ files:
 - lib/flight/characterization.rb
 - lib/flight/data.rb
 - lib/flight/summarization.rb
-- lib/test_support/db/schema.rb
 - lib/test_support/flight_record.rb
 - README.markdown
 - features/support/env.rb
@@ -226,5 +225,4 @@ test_files:
 - features/support/env.rb
 - features/flight_committees.feature
 - features/flight_emissions.feature
-- lib/test_support/db/schema.rb
 - lib/test_support/flight_record.rb

data/lib/test_support/db/schema.rb

@@ -1,26 +0,0 @@
-require 'sniff/database'
-
-Sniff::Database.define_schema do
-  create_table "flight_records", :force => true do |t|
-    t.date     "date"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.float    "distance_estimate"
-    t.integer  "seats_estimate"
-    t.float    "load_factor"
-    t.time     "time_of_day"
-    t.integer  "year"
-    t.integer  "emplanements_per_trip"
-    t.integer  "trips"
-    t.string   "origin_airport_id"
-    t.string   "destination_airport_id"
-    t.string   "distance_class_id"
-    t.string   "aircraft_id"
-    t.string   "aircraft_class_id"
-    t.string   "propulsion_id"
-    t.string   "fuel_type_id"
-    t.string   "airline_id"
-    t.string   "seat_class_id"
-    t.string   "domesticity_id"
-  end
-end