automobile 0.1.0 → 0.1.1

data/features/automobile_committees.feature

@@ -192,20 +192,27 @@ Feature: Automobile Committee Calculations
     Then the committee should have used quorum "from hybridity multiplier"
     And the conclusion of the committee should be "8.58025"
 
-  Scenario: Annual distance committee from weekly distance and timeframe
+  Scenario: Annual distance committee from annual distance estimate
     Given an automobile emitter
-    And a characteristic "weekly_distance" of "7"
+    And a characteristic "annual_distance_estimate" of "100"
+    When the "annual_distance" committee is calculated
+    Then the committee should have used quorum "from annual distance estimate"
+    And the conclusion of the committee should be "100.0"
+
+  Scenario: Annual distance committee from weekly distance estimate and timeframe
+    Given an automobile emitter
+    And a characteristic "weekly_distance_estimate" of "7"
     And a characteristic "timeframe" of "2010-05-23/2010-11-24"
     When the "annual_distance" committee is calculated
-    Then the committee should have used quorum "from weekly distance and timeframe"
+    Then the committee should have used quorum "from weekly distance estimate and timeframe"
     And the conclusion of the committee should be "365.0"
 
-  Scenario: Annual distance committee from daily distance and timeframe
+  Scenario: Annual distance committee from daily distance estimate and timeframe
     Given an automobile emitter
-    And a characteristic "daily_distance" of "2"
+    And a characteristic "daily_distance_estimate" of "2"
     And a characteristic "timeframe" of "2010-05-23/2010-11-24"
     When the "annual_distance" committee is calculated
-    Then the committee should have used quorum "from daily distance and timeframe"
+    Then the committee should have used quorum "from daily distance estimate and timeframe"
     And the conclusion of the committee should be "730.0"
 
   Scenario: Annual distance committee from daily duration, speed and timeframe

data/features/automobile_emissions.feature

@@ -35,12 +35,12 @@ Feature: Automobile Emissions Calculations
       | false     | 5564.02  |
 
   Scenario: Calculation with multiple distance estimates
-    Given an automobile has "annual_distance_estimate" of "33796.2"
-    And it has "daily_duration" of "3.0"
-    And it has "timeframe" of "2010-01-01/2011-01-01"
-    And it has "weekly_distance_estimate" of "804.672"
+    Given an automobile has "daily_duration" of "5"
+    And it has "daily_distance_estimate" of "10"
+    And it has "weekly_distance_estimate" of "100"
+    And it has "annual_distance_estimate" of "1000"
     When emissions are calculated
-    Then the emission value should be within "0.1" kgs of "9808.1"
+    Then the emission value should be within "0.1" kgs of "290.21"
 
   Scenario: Automobile emission from urbanity
     Given an automobile has "urbanity" of "0.5"
@@ -61,18 +61,18 @@ Feature: Automobile Emissions Calculations
     When emissions are calculated
     Then the emission value should be within "0.01" kgs of "2368.20"
   
-  Scenario: Automobile emission from annual distance
-    Given an automobile has "annual_distance" of "1000"
+  Scenario: Automobile emission from annual distance estimate
+    Given an automobile has "annual_distance_estimate" of "1000"
     When emissions are calculated
     Then the emission value should be within "0.01" kgs of "290.21"
 
-  Scenario: Automobile emission from weekly distance
-    Given an automobile has "weekly_distance" of "100"
+  Scenario: Automobile emission from weekly distance estimate
+    Given an automobile has "weekly_distance_estimate" of "100"
     When emissions are calculated
     Then the emission value should be within "0.01" kgs of "1513.26"
 
-  Scenario: Automobile emission from daily distance
-    Given an automobile has "daily_distance" of "10"
+  Scenario: Automobile emission from daily distance estimate
+    Given an automobile has "daily_distance_estimate" of "10"
     When emissions are calculated
     Then the emission value should be within "0.01" kgs of "1059.28"
 

data/lib/automobile/carbon_model.rb

@@ -100,25 +100,28 @@ module BrighterPlanet
           # This is the distance the automobile would travel if it were in use for the entire calendar year in which the `timeframe` falls.
           # Note that if either `acquisition` or `retirement` occurs during the calendar year in which the `timeframe` falls then `annual distance` will be MORE THAN the distance the automobile actually travelled during that calendar year.
           committee :annual_distance do
-            #### Annual distance from client input
-            # **Complies:** All
+            #### Annual distance from annual distance estimate
+            # **Complies:** GHG Protocol, ISO 14064-1
             #
-            # Uses the client-input `annual distance` (*km*).
+            # Uses the `annual distance estimate` (*km*).
+            quorum 'from annual distance estimate', :needs => :annual_distance_estimate, :complies => [:ghg_protocol, :iso] do |characteristics|
+              characteristics[:annual_distance_estimate]
+            end
             
             #### Annual distance from weekly distance
             # **Complies:** GHG Protocol, ISO 14064-1
             #
-            # Divides the `weekly distance` (*km*) by 7 and multiplies by the number of days in the calendar year in which the `timeframe` falls.
-            quorum 'from weekly distance and timeframe', :needs => :weekly_distance, :complies => [:ghg_protocol, :iso] do |characteristics, timeframe|
-              (characteristics[:weekly_distance] / 7 ) * timeframe.year.days
+            # Divides the `weekly distance estimate` (*km*) by 7 and multiplies by the number of days in the calendar year in which the `timeframe` falls.
+            quorum 'from weekly distance estimate and timeframe', :needs => :weekly_distance_estimate, :complies => [:ghg_protocol, :iso] do |characteristics, timeframe|
+              (characteristics[:weekly_distance_estimate] / 7 ) * timeframe.year.days
             end
             
             #### Annual distance from daily distance
             # **Complies:** GHG Protocol, ISO 14064-1
             #
-            # Multiplies the `daily distance` (*km*) by the number of days in the calendar year in which the `timeframe` falls.
-            quorum 'from daily distance and timeframe', :needs => :daily_distance, :complies => [:ghg_protocol, :iso] do |characteristics, timeframe|
-              characteristics[:daily_distance] * timeframe.year.days
+            # Multiplies the `daily distance estimate` (*km*) by the number of days in the calendar year in which the `timeframe` falls.
+            quorum 'from daily distance estimate and timeframe', :needs => :daily_distance_estimate, :complies => [:ghg_protocol, :iso] do |characteristics, timeframe|
+              characteristics[:daily_distance_estimate] * timeframe.year.days
             end
             
             #### Annual distance from daily duration and speed
@@ -155,12 +158,16 @@ module BrighterPlanet
             end
           end
           
-          ### Weekly distance calculation
-          # Returns the client-input `weekly distance` (*km*).
+          ### Annual distance estimate calculation
+          # Returns the client-input `annual distance estimate` (*km*).
+          # This is the average distance the automobile travels each week.
+          
+          ### Weekly distance estimate calculation
+          # Returns the client-input `weekly distance estimate` (*km*).
           # This is the average distance the automobile travels each week.
           
-          ### Daily distance calculation
-          # Returns the client-input `daily distance` (*km*).
+          ### Daily distance estimate calculation
+          # Returns the client-input `daily distance estimate` (*km*).
           # This is the average distance the automobile travels each day.
           
           ### Daily duration calculation

data/lib/automobile/characterization.rb

@@ -21,9 +21,9 @@ module BrighterPlanet
           has :urbanity
           has :hybridity
           has :fuel_efficiency
-          has :annual_distance
-          has :weekly_distance
-          has :daily_distance
+          has :annual_distance_estimate
+          has :weekly_distance_estimate
+          has :daily_distance_estimate
           has :daily_duration
           has :acquisition
           has :retirement

data/lib/automobile/data.rb

@@ -14,9 +14,9 @@ module BrighterPlanet
             boolean  'hybridity'
             float    'urbanity'
             float    'fuel_efficiency'
-            float    'annual_distance'
-            float    'weekly_distance'
-            float    'daily_distance'
+            float    'annual_distance_estimate'
+            float    'weekly_distance_estimate'
+            float    'daily_distance_estimate'
             float    'daily_duration'
             date     'acquisition'
             date     'retirement'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: automobile
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -18,102 +19,110 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2010-11-22 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: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
   type: :development
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 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: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 8
         - 3
         version: 0.8.3
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
         - 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: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 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: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 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: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 62196417
         segments: 
         - 2
         - 0
@@ -122,52 +131,54 @@ dependencies:
         - 17
         version: 2.0.0.beta.17
   type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sniff
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 3
         - 0
         version: 0.3.0
   type: :development
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: emitter
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 2
         - 0
         version: 0.2.0
   type: :runtime
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: earth
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 3
         - 1
         version: 0.3.1
   type: :runtime
-  prerelease: false
   version_requirements: *id010
 description: A software model in Ruby for the greenhouse gas emissions of an automobile
 email: andy@rossmeissl.net
@@ -188,8 +199,8 @@ files:
 - lib/automobile/summarization.rb
 - lib/test_support/automobile_record.rb
 - features/support/env.rb
-- features/automobile_emissions.feature
 - features/automobile_committees.feature
+- features/automobile_emissions.feature
 has_rdoc: true
 homepage: http://github.com/brighterplanet/automobile
 licenses: []
@@ -204,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -457516079
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -213,6 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -225,6 +237,6 @@ specification_version: 3
 summary: A carbon model
 test_files: 
 - features/support/env.rb
-- features/automobile_emissions.feature
 - features/automobile_committees.feature
+- features/automobile_emissions.feature
 - lib/test_support/automobile_record.rb