earth 0.11.8 → 0.11.9

data/earth.gemspec

@@ -5,7 +5,7 @@ require "earth/version"
 Gem::Specification.new do |s|
   s.name        = "earth"
   s.version     = Earth::VERSION
-  s.date = "2011-12-22"
+  s.date = "2012-01-24"
   s.platform    = Gem::Platform::RUBY
   s.authors = ["Seamus Abshere", "Derek Kastner", "Andy Rossmeissl"]
   s.email = %q{andy@rossmeissl.net}

data/lib/earth/conversions_ext.rb

@@ -1,51 +1,78 @@
 require 'conversions'
-Conversions.register(:miles, :nautical_miles, 0.868976242)
-Conversions.register(:kilometres, :nautical_miles, 0.539956803)
-Conversions.register(:pounds_per_gallon, :kilograms_per_litre, 0.119826427)
-Conversions.register(:inches, :meters, 0.0254)
-Conversions.register(:kilowatt_hours, :watt_hours, 1_000.0)
-Conversions.register(:kilowatt_hours, :btus, 3_412.14163) # obsolete?
-Conversions.register(:watt_hours, :btus, 3.4121414799) # obsolete?
-Conversions.register(:watt_hours, :joules, 3_600.0)
-Conversions.register(:kilowatt_hours, :joules, 3_600_000.0)
 
-# Conversions.register(:btus, :gallons_of_kerosene, 0.000007419521097)
-Conversions.register(:joules, :litres_of_kerosene, 1.0 / (135_000.0 * 3.78541178 * 1_055.05585)) # should only be used for RECS 2005
+# Distance: base unit = kilometre
+Conversions.register :kilometres, :miles,          0.621371192
+Conversions.register :kilometres, :nautical_miles, 0.539956803
 
-# Conversions.register(:btus, :gallons_of_propane, 0.000010471204188)
-Conversions.register(:joules, :litres_of_propane, 1.0 / (91_333.0 * 3.78541178 * 1_055.05585)) # should only be used for RECS 2005
+# Area
+Conversions.register :square_metres, :square_feet, 10.7639104
 
-# Conversions.register(:btus, :therms, 0.000010002388121)
-Conversions.register(:therms, :joules, 105_505_585.0) # should only be used for RECS 2005
+# Volume, liquid: base unit = litre
+Conversions.register :litres,       :gallons,            0.264172052
+Conversions.register :litres,       :cubic_inches,       61.0237441
 
-# Conversions.register(:btus, :gallons_of_fuel_oil, 0.0000072007637183)
-Conversions.register(:joules, :litres_of_fuel_oil, 1.0 / (138_690.0 * 3.78541178 * 1_055.05585)) # should only be used for RECS 2005
+# Volume, solid: base unit = cubic metre
+Conversions.register :cubic_metres, :cubic_feet,         35.3146667
+Conversions.register :cubic_metres, :hundred_cubic_feet, 0.353146667
 
-# Conversions.register(:tons_of_coal, :btus, 20_169_000.0)
-Conversions.register(:joules, :kilograms_of_coal, 1.0 / (22_342_000.0 * 0.00110231131 * 1_055.05585)) # should only be used for RECS 2005
+# Mass: base unit = kilogram
+Conversions.register :kilograms, :grams,         1_000.0
+Conversions.register :kilograms, :metric_tonnes, 0.001
+Conversions.register :kilograms, :pounds,        2.20462262
+Conversions.register :kilograms, :tons,          0.00110231131
 
-Conversions.register(:kilograms, :lbs, 2.20462262)
-Conversions.register(:metric_tonnes, :kilograms, 1_000.0)
-Conversions.register(:kbtus, :btus, 1_000.0)
-Conversions.register(:square_feet, :square_metres, 0.09290304)
-Conversions.register(:pounds_per_square_foot, :kilograms_per_square_metre, 4.88242764)
-Conversions.register(:kilograms_per_kilowatt_hour, :kilograms_per_megawatt_hour, 1_000.0)
-Conversions.register(:btus, :joules, 1_055.05585)
-Conversions.register(:btus, :megajoules, 0.00105505585)
-Conversions.register(:kbtus, :joules, 1_000.0 * 1_055.05585)
-Conversions.register(:kbtus, :megajoules, 1.05505585)
-Conversions.register(:cords, :joules, 2.11011171e10)
+# Energy: base unit = megajoule
+Conversions.register :megajoules, :kbtus,          0.94781712
+Conversions.register :megajoules, :kilowatt_hours, 0.277777778
 
-Conversions.register(:gallons_per_mile, :litres_per_kilometre, 2.35214583)
-Conversions.register(:pounds_per_mile, :kilograms_per_kilometre, 0.281849232)
-Conversions.register(:dollars, :cents, 100)
-Conversions.register(:cubic_inches, :litres, 0.016387064)
-Conversions.register(:cubic_feet, :cubic_metres, 0.0283168466)
-# 1 (kilocalories per pound) = 9 224.14105 joules per kilogram
-Conversions.register :kilocalories_per_pound, :joules_per_kilogram, 9_224.14105
-# 1 (grams per kilocalories) = 2.39005736 × 10-7 kilograms per joules
-Conversions.register :grams_per_kilocalorie, :kilograms_per_joule, 2.39005736e-7
-# 1 joule = 0.000239005736 kilocalories
-Conversions.register :joules, :kilocalories, 0.000239005736
+# Monetary
+Conversions.register :dollars, :cents, 100.0
 
+# GHG
 Conversions.register :carbon, :co2, (44.0 / 12.0)
+
+# Complex
+Conversions.register :kilometres_per_litre,                 :miles_per_gallon,                        (1.kilometres.to(:miles) / 1.litres.to(:gallons))
+Conversions.register :litres_per_kilometre,                 :gallons_per_mile,                        (1.litres.to(:gallons) / 1.kilometres.to(:miles))
+Conversions.register :kilograms_per_square_metre,           :pounds_per_square_foot,                  (1.kilograms.to(:pounds) / 1.square_metres.to(:square_feet))
+Conversions.register :litres_per_square_metre_hour,         :gallons_per_square_foot_hour,            (1.litres.to(:gallons) / 1.square_metres.to(:square_feet))
+Conversions.register :litres_per_room_night,                :gallons_per_room_night,                  (1.litres.to(:gallons))
+Conversions.register :cubic_metres_per_square_metre_hour,   :hundred_cubic_feet_per_square_foot_hour, (1.cubic_metres.to(:hundred_cubic_feet) / 1.square_metres.to(:square_feet))
+Conversions.register :cubic_metres_per_room_night,          :hundred_cubic_feet_per_room_night,       (1.cubic_metres.to(:hundred_cubic_feet))
+Conversions.register :kilowatt_hours_per_square_metre_hour, :kilowatt_hours_per_square_foot_hour,     (1 / 1.square_metres.to(:square_feet))
+Conversions.register :megajoules_per_square_metre_hour,     :kbtus_per_square_foot_hour,              (1.megajoules.to(:kbtus) / 1.square_metres.to(:square_feet))
+Conversions.register :megajoules_per_room_night,            :kbtus_per_room_night,                    (1.megajoules.to(:kbtus))
+
+
+# Odd units for pet - FIXME use megajoules rather than joules
+Conversions.register :kilocalories,           :joules,              4_184.0
+Conversions.register :kilocalories_per_pound, :joules_per_kilogram, (1.kilocalories.to(:joules) / 1.pounds.to(:kilograms))
+Conversions.register :grams_per_kilocalorie,  :kilograms_per_joule, (1.grams.to(:kilograms) / 1.kilocalories.to(:joules))
+
+
+# Odd units for residence - FIXME use megajoules rather than joules
+Conversions.register :cords,          :joules,             2.11011171e10
+Conversions.register :therms,         :joules,             105_505_585.0 # should only be used for RECS 2005
+Conversions.register :joules,         :litres_of_fuel_oil, (1.0 / (138_690.0 * 3.78541178 * 1_055.05585)) # should only be used for RECS 2005
+Conversions.register :joules,         :litres_of_propane,  (1.0 / (91_333.0 * 3.78541178 * 1_055.05585)) # should only be used for RECS 2005
+Conversions.register :joules,         :litres_of_kerosene, (1.0 / (135_000.0 * 3.78541178 * 1_055.05585)) # should only be used for RECS 2005
+Conversions.register :joules,         :kilograms_of_coal,  (1.0 / (22_342_000.0 * 0.00110231131 * 1_055.05585)) # should only be used for RECS 2005
+Conversions.register :kbtus,          :joules,             (1_000.0 * 1_055.05585)
+Conversions.register :watt_hours,     :joules,             3_600.0
+Conversions.register :kilowatt_hours, :joules,             3_600_000.0
+
+
+# Only used in app1
+Conversions.register(:pounds_per_gallon, :kilograms_per_litre, 0.119826427) # only used in app1
+Conversions.register(:pounds_per_mile, :kilograms_per_kilometre, 0.281849232)
+
+
+# DEPRECATE as of 1/20/2012 don't think these are used anywhere
+Conversions.register(:kilowatt_hours, :watt_hours, 1_000.0)
+Conversions.register(:kilowatt_hours, :btus, 3_412.14163)
+Conversions.register(:watt_hours, :btus, 3.4121414799)
+Conversions.register(:kbtus, :btus, 1_000.0)
+Conversions.register(:btus, :joules, 1_055.05585)
+Conversions.register(:btus, :megajoules, 0.00105505585)
+Conversions.register(:kilograms, :lbs, 2.20462262)
+Conversions.register(:kilograms_per_kilowatt_hour, :kilograms_per_megawatt_hour, 1_000.0)

data/lib/earth/diet/food_group/data_miner.rb

@@ -14,4 +14,3 @@ FoodGroup.class_eval do
     end
   end
 end
-

data/lib/earth/hospitality/commercial_building_energy_consumption_survey_response.rb

@@ -6,6 +6,10 @@ class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
   extend CohortScope
   self.minimum_cohort_size = 8 # CBECS doesn't report averages based on fewer than 20 samples
   
+  def self.lodging_records
+    where :detailed_activity => ['Hotel', 'Motel or inn']
+  end
+  
   col :id,                     :type => :integer
   col :census_region_number,   :type => :integer
   col :census_division_number, :type => :integer
@@ -29,12 +33,18 @@ class CommercialBuildingEnergyConsumptionSurveyResponse < ActiveRecord::Base
   col :weekly_hours,           :type => :integer
   col :electricity_use,        :type => :float
   col :electricity_use_units
+  col :electricity_energy,     :type => :float
+  col :electricity_energy_units
   col :natural_gas_use,        :type => :float
   col :natural_gas_use_units
+  col :natural_gas_energy,     :type => :float
+  col :natural_gas_energy_units
   col :fuel_oil_use,           :type => :float
   col :fuel_oil_use_units
-  col :district_heat_use,      :type => :float
-  col :district_heat_use_units
+  col :fuel_oil_energy,        :type => :float
+  col :fuel_oil_energy_units
+  col :steam_use,              :type => :float
+  col :steam_use_units
   col :stratum,                :type => :integer
   col :pair,                   :type => :integer
   col :weighting,              :type => :float

data/lib/earth/hospitality/commercial_building_energy_consumption_survey_response/data_miner.rb

@@ -1,10 +1,6 @@
 require 'earth/locality/data_miner'
 CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
   data_miner do
-    process 'Define some unit conversions' do
-      Conversions.register :hundred_cubic_feet, :cubic_metres, 2.83168466
-    end
-    
     import 'building characteristics from the 2003 EIA Commercial Building Energy Consumption Survey',
            :url => 'http://www.eia.gov/emeu/cbecs/cbecs2003/public_use_2003/data/FILE01.csv',
            :skip => 1,
@@ -47,6 +43,7 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
       store 'heating_degree_days', :field_name => 'HDD658'
       store 'cooling_degree_days', :field_name => 'CDD658'
       store 'electricity_use',     :synthesize => Proc.new { |row| row['ELCNS8'].to_i }, :units => :kilowatt_hours
+      store 'electricity_energy',  :field_name => 'ELBTU8', :from_units => :kbtus, :to_units => :megajoules
     end
     
     import 'fuel use characteristics from the 2003 EIA Commercial Building Energy Consumption Survey',
@@ -54,9 +51,11 @@ CommercialBuildingEnergyConsumptionSurveyResponse.class_eval do
            :skip => 1,
            :headers => ["PUBID8", "REGION8", "CENDIV8", "SQFT8", "SQFTC8", "YRCONC8", "PBA8", "ELUSED8", "NGUSED8", "FKUSED8", "PRUSED8", "STUSED8", "HWUSED8", "ADJWT8", "STRATUM8", "PAIR8", "NGCNS8", "NGBTU8", "NGEXP8", "ZNGCNS8", "ZNGEXP8", "FKCNS8", "FKBTU8", "FKEXP8", "ZFKCNS8", "ZFKEXP8", "DHUSED8", "DHHT18", "DHHT28", "DHCOOL8", "DHWATR8", "DHCOOK8", "DHMANU8", "DHOTH8", "DHCNS8", "DHBTU8", "DHEXP8", "ZDHCNS8", "ZDHEXP8"] do
       key 'id', :field_name => 'PUBID8'
-      store 'natural_gas_use',   :field_name => 'NGCNS8', :from_units => :hundred_cubic_feet, :to_units => :cubic_metres #!!!!!!!!!!!!
-      store 'fuel_oil_use',      :field_name => 'FKCNS8', :from_units => :gallons,            :to_units => :litres
-      store 'district_heat_use', :field_name => 'DHBTU8', :from_units => :kbtus,              :to_units => :megajoules
+      store 'natural_gas_use',      :field_name => 'NGCNS8', :from_units => :hundred_cubic_feet, :to_units => :cubic_metres
+      store 'natural_gas_energy',   :field_name => 'NGBTU8', :from_units => :kbtus,              :to_units => :megajoules
+      store 'fuel_oil_use',         :field_name => 'FKCNS8', :from_units => :gallons,            :to_units => :litres
+      store 'fuel_oil_energy',      :field_name => 'FKBTU8', :from_units => :kbtus,              :to_units => :megajoules
+      store 'steam_use',            :field_name => 'DHBTU8', :from_units => :kbtus,              :to_units => :megajoules
     end
   end
 end

data/lib/earth/hospitality/country_lodging_class.rb

@@ -12,7 +12,7 @@ class CountryLodgingClass < ActiveRecord::Base
   col :fuel_oil_intensity_units
   col :electricity_intensity, :type => :float
   col :electricity_intensity_units
-  col :district_heat_intensity, :type => :float
-  col :district_heat_intensity_units
+  col :steam_intensity, :type => :float
+  col :steam_intensity_units
   col :weighting, :type => :float
 end

data/lib/earth/hospitality/country_lodging_class/data_miner.rb

@@ -14,29 +14,30 @@ CountryLodgingClass.class_eval do
     end
     
     process "Calculate US lodging class fuel intensities from CommercialBuildingEnergyConsumptionSurveyResponse" do
-      where(:country_iso_3166_code => 'US').each do |lodging_class|
-        cbecs_responses = CommercialBuildingEnergyConsumptionSurveyResponse.where(:detailed_activity => lodging_class.cbecs_detailed_activity)
-        intensities = {}
-        
-        [:natural_gas, :fuel_oil, :electricity, :district_heat].each do |fuel|
-          intensity = cbecs_responses.inject(0) do |sum, response|
-            next sum unless response.send("#{fuel}_use").present?
-            occupied_room_nights = 365.0 / 7.0 / 12.0 * response.months_used * response.weekly_hours / 24.0 * response.lodging_rooms * 0.59
-            sum + (response.weighting * response.send("#{fuel}_use") / occupied_room_nights)
-          end
-          intensities[fuel] = intensity / cbecs_responses.sum(:weighting)
+      connection.select_values("SELECT DISTINCT cbecs_detailed_activity FROM #{CountryLodgingClass.quoted_table_name}").each do |cbecs_activity|
+        [:natural_gas, :fuel_oil, :electricity, :steam].each do |fuel|
+          where(:cbecs_detailed_activity => cbecs_activity).update_all(%{
+            #{fuel}_intensity = (
+              SELECT SUM(
+                weighting * #{fuel}_use / (365.0 / 7.0 / 12.0 * months_used * weekly_hours / 24.0 * lodging_rooms * 0.59)
+              ) / SUM(weighting)
+              FROM #{CommercialBuildingEnergyConsumptionSurveyResponse.quoted_table_name}
+              WHERE detailed_activity = '#{cbecs_activity}'
+            )
+          })
         end
         
-        lodging_class.natural_gas_intensity         = intensities[:natural_gas]
-        lodging_class.natural_gas_intensity_units   = 'cubic_metres_per_room_night'
-        lodging_class.fuel_oil_intensity            = intensities[:fuel_oil]
-        lodging_class.fuel_oil_intensity_units      = 'litres_per_room_night'
-        lodging_class.electricity_intensity         = intensities[:electricity]
-        lodging_class.electricity_intensity_units   = 'kilowatt_hours_per_room_night'
-        lodging_class.district_heat_intensity       = intensities[:district_heat]
-        lodging_class.district_heat_intensity_units = 'megajoules_per_room_night'
-        lodging_class.weighting                     = (lodging_class.lodging_class_name == 'Motel' or lodging_class.lodging_class_name == 'Inn') ? cbecs_responses.sum(:weighting) / 2.0 : cbecs_responses.sum(:weighting) # hack to ensure that we don't double-weight motels and inns when we calculate US national average lodging fuel intensities
-        lodging_class.save!
+        where(:cbecs_detailed_activity => cbecs_activity).update_all(%{
+          natural_gas_intensity_units = 'cubic_metres_per_room_night',
+          fuel_oil_intensity_units    = 'litrs_per_room_night',
+          electricity_intensity_units = 'kilowatt_hours_per_room_night',
+          steam_intensity_units       = 'megajoules_per_room_night',
+          weighting = (
+            SELECT SUM(weighting)
+            FROM #{CommercialBuildingEnergyConsumptionSurveyResponse.quoted_table_name}
+            WHERE detailed_activity = '#{cbecs_activity}'
+          ) / #{where(:cbecs_detailed_activity => cbecs_activity).count}
+        })
       end
     end
   end

data/lib/earth/hospitality/lodging_fuel_use_equation.rb

@@ -0,0 +1,26 @@
+class LodgingFuelUseEquation < ActiveRecord::Base
+  set_primary_key :name
+  
+  def self.find_by_criteria(fuel, criteria)
+    first :conditions => {
+      :fuel => fuel,
+      :climate_zone_number => (criteria[:climate_zone_number].present? ? criteria[:climate_zone_number].value : nil),
+      :property_rooms => (criteria[:property_rooms].present? ? 1 : 0),
+      :construction_year => (criteria[:property_construction_year].present? ? 1 : 0)
+    }
+  end
+  
+  col :name
+  col :regression
+  col :fuel
+  col :climate_zone_number, :type => :integer
+  col :property_rooms,      :type => :boolean
+  col :construction_year,   :type => :boolean
+  col :rooms_factor,        :type => :float
+  col :year_factor,         :type => :float
+  col :constant,            :type => :float
+  col :units
+  col :oil_share,           :type => :float
+  col :gas_share,           :type => :float
+  col :steam_share,         :type => :float
+end

data/lib/earth/hospitality/lodging_fuel_use_equation/data_miner.rb

@@ -0,0 +1,20 @@
+LodgingFuelUseEquation.class_eval do
+  data_miner do
+    import "fuel use equations derived from CBECS 2003",
+           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdGN0X2l3RjFaRTBFRWdseWJoc0ZvZkE&output=csv' do
+      key 'name'
+      store 'regression'
+      store 'fuel'
+      store 'climate_zone_number', :nullify => true
+      store 'property_rooms'
+      store 'construction_year'
+      store 'rooms_factor'
+      store 'year_factor'
+      store 'constant'
+      store 'units'
+      store 'oil_share'
+      store 'gas_share'
+      store 'steam_share'
+    end
+  end
+end

data/lib/earth/locality/census_division.rb

@@ -26,12 +26,4 @@ class CensusDivision < ActiveRecord::Base
   col :meeting_building_electricity_intensity_units
   col :meeting_building_district_heat_intensity, :type => :float
   col :meeting_building_district_heat_intensity_units
-  col :lodging_building_natural_gas_intensity, :type => :float
-  col :lodging_building_natural_gas_intensity_units
-  col :lodging_building_fuel_oil_intensity, :type => :float
-  col :lodging_building_fuel_oil_intensity_units
-  col :lodging_building_electricity_intensity, :type => :float
-  col :lodging_building_electricity_intensity_units
-  col :lodging_building_district_heat_intensity, :type => :float
-  col :lodging_building_district_heat_intensity_units
 end

data/lib/earth/locality/census_division/data_miner.rb

@@ -31,15 +31,5 @@ CensusDivision.class_eval do
       store 'meeting_building_electricity_intensity', :from_units => :kilowatt_hours_per_square_foot_hour, :to_units => :kilowatt_hours_per_square_metre_hour
       store 'meeting_building_district_heat_intensity', :from_units => :thousand_btu_per_square_foot_hour, :to_units => :megajoules_per_square_metre_hour
     end
-    
-    import 'lodging building fuel intensities derived from CBECS 2003',
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdGkxNExTajZPSjRWU3REVks5SFJ0cmc&output=csv',
-           :select => lambda { |row| row['census_division'].to_i.between?(1, 9) } do
-      key   'number', :field_name => 'census_division'
-      store 'lodging_building_electricity_intensity',   :field_name => 'electricity_intensity',   :units_field_name => 'electricity_intensity_units'
-      store 'lodging_building_natural_gas_intensity',   :field_name => 'natural_gas_intensity',   :from_units => :hundred_cubic_feet_per_room_night, :to_units => :cubic_metres_per_room_night
-      store 'lodging_building_fuel_oil_intensity',      :field_name => 'fuel_oil_intensity',      :from_units => :gallons_per_room_night,            :to_units => :litres_per_room_night
-      store 'lodging_building_district_heat_intensity', :field_name => 'district_heat_intensity', :from_units => :thousand_btu_per_room_night,       :to_units => :megajoules_per_room_night
-    end
   end
 end

data/lib/earth/locality/census_region/data_miner.rb

@@ -10,4 +10,3 @@ CensusRegion.class_eval do
     end
   end
 end
-

data/lib/earth/locality/climate_division.rb

@@ -5,9 +5,25 @@ class ClimateDivision < ActiveRecord::Base
   belongs_to :state, :foreign_key => 'state_postal_abbreviation'
   
   RADIUS = 750
-
+  
+  def climate_zone_number
+    if cooling_degree_days < 2000
+      if heating_degree_days > 7000
+        1
+      elsif heating_degree_days > 5499
+        2
+      elsif heating_degree_days > 3999
+        3
+      else
+        4
+      end
+    else
+      5
+    end
+  end
+  
   col :name
   col :heating_degree_days, :type => :float
   col :cooling_degree_days, :type => :float
   col :state_postal_abbreviation
-end
+end

data/lib/earth/locality/climate_division/data_miner.rb

@@ -10,4 +10,3 @@ ClimateDivision.class_eval do
     #associate :state, :key => :state_postal_abbreviation, :foreign_key => :postal_abbreviation
   end
 end
-

data/lib/earth/locality/country.rb

@@ -26,8 +26,8 @@ class Country < ActiveRecord::Base
                 :lodging_fuel_oil_intensity_units => lambda { united_states.lodging_fuel_oil_intensity_units }, # for now assume US represents world
                 :lodging_electricity_intensity => lambda { united_states.lodging_electricity_intensity }, # for now assume US represents world
                 :lodging_electricity_intensity_units => lambda { united_states.lodging_electricity_intensity_units }, # for now assume US represents world
-                :lodging_district_heat_intensity => lambda { united_states.lodging_district_heat_intensity }, # for now assume US represents world
-                :lodging_district_heat_intensity_units => lambda { united_states.lodging_district_heat_intensity_units }, # for now assume US represents world
+                :lodging_steam_intensity => lambda { united_states.lodging_steam_intensity }, # for now assume US represents world
+                :lodging_steam_intensity_units => lambda { united_states.lodging_steam_intensity_units }, # for now assume US represents world
                 :rail_trip_distance => lambda { weighted_average(:rail_trip_distance, :weighted_by => :rail_passengers) },
                 :rail_trip_distance_units => 'kilometres', # FIXME TODO derive this
                 :rail_speed => lambda { weighted_average(:rail_speed, :weighted_by => :rail_passengers) },
@@ -67,8 +67,8 @@ class Country < ActiveRecord::Base
   col :lodging_fuel_oil_intensity_units
   col :lodging_electricity_intensity, :type => :float
   col :lodging_electricity_intensity_units
-  col :lodging_district_heat_intensity, :type => :float
-  col :lodging_district_heat_intensity_units
+  col :lodging_steam_intensity, :type => :float
+  col :lodging_steam_intensity_units
   col :rail_passengers, :type => :float
   col :rail_trip_distance, :type => :float
   col :rail_trip_distance_units

data/lib/earth/locality/country/data_miner.rb

@@ -118,8 +118,8 @@ Country.class_eval do
           country.lodging_fuel_oil_intensity_units = 'gallons_per_room_night' # FIXME TODO derive this
           country.lodging_electricity_intensity = country.lodging_classes.weighted_average(:electricity_intensity)
           country.lodging_electricity_intensity_units = 'kilowatt_hours_per_room_night' # FIXME TODO derive this
-          country.lodging_district_heat_intensity = country.lodging_classes.weighted_average(:district_heat_intensity)
-          country.lodging_district_heat_intensity_units = 'megajoules_per_room_night' # FIXME TODO derive this
+          country.lodging_steam_intensity = country.lodging_classes.weighted_average(:steam_intensity)
+          country.lodging_steam_intensity_units = 'megajoules_per_room_night' # FIXME TODO derive this
           country.save!
         end
       end

data/lib/earth/locality/state.rb

@@ -10,10 +10,15 @@ class State < ActiveRecord::Base
   def country
     Country.united_states
   end
-
+  
+  def climate_zone_number
+    potential_zones = climate_divisions.map(&:climate_zone_number)
+    potential_zones.uniq.length == 1 ? potential_zones.first : nil
+  end
+  
   col :postal_abbreviation
   col :fips_code, :type => :integer
   col :name
   col :census_division_number
   col :petroleum_administration_for_defense_district_code
-end
+end

data/lib/earth/residence/residential_energy_consumption_survey_response.rb

@@ -17,18 +17,18 @@ class ResidentialEnergyConsumptionSurveyResponse < ActiveRecord::Base
   SUBCOHORT_THRESHOLD = 5 # per Matt
   
   INPUT_CHARACTERISTICS = [
-    :census_region,
-    :heating_degree_days,
-    :cooling_degree_days,
-    :residence_class,
-    :rooms,
-    :bedrooms,
-    :bathrooms,
-    :floorspace,
-    :residents,
-    :urbanity,
-    :construction_year,
     :ownership,
+    :construction_year,
+    :urbanity,
+    :residents,
+    :floorspace,
+    :bathrooms,
+    :bedrooms,
+    :rooms,
+    :residence_class,
+    :cooling_degree_days,
+    :heating_degree_days,
+    :census_region
   ]
   
   # sabshere 9/20/10 sorted with sort -d -t "'" -k 2 ~/Desktop/parts.txt

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.11.8"
+  VERSION = "0.11.9"
 end

data/spec/earth_spec.rb

@@ -22,7 +22,7 @@ describe Earth do
 
   describe '.resources' do
     it 'should get a list of all resource names' do
-      Earth.resources.length.should == 95
+      Earth.resources.length.should == 96
       Earth.resources.should include('Aircraft')
       Earth.resources.should include('Industry')
     end
@@ -33,7 +33,7 @@ describe Earth do
       Earth.resources('computation').length.should == 3
       Earth.resources('diet').length.should == 2
       Earth.resources('fuel').length.should == 5
-      Earth.resources('hospitality').length.should == 4
+      Earth.resources('hospitality').length.should == 5
       Earth.resources('industry').length.should == 13
       Earth.resources('locality').length.should == 10
       Earth.resources('pet').length.should == 4

metadata

@@ -1,270 +1,273 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: earth
-version: !ruby/object:Gem::Version
-  version: 0.11.8
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.11.9
 platform: ruby
-authors:
+authors: 
 - Seamus Abshere
 - Derek Kastner
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-24 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: data_miner
-  requirement: &2181048400 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :runtime
   prerelease: false
-  version_requirements: *2181048400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: to_regexp
-  requirement: &2181047980 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181047980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cohort_scope
-  requirement: &2181047260 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181047260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: table_warnings
-  requirement: &2181046760 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2181046760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: remote_table
-  requirement: &2181046180 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2181046180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: falls_back_on
-  requirement: &2181045720 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181045720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: fixed_width-multibyte
-  requirement: &2181045260 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181045260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: geokit
-  requirement: &2181044840 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181044840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: fuzzy_match
-  requirement: &2181044340 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2181044340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: weighted_average
-  requirement: &2181043740 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2181043740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: mini_record-compat
-  requirement: &2181043260 !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181043260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2181042580 !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181042580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2181041540 !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *2181041540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &2181040760 !ruby/object:Gem::Requirement
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2181040760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: bueller
-  requirement: &2181039500 !ruby/object:Gem::Requirement
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2181039500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &2181039000 !ruby/object:Gem::Requirement
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2181039000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2181038280 !ruby/object:Gem::Requirement
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2181038280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &2162584420 !ruby/object:Gem::Requirement
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2162584420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2162583900 !ruby/object:Gem::Requirement
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2162583900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &2162583360 !ruby/object:Gem::Requirement
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2162583360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
   name: mysql
-  requirement: &2162581940 !ruby/object:Gem::Requirement
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2162581940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
   name: pg
-  requirement: &2162579920 !ruby/object:Gem::Requirement
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2162579920
+  version_requirements: *id022
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
-executables:
+executables: 
 - earth_tester.rb
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - LICENSE-PREAMBLE
 - README.markdown
-files:
+files: 
 - .document
 - .gitignore
 - Gemfile
@@ -462,6 +465,8 @@ files:
 - lib/earth/hospitality/data_miner.rb
 - lib/earth/hospitality/lodging_class.rb
 - lib/earth/hospitality/lodging_class/data_miner.rb
+- lib/earth/hospitality/lodging_fuel_use_equation.rb
+- lib/earth/hospitality/lodging_fuel_use_equation/data_miner.rb
 - lib/earth/hospitality/lodging_property.rb
 - lib/earth/industry.rb
 - lib/earth/industry/cbecs_energy_intensity.rb
@@ -628,32 +633,41 @@ files:
 - vendor/geokit-rails/test/schema.rb
 - vendor/geokit-rails/test/tasks.rake
 - vendor/geokit-rails/test/test_helper.rb
+has_rdoc: true
 homepage: https://github.com/brighterplanet/earth
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3547937136240416644
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3547937136240416644
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Land, sky, and sea
-test_files:
+test_files: 
 - features/automobile_fuel.feature
 - features/automobile_make.feature
 - features/automobile_make_fleet_year.feature