RubyGems - flight - Versions diffs - 0.0.17 → 0.0.18 - Mend

flight 0.0.17 → 0.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

data/features/flight_committees.feature +224 -147
data/features/flight_emissions.feature +3 -4
data/lib/flight/carbon_model.rb +85 -54
data/lib/flight/data.rb +1 -3
metadata +47 -47

data/features/flight_committees.feature CHANGED Viewed

@@ -3,13 +3,13 @@ Feature: Flight Committee Calculations
   Scenario: Cohort committee from t100 with usable characteristics
     Given a flight emitter
-    And a characteristic "origin_airport.iata_code" of "DTW"
+    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 "34"
+    Then the conclusion of the committee should have a record with "count" equal to "1"
   Scenario: Cohort committee from t100 with no usable characteristics
     Given a flight emitter
-    And a characteristic "seat_class.name" of "business"
+    And a characteristic "origin_airport.iata_code" of "XXX"
     When the "cohort" committee is calculated
     Then the conclusion of the committee should be nil
@@ -18,19 +18,16 @@ Feature: Flight Committee Calculations
     And a characteristic "timeframe" of "<timeframe>"
     When the "date" committee is calculated
     Then the committee should have used quorum "from timeframe"
-    And the conclusion of the committee should be "<from>"
+    And the conclusion of the committee should be "<date>"
     Examples:
-      | timeframe             | from       |
+      | timeframe             | date       |
       | 2010-07-15/2010-07-20 | 2010-07-15 |
-  Scenario Outline: Date committee from nil timeframe
+  Scenario: Date committee from nil timeframe
     Given a flight emitter
-    And a characteristic "timeframe" of "<timeframe>"
+    And a characteristic "timeframe" of ""
     When the "date" committee is calculated
-    Then the conclusion of the committee should be "<from>"
-    Examples:
-      | timeframe             | from       |
-      |                       |            |
+    Then the conclusion of the committee should be nil
   Scenario Outline: Date committee from creation date
     Given a flight emitter
@@ -50,9 +47,7 @@ Feature: Flight Committee Calculations
     And the conclusion of the committee should be "<multiplier>"
     Examples:
       | seat_class | multiplier |
-      | business   | 1.69       |
-      | economy    | 0.94       |
-      | first      | 1.47       |
+      | economy    | 1.00       |
   Scenario: Seat class multiplier committee from default
     Given a flight emitter
@@ -60,193 +55,275 @@ Feature: Flight Committee Calculations
     Then the committee should have used quorum "default"
     And the conclusion of the committee should be "1.0"
-  Scenario Outline: Domesticity committee from airline for domestic airlines
+  Scenario: Trips committee
     Given a flight emitter
-    And a characteristic "airline.name" of "<airline>"
-    When the "domesticity" committee is calculated
-    Then the committee should have used quorum "from airline"
-    And the conclusion of the committee should have a record with "name" equal to "<domesticity>"
-    Examples:
-      | airline          | domesticity                     |
-      | Midwest Aviation | Domestic Data, US Carriers Only |
+    When the "trips" committee is calculated
+    Then the conclusion of the committee should be "1.941"
-  Scenario Outline: Domesticity committee from airline for international airlines
+  Scenario Outline: Freight share committee from cohort
     Given a flight emitter
-    And a characteristic "airline.name" of "<airline>"
-    When the "domesticity" committee is calculated
-    Then the conclusion of the committee should be nil
+    And a characteristic "origin_airport.iata_code" of "<origin>"
+    When the "cohort" committee is calculated
+    And the "freight_share" committee is calculated
+    Then the committee should have used quorum "from cohort"
+    And the conclusion of the committee should be "<freight share>"
     Examples:
-      | airline          |
-      | Aeroflot         |
-      | United Airlines  |
+      | origin | freight share |
+      | ADA    | 0.0099        |
+      | AIA    | 0.09091       |
-  Scenario Outline: Domesticity committee from destination airport for domestic airports
+  Scenario: Freight share committee from default
     Given a flight emitter
-    And a characteristic "destination_airport.iata_code" of "<iata_code>"
-    When the "domesticity" committee is calculated
-    Then the committee should have used quorum "from destination"
-    And the conclusion of the committee should have a record with "name" equal to "<domesticity>"
-    Examples:
-      | iata_code | domesticity                     |
-      | ALO       | Domestic Data, US Carriers Only |
-      | TXK       | Domestic Data, US Carriers Only |
+    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"
-  Scenario Outline: Domesticity committee from destination airport for international airports
+  Scenario: Fuel type committee from default
     Given a flight emitter
-    And a characteristic "destination_airport.iata_code" of "<iata_code>"
-    When the "domesticity" committee is calculated
-    Then the conclusion of the committee should be nil
-    Examples:
-      | iata_code        |
-      | DTW              |
-      | IAD              |
-      | GRR              |
+    When the "fuel_type" committee is calculated
+    Then the conclusion of the committee should have a record with "emission_factor" equal to "2.52714"
-  Scenario Outline: Domesticity committee from origin airport for domestic airports
+  Scenario: Emission factor committee
     Given a flight emitter
-    And a characteristic "origin_airport.iata_code" of "<iata_code>"
-    When the "domesticity" committee is calculated
-    Then the committee should have used quorum "from origin"
-    And the conclusion of the committee should have a record with "name" equal to "<domesticity>"
-    Examples:
-      | iata_code | domesticity                     |
-      | ALO       | Domestic Data, US Carriers Only |
-      | TXK       | Domestic Data, US Carriers Only |
+    When the "fuel_type" committee is calculated
+    And the "emission_factor" committee is calculated
+    Then the conclusion of the committee should be "3.1293"
-  Scenario Outline: Domesticity committee from destination for international airports
+  Scenario: Radiative forcing index committee
     Given a flight emitter
-    And a characteristic "destination_airport.iata_code" of "<iata_code>"
-    When the "domesticity" committee is calculated
-    Then the conclusion of the committee should be nil
-    Examples:
-      | iata_code        |
-      | DTW              |
-      | IAD              |
-      | GRR              |
+    When the "fuel_type" committee is calculated
+    And the "radiative_forcing_index" committee is calculated
+    Then the conclusion of the committee should be "2"
+  Scenario: Emplanements per trip committee from default
+    Given a flight emitter
+    When the "emplanements_per_trip" committee is calculated
+    Then the conclusion of the committee should be "1.67"
-  Scenario Outline: Domesticity committee from airports for domestic route
+  Scenario Outline: Distance committee from airports
     Given a flight emitter
     And a characteristic "origin_airport.iata_code" of "<origin>"
     And a characteristic "destination_airport.iata_code" of "<destination>"
-    When the "domesticity" committee is calculated
-    Then the committee should have used quorum "from origin"
-    And the conclusion of the committee should have a record with "name" equal to "<domesticity>"
+    When the "distance" committee is calculated
+    Then the committee should have used quorum "from airports"
+    And the conclusion of the committee should be "<distance>"
     Examples:
-      | origin | destination | domesticity                     |
-      | DTW    | SFO         | Domestic Data, US Carriers Only |
+      | origin | destination | distance |
+      | ADA    | AIA         |  100.0   |
+      | AIA    | WEA         | 1000.0   |
-  Scenario Outline: Domesticity committee from airports for international route
+  Scenario Outline: Distance committee from distance estimate
     Given a flight emitter
-    And a characteristic "origin_airport.iata_code" of "<origin>"
-    And a characteristic "destination_airport.iata_code" of "<destination>"
-    When the "domesticity" committee is calculated
-    Then the conclusion of the committee should be nil
+    And a characteristic "distance_estimate" of "<distance_estimate>"
+    When the "distance" committee is calculated
+    Then the committee should have used quorum "from distance estimate"
+    And the conclusion of the committee should be "<distance>"
     Examples:
-      | origin | destination |
-      | DTW    | CDG         |
+      | distance_estimate | distance |
+      | 185.2             | 100.0    |
-  Scenario: Trips committee
+  Scenario Outline: Distance committee from distance class
     Given a flight emitter
-    When the "trips" committee is calculated
-    Then the conclusion of the committee should be "1.941"
+    And a characteristic "distance_class.name" of "<distance_class>"
+    When the "distance" committee is calculated
+    Then the committee should have used quorum "from distance class"
+    And the conclusion of the committee should be "<distance>"
+    Examples:
+      | distance_class | distance |
+      | petite         | 100.0    |
-  Scenario: Freight share committee from cohort
+  Scenario Outline: Distance committee from cohort
     Given a flight emitter
-    And a characteristic "origin_airport.iata_code" of "DTW"
+    And a characteristic "airline.iata_code" of "<airline>"
     When the "cohort" committee is calculated
-    And the "freight_share" committee is calculated
+    And the "distance" committee is calculated
     Then the committee should have used quorum "from cohort"
-    And the conclusion of the committee should be "0.11876"
+    And the conclusion of the committee should be "<distance>"
+    Examples:
+      | airline | distance |
+      | DA      |  100.0   |
+      | IA      | 1000.0   |
-  Scenario: Fuel type committee from default
+  Scenario: Distance committee from default
     Given a flight emitter
-    When the "fuel_type" committee is calculated
-    Then the conclusion of the committee should have a record with "emission_factor" equal to "2.527139"
+    When the "distance" committee is calculated
+    Then the committee should have used quorum "default"
+    And the conclusion of the committee should be "1121.73083"
-  Scenario Outline: Emission factor committee
+  Scenario Outline: Adjusted distance committee
     Given a flight emitter
-    And pending - no fuel type records yet
+    And a characteristic "distance_estimate" of "<distance_estimate>"
+    When the "distance" committee is calculated
+    And the "emplanements_per_trip" committee is calculated
+    And the "adjusted_distance" committee is calculated
+    Then the conclusion of the committee should be "<distance>"
+    Examples:
+      | distance_estimate | distance |
+      | 0                 | 0        |
+      | 100               | 67.09227 |
-  Scenario Outline: Radiative forcing index committee
+  Scenario Outline: Load factor committee from cohort
     Given a flight emitter
-    And pending - no fuel type records yet
+    And a characteristic "origin_airport.iata_code" of "<origin>"
+    When the "cohort" committee is calculated
+    And the "load_factor" committee is calculated
+    Then the committee should have used quorum "from cohort"
+    And the conclusion of the committee should be "<load_factor>"
+    Examples:
+      | origin | load_factor |
+      | ADA    | 0.8         |
-  Scenario Outline: Radiative forcing index committee
+  Scenario: Load factor committee from default
     Given a flight emitter
-    And pending - no fuel type records yet
+    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"
-  Scenario: Emplanements per trip committee from default
+  Scenario Outline: Seats committee from aircraft
     Given a flight emitter
-    When the "emplanements_per_trip" committee is calculated
-    Then the conclusion of the committee should be "1.67"
+    And a characteristic "aircraft.icao_code" of "<code>"
+    When the "seats" committee is calculated
+    Then the committee should have used quorum "from aircraft"
+    And the conclusion of the committee should be "<seats>"
+    Examples:
+      | code | seats |
+      | FM1  | 125   |
+      | BA1  | 125   |
+      | BA2  | 100   |
-  Scenario: Distance committee from default
+  Scenario: Seats committee from seats estimate
     Given a flight emitter
-    When the "distance" committee is calculated
-    Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "1121.73083"
+    And a characteristic "seats_estimate" of "100"
+    When the "seats" committee is calculated
+    Then the committee should have used quorum "from seats estimate"
+    And the conclusion of the committee should be "100"
-  Scenario Outline: Distance committee from cohort
+  Scenario Outline: Seats committee from cohort
     Given a flight emitter
     And a characteristic "origin_airport.iata_code" of "<origin>"
-    And a characteristic "destination_airport.iata_code" of "<destination>"
-    And a characteristic "aircraft.icao_code" of "<craft>"
-    And a characteristic "airline.iata_code" of "<airline>"
-    And a characteristic "propulsion.name" of "<propulsion>"
-    And a characteristic "domesticity.name" of "<domesticity>"
     When the "cohort" committee is calculated
-    And the "distance" committee is calculated
+    And the "seats" committee is calculated
     Then the committee should have used quorum "from cohort"
-    And the conclusion of the committee should be "<distance>"
+    And the conclusion of the committee should be "<seats>"
     Examples:
-      | origin | destination | craft | airline | propulsion | domesticity                     | distance |
-      |    DTW |             | A320  | UA      |            | Domestic Data, US Carriers Only |   325    |
+      | origin | seats |
+      | ADA    | 125   |
-  Scenario Outline: Distance committee from distance class
+  Scenario: Seats committee from aircraft class
     Given a flight emitter
-    And a characteristic "distance_class.name" of "<distance_class>"
-    When the "distance" committee is calculated
-    Then the committee should have used quorum "from distance class"
-    And the conclusion of the committee should be "<distance>"
+    And a characteristic "aircraft_class.brighter_planet_aircraft_class_code" of "EX"
+    When the "seats" committee is calculated
+    Then the committee should have used quorum "from aircraft class"
+    And the conclusion of the committee should be "117"
+  Scenario: Seats committee from default
+    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 "117"
+  Scenario: Passengers committee
+    Given a flight emitter
+    And a characteristic "seats" of "100"
+    And a characteristic "load_factor" of "0.9"
+    When the "passengers" committee is calculated
+    Then the conclusion of the committee should be "90"
+  Scenario Outline: Fuel use coefficients committee from aircraft
+    Given a flight emitter
+    And a characteristic "aircraft.icao_code" of "<code>"
+    When the "fuel_use_coefficients" committee is calculated
+    Then the committee should have used quorum "from aircraft"
+    And the conclusion of the committee should have a record with "m3" equal to "<m3>"
+    And the conclusion of the committee should have a record with "m2" equal to "<m2>"
+    And the conclusion of the committee should have a record with "m1" equal to "<m1>"
+    And the conclusion of the committee should have a record with "endpoint_fuel" equal to "<b>"
     Examples:
-      | distance_class | distance   |
-      |           epic | 8689.74081 |
-      |           long | 2606.92764 |
-      |         medium |  868.97408 |
-      |          short |  217.24406 |
+      | code | m3 | m2 | m1 | b |
+      | FM1  | 0  | 0  | 1  | 0 |
+      | BA1  | 0  | 0  | 2  | 0 |
-  Scenario Outline: Distance committee from distance estimate
+  Scenario Outline: Fuel use coefficients committee from aircraft class
     Given a flight emitter
-    And a characteristic "distance_estimate" of "<distance_estimate>"
-    When the "distance" committee is calculated
-    Then the committee should have used quorum "from distance estimate"
-    And the conclusion of the committee should be "<distance>"
+    And a characteristic "aircraft_class.brighter_planet_aircraft_class_code" of "<code>"
+    When the "fuel_use_coefficients" committee is calculated
+    Then the committee should have used quorum "from aircraft class"
+    And the conclusion of the committee should have a record with "m3" equal to "<m3>"
+    And the conclusion of the committee should have a record with "m2" equal to "<m2>"
+    And the conclusion of the committee should have a record with "m1" equal to "<m1>"
+    And the conclusion of the committee should have a record with "endpoint_fuel" equal to "<b>"
     Examples:
-      | distance_estimate | distance |
-      |               123 | 66.41468 |
+      | code | m3 | m2 | m1 | b |
+      | EX   | 0  | 0  | 2  | 0 |
-  Scenario Outline: Distance committee from airports
+  Scenario Outline: Fuel use coefficients committee from cohort
     Given a flight emitter
     And a characteristic "origin_airport.iata_code" of "<origin>"
-    And a characteristic "destination_airport.iata_code" of "<destination>"
-    When the "distance" committee is calculated
-    Then the committee should have used quorum "from airports"
-    And the conclusion of the committee should be "<distance>"
+    When the "cohort" committee is calculated
+    And the "fuel_use_coefficients" committee is calculated
+    Then the committee should have used quorum "from cohort"
+    And the conclusion of the committee should have a record with "m3" equal to "<m3>"
+    And the conclusion of the committee should have a record with "m2" equal to "<m2>"
+    And the conclusion of the committee should have a record with "m1" equal to "<m1>"
+    And the conclusion of the committee should have a record with "endpoint_fuel" equal to "<b>"
     Examples:
-      | origin | destination | distance   |
-      |    DTW |         SFO | 1803.65517 |
-      |    IAD |         DCA |   20.32743 |
-      |    MSP |         FRA | 3809.26855 |
+      | origin | m3 | m2 | m1  | b |
+      | AIA    | 0  | 0  | 2   | 0 |
-  Scenario Outline: Adjusted distance committee from distance
+  Scenario Outline: Fuel use coefficients committee from default
     Given a flight emitter
-    And a characteristic "distance_estimate" of "<distance_estimate>"
-    When the "distance" committee is calculated
-    And the "emplanements_per_trip" committee is calculated
-    And the "adjusted_distance" committee is calculated
-    Then the conclusion of the committee should be "<distance>"
+    When the "fuel_use_coefficients" committee is calculated
+    Then the committee should have used quorum "default"
+    And the conclusion of the committee should have a record with "m3" equal to "<m3>"
+    And the conclusion of the committee should have a record with "m2" equal to "<m2>"
+    And the conclusion of the committee should have a record with "m1" equal to "<m1>"
+    And the conclusion of the committee should have a record with "endpoint_fuel" equal to "<b>"
+    Examples:
+      | m3 | m2 | m1 | b |
+      | 0  | 0  | 2  | 0 |
+  Scenario: Adjusted distance per segment committee
+    Given a flight emitter
+    And a characteristic "adjusted_distance" of "100"
+    And a characteristic "emplanements_per_trip" of "2"
+    When the "adjusted_distance_per_segment" committee is calculated
+    Then the conclusion of the committee should be "50"
+  Scenario: Fuel per segment committee
+    Given a flight emitter
+    And a characteristic "adjusted_distance_per_segment" of "100"
+    And a characteristic "aircraft_class.brighter_planet_aircraft_class_code" of "EX"
+    When the "fuel_use_coefficients" committee is calculated
+    And the "fuel_per_segment" committee is calculated
+    Then the conclusion of the committee should be "200"
+  Scenario: Fuel committee
+    Given a flight emitter
+    And a characteristic "fuel_per_segment" of "100"
+    And a characteristic "emplanements_per_trip" of "2"
+    And a characteristic "trips" of "2"
+    When the "fuel" committee is calculated
+    Then the conclusion of the committee should be "400"
+  Scenario Outline: Emission committee from fuel and passengers and coefficients
+    Given a flight emitter
+    And a characteristic "fuel" of "<fuel>"
+    And a characteristic "passengers" of "<passengers>"
+    And a characteristic "seat_class_multiplier" of "<seat_mult>"
+    And a characteristic "emission_factor" of "<ef>"
+    And a characteristic "radiative_forcing_index" of "<rfi>"
+    And a characteristic "freight_share" of "<freight>"
+    And a characteristic "date" of "<date>"
+    And a characteristic "timeframe" of "2010-01-01/2010-12-31"
+    When the "emission" committee is calculated
+    Then the committee should have used quorum "from fuel and passengers with coefficients"
+    And the conclusion of the committee should be "<emission>"
     Examples:
-      | distance_estimate | distance  |
-      |                 0 |         0 |
-      |                 1 |   0.67092 |
-      |              1254 | 841.33709 |
+      | fuel | passengers | seat_mult | ef | rfi | freight | date       | emission |
+      | 100  | 100        | 1.5       | 10 | 2   | 0.10    | 2010-07-15 | 27       |
+  Scenario: Emission committee from default
+    Given a flight emitter
+    When the "emission" committee is calculated
+    Then the committee should have used quorum "default"
+    And the conclusion of the committee should be ""

data/features/flight_emissions.feature CHANGED Viewed

@@ -1,15 +1,14 @@
 Feature: Flight Emissions Calculations
   The flight model should generate correct emission calculations
-  Scenario Outline: Standard Calculations for origin/destination airport, airline, and craft
+  Scenario Outline: Standard Calculations for origin/destination airport, airline, and aircraft
     Given a flight has "origin_airport.iata_code" of "<source>"
     And it has "destination_airport.iata_code" of "<dest>"
     And it has "airline.iata_code" of "<airline>"
     And it has "date" of "<date>"
-    And it used "aircraft.icao_code" "<aircraft>"
+    And it used "aircraft.bts_aircraft_type_code" "<aircraft>"
     When emissions are calculated
     Then the emission value should be within 1 kgs of <emission>
     Examples:
       | source | dest | airline | date       | aircraft | emission |
-      | DTW    | SFO  | UA      | 2010-06-25 | A320     | 1153     |
-      | IAD    | CDG  | AF      | 2010-06-25 | A320     | 2070     |
+      | DCA    | JFK  | AA      | 2010-06-25 | 1        | 1153     |

data/lib/flight/carbon_model.rb CHANGED Viewed

@@ -33,11 +33,11 @@ module BrighterPlanet
           end
           committee :fuel_per_segment do # returns kg fuel
-            quorum 'from adjusted distance and fuel use formula and emplanements and trips', :needs => [:adjusted_distance_per_segment, :fuel_use_coefficients, :endpoint_fuel] do |characteristics|
-              characteristics[:fuel_use_coefficients][:m3].to_f * characteristics[:adjusted_distance_per_segment].to_f ** 3 +
-                characteristics[:fuel_use_coefficients][:m2].to_f * characteristics[:adjusted_distance_per_segment].to_f ** 2 +
-                characteristics[:fuel_use_coefficients][:m1].to_f * characteristics[:adjusted_distance_per_segment].to_f +
-                characteristics[:endpoint_fuel].to_f
+            quorum 'from adjusted distance per segment and fuel use coefficients', :needs => [:adjusted_distance_per_segment, :fuel_use_coefficients] do |characteristics|
+              characteristics[:fuel_use_coefficients].m3.to_f * characteristics[:adjusted_distance_per_segment].to_f ** 3 +
+                characteristics[:fuel_use_coefficients].m2.to_f * characteristics[:adjusted_distance_per_segment].to_f ** 2 +
+                characteristics[:fuel_use_coefficients].m1.to_f * characteristics[:adjusted_distance_per_segment].to_f +
+                characteristics[:fuel_use_coefficients].endpoint_fuel.to_f
             end
           end
@@ -47,33 +47,58 @@ module BrighterPlanet
             end
           end
-          committee :endpoint_fuel do
+          committee :fuel_use_coefficients do
             quorum 'from aircraft', :needs => :aircraft do |characteristics|
-              characteristics[:aircraft].endpoint_fuel
+              aircraft = characteristics[:aircraft]
+              FuelUseEquation.new aircraft.m3, aircraft.m2, aircraft.m1, aircraft.endpoint_fuel
             end
             quorum 'from aircraft class', :needs => :aircraft_class do |characteristics|
-              characteristics[:aircraft_class].endpoint_fuel
-            end
-            quorum 'default' do
-              Aircraft.fallback.andand.endpoint_fuel
-            end
-          end
-          committee :fuel_use_coefficients do
-            quorum 'from aircraft', :needs => :aircraft do |characteristics|
-              characteristics[:aircraft].attributes.symbolize_keys.slice(:m1, :m2, :m3)
+              aircraft_class = characteristics[:aircraft_class]
+              FuelUseEquation.new aircraft_class.m3, aircraft_class.m2, aircraft_class.m1, aircraft_class.endpoint_fuel
             end
-            quorum 'from aircraft class', :needs => :aircraft_class do |characteristics|
-              characteristics[:aircraft_class].attributes.symbolize_keys.slice(:m1, :m2, :m3)
+            quorum 'from cohort', :needs => :cohort do |characteristics|
+              flight_segments = characteristics[:cohort]
+              passengers = flight_segments.inject(0) do |passengers, flight_segment|
+                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)
+              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)
+              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)
+              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)
+              end
+              if [m3, m2, m1, endpoint_fuel, passengers].any?(&:nonzero?)
+                m3 = m3 / passengers
+                m2 = m2 / passengers
+                m1 = m1 / passengers
+                endpoint_fuel = endpoint_fuel / passengers
+                FuelUseEquation.new m3, m2, m1, endpoint_fuel
+              end
             end
             quorum 'default' do
               fallback = Aircraft.fallback
               if fallback
-                fallback.attributes.symbolize_keys.slice(:m1, :m2, :m3)
+                FuelUseEquation.new fallback.m3, fallback.m2, fallback.m1, fallback.endpoint_fuel
               end
             end
           end
@@ -205,33 +230,35 @@ module BrighterPlanet
             end
           end
-          committee :domesticity do
-            quorum 'from airports', :needs => [:origin_airport, :destination_airport] do |characteristics|
-              if [characteristics[:origin_airport], characteristics[:destination_airport]].all?(&:united_states?)
-                FlightDomesticity.find_by_name('domestic')
-              elsif [characteristics[:origin_airport], characteristics[:destination_airport]].any?(&:united_states?)
-                FlightDomesticity.find_by_name('international')
-              end
-            end
-            quorum 'from origin', :needs => :origin_airport do |characteristics|
-              if characteristics[:origin_airport].all_flights_from_here_domestic?
-                FlightDomesticity.find_by_name('domestic')
-              end
-            end
-            quorum 'from destination', :needs => :destination_airport do |characteristics|
-              if characteristics[:destination_airport].all_flights_to_here_domestic?
-                FlightDomesticity.find_by_name('domestic')
-              end
-            end
-            quorum 'from airline', :needs => :airline do |characteristics|
-              if characteristics[:airline].all_flights_domestic?
-                FlightDomesticity.find_by_name('domestic')
-              end
-            end
-          end
+          # Disabling this for now because domesticity is pretty useless
+          # FIXME TODO make domesticity non-us-centric and check that data's ok
+          # committee :domesticity do
+          #   quorum 'from airports', :needs => [:origin_airport, :destination_airport] do |characteristics|
+          #     if [characteristics[:origin_airport], characteristics[:destination_airport]].all?(&:united_states?)
+          #       FlightDomesticity.find_by_name('domestic')
+          #     elsif [characteristics[:origin_airport], characteristics[:destination_airport]].any?(&:united_states?)
+          #       FlightDomesticity.find_by_name('international')
+          #     end
+          #   end
+          #
+          #   quorum 'from origin', :needs => :origin_airport do |characteristics|
+          #     if characteristics[:origin_airport].all_flights_from_here_domestic?
+          #       FlightDomesticity.find_by_name('domestic')
+          #     end
+          #   end
+          #
+          #   quorum 'from destination', :needs => :destination_airport do |characteristics|
+          #     if characteristics[:destination_airport].all_flights_to_here_domestic?
+          #       FlightDomesticity.find_by_name('domestic')
+          #     end
+          #   end
+          #
+          #   quorum 'from airline', :needs => :airline do |characteristics|
+          #     if characteristics[:airline].all_flights_domestic?
+          #       FlightDomesticity.find_by_name('domestic')
+          #     end
+          #   end
+          # end
           committee :seat_class_multiplier do
             quorum 'from seat class', :needs => :seat_class do |characteristics|
@@ -249,16 +276,18 @@ module BrighterPlanet
             end
             quorum 'from timeframe' do |characteristics, timeframe|
-              timeframe.andand.from
+              timeframe.present? ? timeframe.from : nil
             end
           end
           committee :cohort do
-            quorum 'from t100', :appreciates => FlightSegment::INPUT_CHARACTERISTICS do |characteristics|
-              needed_characteristics = characteristics
-              needed_characteristics.
-                reject! { |k,v| !FlightSegment::INPUT_CHARACTERISTICS.include?(k) }
-              cohort = FlightSegment.big_cohort needed_characteristics
+            quorum 'from t100', :appreciates => [:origin_airport, :destination_airport, :aircraft, :airline] do |characteristics|
+              provided_characteristics = [:origin_airport, :destination_airport, :aircraft, :airline].
+                inject(ActiveSupport::OrderedHash.new) do |memo, characteristic_name|
+                  memo[characteristic_name] = characteristics[characteristic_name]
+                  memo
+                end
+              cohort = FlightSegment.strict_cohort provided_characteristics
               if cohort.any?
                 cohort
               else
@@ -268,6 +297,8 @@ module BrighterPlanet
           end
         end
       end
+      class FuelUseEquation < Struct.new(:m3, :m2, :m1, :endpoint_fuel); end
     end
   end
 end

data/lib/flight/data.rb CHANGED Viewed

@@ -26,9 +26,7 @@ module BrighterPlanet
             time     'time_of_day'
           end
-          process "pull dependencies" do
-            run_data_miner_on_belongs_to_associations
-          end
+          process :run_data_miner_on_belongs_to_associations
         end
       end
     end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flight
 version: !ruby/object:Gem::Version
-  hash: 61
+  hash: 59
   prerelease: false
   segments:
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors:
 - Andy Rossmeissl
@@ -19,31 +19,30 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-08-12 00:00:00 -04:00
+date: 2010-09-08 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :development
-  prerelease: false
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - "="
       - !ruby/object:Gem::Version
-        hash: -1848230024
+        hash: 299253624
         segments:
         - 3
         - 0
         - 0
         - beta4
         version: 3.0.0.beta4
-  requirement: *id001
-- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -56,12 +55,12 @@ dependencies:
         - beta
         - 2
         version: 1.0.0.beta.2
-  requirement: *id002
-- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency
   name: cucumber
-  version_requirements: &id003 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - "="
@@ -72,12 +71,12 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
-  requirement: *id003
-- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - "="
@@ -88,12 +87,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id005 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -102,12 +101,12 @@ dependencies:
         segments:
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &id006 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
@@ -116,12 +115,12 @@ dependencies:
         segments:
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - "="
@@ -134,39 +133,40 @@ dependencies:
         - beta
         - 17
         version: 2.0.0.beta.17
-  requirement: *id007
-- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency
   name: sniff
-  version_requirements: &id008 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - "="
       - !ruby/object:Gem::Version
-        hash: 31
+        hash: 11
         segments:
         - 0
         - 1
-        - 2
-        version: 0.1.2
-  requirement: *id008
+        - 8
+        version: 0.1.8
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  prerelease: false
   name: emitter
-  version_requirements: &id009 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 29
+        hash: 23
         segments:
         - 0
         - 0
-        - 1
-        version: 0.0.1
-  requirement: *id009
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id009
 description: A software model in Ruby for the greenhouse gas emissions of a flight
 email: andy@rossmeissl.net
 executables: []