computation 0.0.8 → 0.0.9

data/TODO

@@ -0,0 +1,14 @@
+* In the future: add parameters for
+  * cpu wattage
+  * hard disk
+  * memory
+  * hosting company
+    * develop power usage estimates for different companies
+
+* Develop plugin for New Relic
+  * API key parameter
+  * ENV Parameters for carbon model
+  * Website badge
+  * Link for site owners to buy offsets
+  * Future: display how much has been offset on badge
+

data/features/computation_committees.feature

@@ -11,7 +11,7 @@ Feature: Computation Committee Calculations
     Given a computation emitter
     When the "duration" committee is calculated
     Then the committee should have used quorum "default"
-    And the conclusion of the committee should be "1.0"
+    And the conclusion of the committee should be "3600.0"
 
   Scenario: eGRID subregion committee from default
     Given a computation emitter
@@ -53,10 +53,24 @@ Feature: Computation Committee Calculations
     Then the committee should have used quorum "default"
     And the conclusion of the committee should be "1.5"
 
+  Scenario Outline: Duration in hours from duration
+    Given a computation emitter
+    And a characteristic "duration" of "<seconds>"
+    When the "duration_in_hours" committee is calculated
+    Then the committee should have used quorum "from duration"
+    And the conclusion of the committee should be "<hours>"
+    Examples:
+      | seconds | hours |
+      | 0.0     | 0.0   |
+      | 1800.0  | 0.5   |
+      | 3600.0  | 1.0   |
+      | 7200.0  | 2.0   |
+
   Scenario: Electricity use commitee from default EC2 compute units, duration, electricity intensity, zip code, and PUE
     Given a computation emitter
     When the "ec2_compute_units" committee is calculated
     And the "duration" committee is calculated
+    And the "duration_in_hours" committee is calculated
     And the "egrid_subregion" committee is calculated
     And the "egrid_region" committee is calculated
     And the "electricity_intensity" committee is calculated
@@ -68,10 +82,11 @@ Feature: Computation Committee Calculations
   Scenario: Electricity use commitee from EC2 compute units, duration, electricity intensity, zip code, and PUE
     Given a computation emitter
     And a characteristic "ec2_compute_units" of "10"
-    And a characteristic "duration" of "10"
+    And a characteristic "duration" of "36000"
     And a characteristic "zip_code.name" of "94122"
     And a characteristic "electricity_intensity" of "1.0"
     And a characteristic "power_usage_effectiveness" of "2.0"
+    When the "duration_in_hours" committee is calculated
     And the "egrid_subregion" committee is calculated
     And the "egrid_region" committee is calculated
     And the "electricity_use" committee is calculated

data/features/computation_emissions.feature

@@ -12,7 +12,7 @@ Feature: Computation Emissions Calculations
     Then the emission value should be within "0.01" kgs of "2.81"
 
   Scenario: Calculations starting from duration
-    Given a computation has "duration" of "10"
+    Given a computation has "duration" of "36000"
     When emissions are calculated
     Then the emission value should be within "0.01" kgs of "2.81"
 
@@ -33,7 +33,7 @@ Feature: Computation Emissions Calculations
 
   Scenario: Calculations starting from EC2 compute units, duration, electricity intensity, zip code, and PUE
     Given a computation has "ec2_compute_units" of "10"
-    And it has "duration" of "10"
+    And it has "duration" of "36000"
     And it has "zip_code.name" of "94122"
     And it has "electricity_intensity" of "1.0"
     And it has "power_usage_effectiveness" of "2.0"

data/lib/computation/carbon_model.rb

@@ -20,8 +20,14 @@ module BrighterPlanet
           end
           
           committee :electricity_use do # returns kWh including distribution losses
-            quorum 'from compute units, time, electricity intensity, PUE, and eGRID region', :needs => [:ec2_compute_units, :duration, :electricity_intensity, :power_usage_effectiveness, :egrid_region] do |characteristics|
-              (characteristics[:ec2_compute_units] * characteristics[:duration] * characteristics[:electricity_intensity] * characteristics[:power_usage_effectiveness]) / (1 - characteristics[:egrid_region].loss_factor)
+            quorum 'from compute units, time, electricity intensity, PUE, and eGRID region', :needs => [:ec2_compute_units, :duration_in_hours, :electricity_intensity, :power_usage_effectiveness, :egrid_region] do |characteristics|
+              (characteristics[:ec2_compute_units] * characteristics[:duration_in_hours] * characteristics[:electricity_intensity] * characteristics[:power_usage_effectiveness]) / (1 - characteristics[:egrid_region].loss_factor)
+            end
+          end
+
+          committee :duration_in_hours do
+            quorum 'from duration', :needs => :duration do |characteristics|
+              characteristics[:duration] / (60 * 60)
             end
           end
           
@@ -53,7 +59,7 @@ module BrighterPlanet
             end
           end
           
-          committee :duration do # returns hours
+          committee :duration do # returns seconds
             quorum 'default' do
               base.fallback.duration
             end

data/lib/computation/fallback.rb

@@ -2,7 +2,7 @@ module BrighterPlanet
   module Computation
     module Fallback
       def self.included(base)
-        base.falls_back_on :duration                  => 1.0, # assume 1 hour
+        base.falls_back_on :duration                  => 3600.0, # assume 1 hour
                            :ec2_compute_units         => 1, # assume 1 EC2 Unit
                            :power_usage_effectiveness => 1.5, # based on Amazon's EC2 cost comparison calculator statement that most data centers have PUE of 1.3 - 3.0
                            :electricity_intensity     => 0.075 # kW based on Amazon's EC2 cost comparison calculator stating 150W for small compute instance equivalent server and 0.5 power conversion factor (to get average operating load from nameplate capacity) - EC2 probably has lower draw but higher power conversion factor

data/lib/test_support/db/fixtures/egrid_regions.csv

@@ -0,0 +1,3 @@
+"name","loss_factor"
+"W","0.1"
+"US","0.2"

data/lib/test_support/db/fixtures/egrid_subregions.csv

@@ -0,0 +1,3 @@
+"abbreviation","electricity_emission_factor","electricity_emission_factor_units","egrid_region_name"
+"CAMX","1.0","kilograms_per_kilowatt_hour","W"
+"US","2.0","kilograms_per_kilowatt_hour","US"

data/lib/test_support/db/fixtures/zip_codes.csv

@@ -0,0 +1,2 @@
+"name","egrid_subregion_abbreviation"
+"94122","CAMX"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: computation
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,140 +18,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 -05:00
+date: 2011-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
+  name: bueller
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
-  type: :development
-  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
-  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: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  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
-  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
-  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
-  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: 7
-        segments: 
-        - 2
-        version: "2"
-  type: :development
-  version_requirements: *id007
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sniff
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 9
+        version: 0.4.9
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: emitter
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 3
         version: "0.3"
   type: :runtime
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *id003
 description: A software model in Ruby for the greenhouse gas emissions of a computer's computations
 email: andy@rossmeissl.net
 executables: []
@@ -162,27 +72,32 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
-- LICENSE
-- README.rdoc
 - lib/computation.rb
+- lib/test_support/db/fixtures/egrid_subregions.csv
+- lib/test_support/db/fixtures/egrid_regions.csv
+- lib/test_support/db/fixtures/zip_codes.csv
+- lib/test_support/computation_record.rb
+- lib/computation/fallback.rb
 - lib/computation/carbon_model.rb
-- lib/computation/characterization.rb
 - lib/computation/data.rb
-- lib/computation/fallback.rb
 - lib/computation/relationships.rb
+- lib/computation/characterization.rb
 - lib/computation/summarization.rb
-- lib/test_support/computation_record.rb
+- LICENSE
+- README.rdoc
+- TODO
 - features/support/env.rb
-- features/computation_committees.feature
 - features/computation_emissions.feature
+- features/computation_committees.feature
 has_rdoc: true
 homepage: http://github.com/brighterplanet/computation
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -190,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 260890931
       segments: 
       - 0
       version: "0"
@@ -199,7 +114,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -212,6 +126,6 @@ specification_version: 3
 summary: A carbon model
 test_files: 
 - features/support/env.rb
-- features/computation_committees.feature
 - features/computation_emissions.feature
+- features/computation_committees.feature
 - lib/test_support/computation_record.rb