flight 0.0.18 → 0.0.19

data/features/flight_committees.feature

@@ -141,7 +141,7 @@ Feature: Flight Committee Calculations
     And the conclusion of the committee should be "<distance>"
     Examples:
       | airline | distance |
-      | DA      |  100.0   |
+      | DA      | 99.89200 |
       | IA      | 1000.0   |
 
   Scenario: Distance committee from default
@@ -214,13 +214,13 @@ Feature: Flight Committee Calculations
     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"
+    And the conclusion of the committee should be "116"
 
   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"
+    And the conclusion of the committee should be "116"
 
   Scenario: Passengers committee
     Given a flight emitter
@@ -321,9 +321,3 @@ Feature: Flight Committee Calculations
     Examples:
       | 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

@@ -6,9 +6,9 @@ Feature: Flight Emissions Calculations
     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.bts_aircraft_type_code" "<aircraft>"
+    And it has "aircraft.bts_aircraft_type_code" of "<aircraft>"
     When emissions are calculated
-    Then the emission value should be within 1 kgs of <emission>
+    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        | 1153     |
+      | DCA    | JFK  | AA      | 2010-06-25 | 1        | 146.7    |

data/lib/flight/carbon_model.rb

@@ -1,4 +1,3 @@
-require 'leap'
 require 'timeframe'
 require 'weighted_average'
 
@@ -6,14 +5,16 @@ module BrighterPlanet
   module Flight
     module CarbonModel
       def self.included(base)
-        base.extend ::Leap::Subject
         base.extend FastTimestamp
         base.decide :emission, :with => :characteristics do
           committee :emission do
             quorum 'from fuel and passengers with coefficients', 
               :needs => [:fuel, :passengers, :seat_class_multiplier, :emission_factor, 
                          :radiative_forcing_index, :freight_share, :date] do |characteristics, timeframe|
-              if timeframe.include? characteristics[:date]
+              date = characteristics[:date].is_a?(Date) ?
+                characteristics[:date] :
+                Date.parse(characteristics[:date].to_s)
+              if timeframe.include? date
                 #( kg fuel ) * ( kg CO2 / kg fuel ) = kg CO2
                 (characteristics[:fuel] / characteristics[:passengers] * characteristics[:seat_class_multiplier]) * characteristics[:emission_factor] * characteristics[:radiative_forcing_index] * (1 - characteristics[:freight_share])
               else
@@ -149,14 +150,14 @@ module BrighterPlanet
             end
       
             quorum 'default' do
-              BrighterPlanet::Flight.flight_model.fallback.andand.load_factor
+              base.fallback.andand.load_factor
             end
           end
           
           committee :adjusted_distance do # returns nautical miles
             quorum 'from distance', :needs => [:distance, :emplanements_per_trip] do |characteristics|
-              route_inefficiency_factor = BrighterPlanet::Flight.flight_model.research(:route_inefficiency_factor)
-              dogleg_factor = BrighterPlanet::Flight.flight_model.research(:dogleg_factor)
+              route_inefficiency_factor = base.research(:route_inefficiency_factor)
+              dogleg_factor = base.research(:dogleg_factor)
               characteristics[:distance] * route_inefficiency_factor * ( dogleg_factor ** (characteristics[:emplanements_per_trip] - 1) )
             end
           end
@@ -185,13 +186,13 @@ module BrighterPlanet
             end
             
             quorum 'default' do
-              BrighterPlanet::Flight.flight_model.fallback.distance_estimate.kilometres.to :nautical_miles
+              base.fallback.distance_estimate.kilometres.to :nautical_miles
             end
           end
           
           committee :emplanements_per_trip do # per trip
             quorum 'default' do
-              BrighterPlanet::Flight.flight_model.fallback.emplanements_per_trip_before_type_cast
+              base.fallback.emplanements_per_trip_before_type_cast
             end
           end
           
@@ -226,7 +227,7 @@ module BrighterPlanet
           
           committee :trips do
             quorum 'default' do
-              BrighterPlanet::Flight.flight_model.fallback.andand.trips_before_type_cast
+              base.fallback.andand.trips_before_type_cast
             end
           end
           

data/lib/flight/characterization.rb

@@ -1,10 +1,7 @@
-require 'characterizable'
-
 module BrighterPlanet
   module Flight
     module Characterization
       def self.included(base)
-        base.send :include, Characterizable
         base.characterize do
           has :date, :trumps => :year
           has :year
@@ -28,7 +25,6 @@ module BrighterPlanet
 
           has :creation_date, :hidden => true
         end
-        base.add_implicit_characteristics
       end
     end
   end

data/lib/flight/data.rb

@@ -1,5 +1,3 @@
-require 'data_miner'
-
 module BrighterPlanet
   module Flight
     module Data

data/lib/flight/summarization.rb

@@ -1,10 +1,7 @@
-require 'summary_judgement'
-
 module BrighterPlanet
   module Flight
     module Summarization
       def self.included(base)
-        base.extend SummaryJudgement
         base.summarize do |has|
           has.adjective 'one-way', :if => lambda { |flight| flight.trips == 1 }
           has.adjective 'round-trip', :if => lambda { |flight| flight.trips == 1 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flight
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,48 +19,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -05:00
+date: 2010-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253624
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
-  type: :development
-  version_requirements: *id001
+        version: 3.0.0
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196359
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - beta
-        - 2
-        version: 1.0.0.beta.2
-  type: :development
-  version_requirements: *id002
+        version: 1.0.0
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: cucumber
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -71,12 +69,12 @@ dependencies:
         - 8
         - 3
         version: 0.8.3
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -87,12 +85,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  type: :development
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +99,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rdoc
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,12 +113,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: rspec
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -133,40 +131,39 @@ dependencies:
         - beta
         - 17
         version: 2.0.0.beta.17
-  type: :development
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: sniff
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: sniff
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 0
         - 1
-        - 8
-        version: 0.1.8
-  type: :development
-  version_requirements: *id008
+        - 14
+        version: 0.1.14
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: emitter
+  type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: emitter
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 0
+        - 1
         - 4
-        version: 0.0.4
-  type: :runtime
-  version_requirements: *id009
+        version: 0.1.4
+  requirement: *id009
 description: A software model in Ruby for the greenhouse gas emissions of a flight
 email: andy@rossmeissl.net
 executables: []