flight 0.0.21 → 0.0.22

data/features/flight_committees.feature

@@ -5,7 +5,7 @@ Feature: Flight Committee Calculations
     Given a flight emitter
     And a characteristic "origin_airport.iata_code" of "AIA"
     When the "cohort" committee is calculated
-    Then the conclusion of the committee should have a record with "count" equal to "1"
+    Then the conclusion of the committee should have a record with "count" equal to "2"
 
   Scenario: Cohort committee from t100 with no usable characteristics
     Given a flight emitter
@@ -76,7 +76,7 @@ Feature: Flight Committee Calculations
     Given a flight emitter
     When the "freight_share" committee is calculated
     Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "0.06391"
+    And the conclusion of the committee should be "0.07065"
 
   Scenario: Fuel type committee from default
     Given a flight emitter
@@ -177,7 +177,7 @@ Feature: Flight Committee Calculations
     Given a flight emitter
     When the "load_factor" committee is calculated
     Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "0.86667"
+    And the conclusion of the committee should be "0.85"
 
   Scenario Outline: Seats committee from aircraft
     Given a flight emitter
@@ -220,7 +220,7 @@ Feature: Flight Committee Calculations
     Given a flight emitter
     When the "seats" committee is calculated
     Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "116"
+    And the conclusion of the committee should be "118"
 
   Scenario: Passengers committee
     Given a flight emitter
@@ -268,7 +268,7 @@ Feature: Flight Committee Calculations
     And the conclusion of the committee should have a record with "endpoint_fuel" equal to "<b>"
     Examples:
       | origin | m3 | m2 | m1  | b |
-      | AIA    | 0  | 0  | 2   | 0 |
+      | AIA    | 0  | 0  | 1   | 0 |
 
   Scenario Outline: Fuel use coefficients committee from default
     Given a flight emitter

data/features/flight_emissions.feature

@@ -11,4 +11,4 @@ Feature: Flight Emissions Calculations
     Then the emission value should be within "0.1" kgs of "<emission>"
     Examples:
       | source | dest | airline | date       | aircraft | emission |
-      | DCA    | JFK  | AA      | 2010-06-25 | 1        | 146.7    |
+      | DCA    | JFK  | AA      | 2010-06-25 | 1        | 148.4    |

data/lib/flight/carbon_model.rb

@@ -69,7 +69,8 @@ module BrighterPlanet
               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
+                aircraft = Aircraft.find_by_bts_aircraft_type_code bts_code
+                hsh[key] = aircraft if aircraft
                 hsh
               end
               
@@ -103,9 +104,14 @@ module BrighterPlanet
                 m1 = Aircraft.fallback.m1
               end
 
-              endpoint_fuel = flight_segments.inject(0) do |endpoint_fuel, flight_segment|
-                aircraft = Aircraft.find_by_bts_aircraft_type_code flight_segment.bts_aircraft_type_code
-                endpoint_fuel + (aircraft.endpoint_fuel * flight_segment.passengers)
+              if flight_segment_aircraft.values.map(&:endpoint_fuel).any?
+                endpoint_fuel = flight_segments.inject(0) do |endpoint_fuel, flight_segment|
+                  aircraft = flight_segment_aircraft[flight_segment.row_hash]
+                  aircraft_epfuel = aircraft.andand.endpoint_fuel || 0
+                  endpoint_fuel + (aircraft_epfuel * flight_segment.passengers)
+                end
+              else
+                endpoint_fuel = Aircraft.fallback.endpoint_fuel
               end
 
               if [m3, m2, m1, endpoint_fuel, passengers].any?(&:nonzero?)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flight
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Andy Rossmeissl