flight 0.1.10 → 0.1.11

data/features/flight_committees.feature

@@ -62,6 +62,16 @@ Feature: Flight Committee Calculations
       # airline exists but not in t100
       # origin not in t100, dest in t100
 
+  Scenario: Cohort committee from segments with no passengers should be nil
+    Given a flight emitter
+    And a characteristic "segments_per_trip" of "1"
+    And a characteristic "origin_airport.iata_code" of "AZP"
+    And a characteristic "destination_airport.iata_code" of "BZP"
+    And a characteristic "aircraft.bp_code" of "6"
+    And a characteristic "airline.iata_code" of "ZA"
+    When the "cohort" committee is calculated
+    Then the conclusion of the committee should be nil
+
   Scenario: Aircraft class committee from aircraft
     Given a flight emitter
     And a characteristic "aircraft.bp_code" of "BP-FM1"

data/lib/flight/carbon_model.rb

@@ -269,6 +269,7 @@ module BrighterPlanet
               passengers = flight_segments.inject(0) do |passengers, flight_segment|
                 passengers + flight_segment.passengers
               end
+              puts "passengers: #{passengers.inspect}"
               
               bts_codes = flight_segments.map(&:aircraft_bts_code).uniq
               relevant_aircraft = Aircraft.find_all_by_bts_code(bts_codes).inject({}) do |hsh, aircraft|
@@ -280,14 +281,27 @@ module BrighterPlanet
                 flight_segments.inject(0) do |coefficient, flight_segment|
                   bts_code = flight_segment.aircraft_bts_code.to_s
                   aircraft = relevant_aircraft[bts_code]
+                  if aircraft.nil?
+                    puts "aircraft is nil, bts_code is #{bts_code}"
+                    puts "flight segment: #{flight_segment.inspect}"
+                  end
                   aircraft_coefficient = aircraft.send(name)
+                  if aircraft.aircraft_class.nil?
+                    puts "aircraft #{aircraft.inspect} has nil class"
+                    puts "flight segment: #{flight_segment.inspect}"
+                  end
                   if aircraft_coefficient.nil?
                     aircraft_coefficient = aircraft.aircraft_class.send(name)
                   end
+#                  puts "coeff = #{coefficient} + (#{aircraft_coefficient} * #{flight_segment.passengers}) = #{coefficient + (aircraft_coefficient * flight_segment.passengers)}"
                   coefficient + (aircraft_coefficient * flight_segment.passengers)
                 end
               end
 
+              puts "m3 coeff = #{sum_coefficients.call(:m3).inspect}"
+              puts "m2 coeff = #{sum_coefficients.call(:m2).inspect}"
+              puts "m1 coeff = #{sum_coefficients.call(:m1).inspect}"
+              puts "endpoint_fuel coeff = #{sum_coefficients.call(:endpoint_fuel).inspect}"
               m3 = sum_coefficients.call(:m3) / passengers
               m2 = sum_coefficients.call(:m2) / passengers
               m1 = sum_coefficients.call(:m1) / passengers
@@ -535,7 +549,7 @@ module BrighterPlanet
                   end
                 cohort = FlightSegment.strict_cohort provided_characteristics
               end
-              if cohort.any?
+              if cohort.any? && !cohort.all? { |fs| fs.passengers.zero? }
                 cohort
               else
                 nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -18,11 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -05:00
+date: 2011-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +33,10 @@ dependencies:
         - 3
         version: "3"
   type: :development
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,10 +48,10 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,10 +61,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,10 +76,10 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +89,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rdoc
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -101,10 +102,10 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -116,10 +117,10 @@ dependencies:
         - 1
         version: 2.0.1
   type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sniff
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -131,10 +132,10 @@ dependencies:
         - 12
         version: 0.4.12
   type: :development
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: emitter
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -145,10 +146,10 @@ dependencies:
         - 3
         version: "0.3"
   type: :runtime
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: earth
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,10 +160,10 @@ dependencies:
         - 3
         version: "0.3"
   type: :runtime
-  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: builder
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -172,7 +173,6 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
   version_requirements: *id011
 description: A software model in Ruby for the greenhouse gas emissions of a flight
 email: andy@rossmeissl.net
@@ -216,7 +216,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 805356979
       segments: 
       - 0
       version: "0"