earth 0.7.0 → 0.11.0

data/lib/earth/locality.rb

@@ -14,3 +14,4 @@ require 'earth/locality/zip_code'
 
 require 'earth/automobile'
 require 'earth/residence'
+require 'earth/rail'

data/lib/earth/locality/country.rb

@@ -33,7 +33,7 @@ class Country < ActiveRecord::Base
   
   col :iso_3166_code
   col :name
-  col :automobile_urbanity, :type => :float
+  col :automobile_urbanity, :type => :float # float from 0 to 1
   col :automobile_fuel_efficiency, :type => :float
   col :automobile_fuel_efficiency_units
   col :automobile_city_speed, :type => :float

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

@@ -31,46 +31,35 @@ Country.class_eval do
     
     # FIXME TODO eventually need to do this for all countries
     process "Derive US average automobile fuel efficiency from AutomobileTypeFuelYear" do
-      scope = AutomobileTypeFuelYear.where(:year => AutomobileTypeFuelYear.maximum(:year))
-      fe = scope.sum(:total_travel).to_f / scope.sum(:fuel_consumption)
-      units = scope.first.total_travel_units + '_per_' + scope.first.fuel_consumption_units.singularize
-      
-      connection.execute %{
-        UPDATE countries
-        SET automobile_fuel_efficiency = #{fe},
-            automobile_fuel_efficiency_units = '#{units}'
-        WHERE iso_3166_code = 'US'
-      }
+      fuel_years = AutomobileTypeFuelYear.where(:year => AutomobileTypeFuelYear.maximum(:year))
+      where(:iso_3166_code => 'US').update_all(
+        :automobile_fuel_efficiency => (fuel_years.sum(:total_travel).to_f / fuel_years.sum(:fuel_consumption)),
+        :automobile_fuel_efficiency_units => (fuel_years.first.total_travel_units + '_per_' + fuel_years.first.fuel_consumption_units.singularize)
+      )
     end
     
     process "Convert automobile city speed from miles per hour to kilometres per hour" do
       conversion_factor = 1.miles.to(:kilometres)
-      connection.execute %{
-        UPDATE countries
-        SET automobile_city_speed = 1.0 * automobile_city_speed * #{conversion_factor},
-            automobile_city_speed_units = 'kilometres_per_hour'
-        WHERE automobile_city_speed_units = 'miles_per_hour'
-      }
+      where(:automobile_city_speed_units => 'miles_per_hour').update_all(%{
+        automobile_city_speed = 1.0 * automobile_city_speed * #{conversion_factor},
+        automobile_city_speed_units = 'kilometres_per_hour'
+      })
     end
     
     process "Convert automobile highway speed from miles per hour to kilometres per hour" do
       conversion_factor = 1.miles.to(:kilometres)
-      connection.execute %{
-        UPDATE countries
-        SET automobile_highway_speed = 1.0 * automobile_highway_speed * #{conversion_factor},
-            automobile_highway_speed_units = 'kilometres_per_hour'
-        WHERE automobile_highway_speed_units = 'miles_per_hour'
-      }
+      where(:automobile_highway_speed_units => 'miles_per_hour').update_all(%{
+        automobile_highway_speed = 1.0 * automobile_highway_speed * #{conversion_factor},
+        automobile_highway_speed_units = 'kilometres_per_hour'
+      })
     end
     
     process "Convert automobile trip distance from miles to kilometres" do
       conversion_factor = 1.miles.to(:kilometres)
-      connection.execute %{
-        UPDATE countries
-        SET automobile_trip_distance = 1.0 * automobile_trip_distance * #{conversion_factor},
-            automobile_trip_distance_units = 'kilometres'
-        WHERE automobile_trip_distance_units = 'miles'
-      }
+      where(:automobile_trip_distance_units => 'miles').update_all(%{
+        automobile_trip_distance = 1.0 * automobile_trip_distance * #{conversion_factor},
+        automobile_trip_distance_units = 'kilometres'
+      })
     end
     
     process "Ensure RailCompany is populated" do
@@ -98,6 +87,25 @@ Country.class_eval do
       store 'rail_trip_co2_emission_factor',   :units_field_name => 'rail_trip_co2_emission_factor_units' 
     end
     
+    process "Ensure RailFuel is populated" do
+      RailFuel.run_data_miner!
+    end
+    
+    process "Unit conversion for European rail diesel intensity" do
+      diesel = RailFuel.find_by_name("diesel")
+      where(:rail_trip_diesel_intensity_units => 'grams_per_passenger_kilometre').update_all(%{
+        rail_trip_diesel_intensity = 1.0 * rail_trip_diesel_intensity / 1000.0 / #{diesel.density},
+        rail_trip_diesel_intensity_units = 'litres_per_passenger_kilometre'
+      })
+    end
+    
+    process "Unit conversion for European rail co2 emission factor" do
+      where(:rail_trip_co2_emission_factor_units => 'grams_per_passenger_kilometre').update_all(%{
+        rail_trip_co2_emission_factor = 1.0 * rail_trip_co2_emission_factor / 1000.0,
+        rail_trip_co2_emission_factor_units = 'kilograms_per_passenger_kilometre'
+      })
+    end
+    
     process "Derive US rail fuel and emission data from RailCompany" do
       country = Country.united_states
       country.rail_trip_electricity_intensity = country.rail_companies.weighted_average(:electricity_intensity, :weighted_by => :passengers)

data/lib/earth/locality/data_miner.rb

@@ -14,3 +14,4 @@ require 'earth/locality/zip_code/data_miner'
 
 require 'earth/automobile/data_miner'
 require 'earth/residence/data_miner'
+require 'earth/rail/data_miner'

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

@@ -31,10 +31,11 @@ EgridSubregion.class_eval do
     end
     
     process "Convert co2 emission factor to metric units" do
-      conversion_factor = 1.pounds.to(:kilograms) * 1.0 / 1_000.0 # kg / lbs * MWh / kWh
-      update_all %{ electricity_co2_emission_factor = electricity_co2_emission_factor * #{conversion_factor},
-                    electricity_co2_emission_factor_units = 'kilograms_per_kilowatt_hour'
-                    WHERE electricity_co2_emission_factor_units = 'pounds_per_megawatt_hour' }
+      conversion_factor = 1.pounds.to(:kilograms) / 1_000.0 # kg / lbs * MWh / kWh
+      where(:electricity_co2_emission_factor_units => 'pounds_per_megawatt_hour').update_all(%{
+        electricity_co2_emission_factor = 1.0 * electricity_co2_emission_factor * #{conversion_factor},
+        electricity_co2_emission_factor_units = 'kilograms_per_kilowatt_hour'
+      })
     end
     
     process "Insure GreenhouseGas is populated" do
@@ -42,24 +43,28 @@ EgridSubregion.class_eval do
     end
     
     process "Convert ch4 emission factor to metric units and co2e" do
-      conversion_factor = 1.pounds.to(:kilograms) * 1.0 / 1_000_000.0 # kg / lbs * GWh / kWh
+      conversion_factor = 1.pounds.to(:kilograms) / 1_000_000.0 # kg / lbs * GWh / kWh
       gwp = GreenhouseGas[:ch4].global_warming_potential
-      update_all %{ electricity_ch4_emission_factor = electricity_ch4_emission_factor * #{conversion_factor} * #{gwp},
-                    electricity_ch4_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
-                    WHERE electricity_ch4_emission_factor_units = 'pounds_per_gigawatt_hour' }
+      where(:electricity_ch4_emission_factor_units => 'pounds_per_gigawatt_hour').update_all(%{
+        electricity_ch4_emission_factor = 1.0 * electricity_ch4_emission_factor * #{conversion_factor} * #{gwp},
+        electricity_ch4_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
+      })
     end
     
     process "Convert n2o emission factor to metric units and co2e" do
-      conversion_factor = 1.pounds.to(:kilograms) * 1.0 / 1_000_000.0 # kg / lbs * GWh / kWh
+      conversion_factor = 1.pounds.to(:kilograms) / 1_000_000.0 # kg / lbs * GWh / kWh
       gwp = GreenhouseGas[:n2o].global_warming_potential
-      update_all %{ electricity_n2o_emission_factor = electricity_n2o_emission_factor * #{conversion_factor} * #{gwp},
-                    electricity_n2o_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
-                    WHERE electricity_n2o_emission_factor_units = 'pounds_per_gigawatt_hour' }
+      where(:electricity_n2o_emission_factor_units => 'pounds_per_gigawatt_hour').update_all(%{
+        electricity_n2o_emission_factor = 1.0 * electricity_n2o_emission_factor * #{conversion_factor} * #{gwp},
+        electricity_n2o_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
+      })
     end
     
     process "Calculate combined emission factor" do
-      update_all %{ electricity_emission_factor = electricity_co2_emission_factor + electricity_ch4_emission_factor + electricity_n2o_emission_factor,
-                    electricity_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour' }
+      update_all(%{
+        electricity_emission_factor = 1.0 * electricity_co2_emission_factor + electricity_ch4_emission_factor + electricity_n2o_emission_factor,
+        electricity_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour'
+      })
     end
   end
 end

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

@@ -8,9 +8,7 @@ Urbanity.class_eval do
       ::Earth::Utils.insert_ignore(
         :src => ResidentialEnergyConsumptionSurveyResponse,
         :dest => Urbanity,
-        :cols => {
-          :urbanity_id => :name
-        }
+        :cols => { :urbanity_id => :name }
       )
     end
   end

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

@@ -18,7 +18,7 @@ ZipCode.class_eval do
     end
     
     import 'a list of zipcode states and eGRID Subregions from the US EPA',
-           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/Power_Profiler_Zipcode_Tool_v3-1.xls',
+           :url => 'http://www.epa.gov/cleanenergy/documents/egridzips/Power_Profiler_Zipcode_Tool_v3-2.xlsx',
            :sheet => 'Zip-subregion' do
       key   'name', :field_name => 'ZIP (character)'
       store 'state_postal_abbreviation', :field_name => 'State'

data/lib/earth/rail/national_transit_database_record/data_miner.rb

@@ -32,25 +32,21 @@ NationalTransitDatabaseRecord.class_eval do
     
     process "Convert miles to kilometres" do
       conversion_factor = 1.miles.to(:kilometres)
-      %{ vehicle_distance passenger_distance }.split.each do |field|
-        connection.execute %{
-          UPDATE #{table_name}
-          SET #{field} = #{field} * #{conversion_factor},
-              #{field}_units = 'kilometres'
-          WHERE #{field}_units = 'miles'
-        }
+      %w{ vehicle_distance passenger_distance }.each do |field|
+        where("#{field}_units" => 'miles').update_all(%{
+          #{field} = 1.0 * #{field} * #{conversion_factor},
+          #{field}_units = 'kilometres'
+        })
       end
     end
       
     process "Convert gallons to litres" do
       conversion_factor = 1.gallons.to(:litres)
-      %{ diesel gasoline lpg lng cng kerosene biodiesel }.split.each do |fuel|
-        connection.execute %{
-          UPDATE #{table_name}
-          SET #{fuel} = #{fuel} * #{conversion_factor},
-              #{fuel}_units = 'litres'
-          WHERE #{fuel}_units = 'gallons'
-        }
+      %w{ diesel gasoline lpg lng cng kerosene biodiesel }.each do |fuel|
+        where("#{fuel}_units" => 'gallons').update_all(%{
+          #{fuel} = 1.0 * #{fuel} * #{conversion_factor},
+          #{fuel}_units = 'litres'
+        })
       end
     end
   end

data/lib/earth/rail/rail_fuel.rb

@@ -3,11 +3,7 @@ class RailFuel < ActiveRecord::Base
   
   belongs_to :fuel, :foreign_key => 'fuel_name'
   
-  [:density, :density_units, :co2_emission_factor, :co2_emission_factor_units, :co2_biogenic_emission_factor, :co2_biogenic_emission_factor_units].each do |method|
-    define_method method do
-      fuel.send(method)
-    end
-  end
+  delegate :density, :density_units, :co2_emission_factor, :co2_emission_factor_units, :co2_biogenic_emission_factor, :co2_biogenic_emission_factor_units, :to => :fuel, :allow_nil => true
   
   col :name
   col :fuel_name
@@ -15,4 +11,4 @@ class RailFuel < ActiveRecord::Base
   col :ch4_emission_factor_units
   col :n2o_emission_factor, :type => :float
   col :n2o_emission_factor_units
-end
+end

data/lib/earth/residence/air_conditioner_use/data_miner.rb

@@ -8,9 +8,7 @@ AirConditionerUse.class_eval do
       ::Earth::Utils.insert_ignore(
         :src => ResidentialEnergyConsumptionSurveyResponse,
         :dest => AirConditionerUse,
-        :cols => {
-          :central_ac_use => :name
-        }
+        :cols => { :central_ac_use => :name }
       )
     end
     

data/lib/earth/residence/clothes_machine_use/data_miner.rb

@@ -8,9 +8,7 @@ ClothesMachineUse.class_eval do
       ::Earth::Utils.insert_ignore(
         :src => ResidentialEnergyConsumptionSurveyResponse,
         :dest => ClothesMachineUse,
-        :cols => {
-          :clothes_washer_use => :name
-        }
+        :cols => { :clothes_washer_use => :name }
       )
     end
     

data/lib/earth/residence/dishwasher_use/data_miner.rb

@@ -8,9 +8,7 @@ DishwasherUse.class_eval do
       ::Earth::Utils.insert_ignore(
         :src => ResidentialEnergyConsumptionSurveyResponse,
         :dest => DishwasherUse,
-        :cols => {
-          :dishwasher_use_id => :name
-        }
+        :cols => { :dishwasher_use_id => :name }
       )
     end
     

data/lib/earth/residence/residence_class/data_miner.rb

@@ -8,9 +8,7 @@ ResidenceClass.class_eval do
       ::Earth::Utils.insert_ignore(
         :src => ResidentialEnergyConsumptionSurveyResponse,
         :dest => ResidenceClass,
-        :cols => {
-          :residence_class_id => :name
-        }
+        :cols => { :residence_class_id => :name }
       )
     end
   end

data/lib/earth/residence/residential_energy_consumption_survey_response/data_miner.rb

@@ -114,7 +114,7 @@ ResidentialEnergyConsumptionSurveyResponse.class_eval do
         max = maximum attr_name, :select => "CONVERT(#{attr_name}, UNSIGNED INTEGER)"
         # if the maximum value of a row is all 999's, then it's a LEGITIMATE SKIP and we should set it to zero
         if /^9+$/.match(max.to_i.to_s)
-          update_all "#{attr_name} = 0", "#{attr_name} = #{max}"
+          where(attr_name => max).update_all attr_name => 0
         end
       end
     end
@@ -163,6 +163,7 @@ ResidentialEnergyConsumptionSurveyResponse.class_eval do
     end
     
     process "synthesize air conditioner use from central AC and window AC use" do
+      #          SET                                                                                  WHERE
       update_all "air_conditioner_use_id = 'Turned on just about all summer'",                        " central_ac_use = 'Turned on just about all summer'                        OR window_ac_use = 'Turned on just about all summer'"
       update_all "air_conditioner_use_id = 'Turned on quite a bit'",                                  "(central_ac_use = 'Turned on quite a bit'                                  OR window_ac_use = 'Turned on quite a bit')                                  AND air_conditioner_use_id IS NULL"
       update_all "air_conditioner_use_id = 'Turned on only a few days or nights when really needed'", "(central_ac_use = 'Turned on only a few days or nights when really needed' OR window_ac_use = 'Turned on only a few days or nights when really needed') AND air_conditioner_use_id IS NULL"
@@ -170,6 +171,7 @@ ResidentialEnergyConsumptionSurveyResponse.class_eval do
     end
     
     process "synthesize clothes machine use from washer and dryer use" do
+      #          SET                                                    WHERE
       update_all "clothes_machine_use_id = clothes_washer_use",         "                                                    clothes_dryer_use = 'Use it every time you wash clothes'"
       update_all "clothes_machine_use_id = NULL",                       "clothes_washer_use IS NULL                      AND clothes_dryer_use = 'Use it for some, but not all, loads of wash'"
       update_all "clothes_machine_use_id = '1 load or less each week'", "clothes_washer_use = '1 load or less each week' AND clothes_dryer_use = 'Use it for some, but not all, loads of wash'"

data/lib/earth/utils.rb

@@ -28,16 +28,26 @@ module Earth
       dest_cols = args[:cols].values
       dest_primary_key = args[:dest].primary_key.to_sym
       dest_primary_key_in_src = args[:cols].key(dest_primary_key)
+      
+      sql_items = {}
+      args[:cols].each do |src_col, dest_col|
+        if src_col.class == Symbol
+          sql_items[dest_col] = 'src.' + src_col.to_s
+        else
+          sql_items[dest_col] = src_col.map { |col| 'src.' + col.to_s }.join(" || ' ' || ")
+        end
+      end
+      
       sql = %{
         INSERT INTO #{args[:dest].table_name}(#{dest_cols.join(',')})
-        SELECT #{dest_cols.map { |dest_col| 'MAX(src.' + args[:cols].key(dest_col).to_s + ')' }.join(',')}
+        SELECT #{dest_cols.map { |dest_col| 'MAX(' + sql_items[dest_col] + ')' }.join(',')}
         FROM #{args[:src].table_name} AS src
         WHERE
-          src.#{dest_primary_key_in_src} IS NOT NULL
-          AND LENGTH(TRIM(CAST(src.#{dest_primary_key_in_src} AS CHAR))) > 0
-          AND src.#{dest_primary_key_in_src} NOT IN (SELECT dest.#{dest_primary_key} FROM #{args[:dest].table_name} AS dest)
+          (#{sql_items[dest_primary_key]}) IS NOT NULL
+          AND LENGTH(TRIM(CAST((#{sql_items[dest_primary_key]}) AS CHAR))) > 0
+          AND (#{sql_items[dest_primary_key]}) NOT IN (SELECT dest.#{dest_primary_key} FROM #{args[:dest].table_name} AS dest)
           AND (#{args[:where] || '1=1'})
-        GROUP BY src.#{dest_primary_key_in_src}
+        GROUP BY #{sql_items[dest_primary_key]}
       }
       ::ActiveRecord::Base.connection.execute sql
     end

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.7.0"
+  VERSION = "0.11.0"
 end

data/spec/earth_spec.rb

@@ -23,7 +23,7 @@ describe Earth do
   describe '.resource_map' do
     it 'should get a list of resource_map' do
       resource_map = Earth.resource_map
-      resource_map.keys.count.should == 89
+      resource_map.keys.count.should == 88
       resource_map['FuelType'].should == 'fuel'
     end
     it 'should exclude data_miner files' do
@@ -33,13 +33,13 @@ describe Earth do
 
   describe '.search' do
     it 'should get a list of all resource names' do
-      Earth.search.length.should == 89
+      Earth.search.length.should == 88
       Earth.search.should include('Aircraft')
       Earth.search.should include('Industry')
     end
     it 'should filter resource_map by domain' do
-      Earth.search('air').length.should == 12
-      Earth.search('automobile').length.should == 15
+      Earth.search('air').length.should == 10
+      Earth.search('automobile').length.should == 16
       Earth.search('bus').length.should == 4
       Earth.search('computation').length.should == 3
       Earth.search('diet').length.should == 2

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -277,6 +277,7 @@ files:
 - Rakefile
 - TODO
 - bin/earth_tester.rb
+- certification_changelog.markdown
 - earth.gemspec
 - features/automobile_fuel.feature
 - features/automobile_make.feature
@@ -287,7 +288,6 @@ files:
 - features/automobile_make_year.feature
 - features/automobile_size_class.feature
 - features/automobile_size_class_year.feature
-- features/automobile_type_fuel_age.feature
 - features/automobile_type_fuel_control.feature
 - features/automobile_type_fuel_year.feature
 - features/automobile_type_fuel_year_age.feature
@@ -365,10 +365,6 @@ files:
 - lib/earth/air.rb
 - lib/earth/air/aircraft.rb
 - lib/earth/air/aircraft/data_miner.rb
-- lib/earth/air/aircraft_class.rb
-- lib/earth/air/aircraft_class/data_miner.rb
-- lib/earth/air/aircraft_fuel_use_equation.rb
-- lib/earth/air/aircraft_fuel_use_equation/data_miner.rb
 - lib/earth/air/aircraft_instance.rb
 - lib/earth/air/aircraft_instance_seat_class.rb
 - lib/earth/air/airline.rb
@@ -392,8 +388,6 @@ files:
 - lib/earth/automobile/automobile_fuel/data_miner.rb
 - lib/earth/automobile/automobile_make.rb
 - lib/earth/automobile/automobile_make/data_miner.rb
-- lib/earth/automobile/automobile_make_fleet_year.rb
-- lib/earth/automobile/automobile_make_fleet_year/data_miner.rb
 - lib/earth/automobile/automobile_make_model.rb
 - lib/earth/automobile/automobile_make_model/data_miner.rb
 - lib/earth/automobile/automobile_make_model_year.rb
@@ -402,12 +396,14 @@ files:
 - lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb
 - lib/earth/automobile/automobile_make_year.rb
 - lib/earth/automobile/automobile_make_year/data_miner.rb
+- lib/earth/automobile/automobile_make_year_fleet.rb
+- lib/earth/automobile/automobile_make_year_fleet/data_miner.rb
+- lib/earth/automobile/automobile_model.rb
+- lib/earth/automobile/automobile_model/data_miner.rb
 - lib/earth/automobile/automobile_size_class.rb
 - lib/earth/automobile/automobile_size_class/data_miner.rb
 - lib/earth/automobile/automobile_size_class_year.rb
 - lib/earth/automobile/automobile_size_class_year/data_miner.rb
-- lib/earth/automobile/automobile_type_fuel_age.rb
-- lib/earth/automobile/automobile_type_fuel_age/data_miner.rb
 - lib/earth/automobile/automobile_type_fuel_control.rb
 - lib/earth/automobile/automobile_type_fuel_control/data_miner.rb
 - lib/earth/automobile/automobile_type_fuel_year.rb
@@ -418,7 +414,10 @@ files:
 - lib/earth/automobile/automobile_type_fuel_year_control/data_miner.rb
 - lib/earth/automobile/automobile_type_year.rb
 - lib/earth/automobile/automobile_type_year/data_miner.rb
+- lib/earth/automobile/automobile_year.rb
+- lib/earth/automobile/automobile_year/data_miner.rb
 - lib/earth/automobile/data_miner.rb
+- lib/earth/automobile/dependencies.txt
 - lib/earth/bus.rb
 - lib/earth/bus/bus_class.rb
 - lib/earth/bus/bus_class/data_miner.rb
@@ -651,7 +650,6 @@ test_files:
 - features/automobile_make_year.feature
 - features/automobile_size_class.feature
 - features/automobile_size_class_year.feature
-- features/automobile_type_fuel_age.feature
 - features/automobile_type_fuel_control.feature
 - features/automobile_type_fuel_year.feature
 - features/automobile_type_fuel_year_age.feature