earth 0.7.0 → 0.11.0

data/lib/earth/automobile/dependencies.txt

@@ -0,0 +1,45 @@
+This file shows which additional classes will be data_mined when you run data_miner on an automobile class. To get a complete set of automobile data you only need to data_mine the classes that are not indented.
+
+Make
+  MakeYearFleet
+  MakeModelYearVariant
+
+Model
+  MakeYearFleet
+  MakeModelYearVariant
+
+Year
+  MakeYearFleet
+  MakeModelYearVariant
+
+MakeModel
+  MakeModelYearVariant
+
+MakeYear
+  MakeYearFleet
+  MakeModelYearVariant
+
+MakeModelYear
+  MakeModelYearVariant
+  AutomobileFuel
+    GreenhouseGas
+    Fuel
+      FuelYear
+    TypeYear
+      TypeFuelYear
+        TypeFuelControl
+        TypeFuelYearControl
+    TypeFuelYearAge
+      TypeFuelYear
+        TypeFuelControl
+        TypeFuelYearControl
+
+SizeClass
+  TypeYear
+    TypeFuelYear
+      TypeFuelControl
+      TypeFuelYearControl
+  TypeFuelYearAge
+    TypeFuelYear
+      TypeFuelControl
+      TypeFuelYearControl

data/lib/earth/bus/bus_class.rb

@@ -24,9 +24,7 @@ class BusClass < ActiveRecord::Base
                 :electricity_intensity => 0.00001804 / 1.miles.to(:kilometres),
                 :electricity_intensity_units => 'kilowatt_hours_per_kilometre',
                 :air_conditioning_emission_factor => 0.04779 / 1.miles.to(:kilometres),
-                :air_conditioning_emission_factor_units => 'kilograms_co2e_per_kilometre',
-                :alternative_fuels_intensity => 0.04632038.gallons_per_mile.to(:litres_per_kilometre), # deprecated
-                :alternative_fuels_intensity_units => 'litres_per_kilometre' # deprecated
+                :air_conditioning_emission_factor_units => 'kilograms_co2e_per_kilometre'
   
   col :name
   col :distance, :type => :float
@@ -52,88 +50,4 @@ class BusClass < ActiveRecord::Base
   col :electricity_intensity_units
   col :air_conditioning_emission_factor, :type => :float
   col :air_conditioning_emission_factor_units
-  col :alternative_fuels_intensity, :type => :float
-  col :alternative_fuels_intensity_units
-  
-  # verify "Some attributes should be greater than zero" do
-  #   BusClass.all.each do |bus_class|
-  #     %w{ distance passengers speed diesel_intensity air_conditioning_emission_factor }.each do |attribute|
-  #       value = bus_class.send(:"#{attribute}")
-  #       unless value > 0
-  #         raise "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be > 0)"
-  #       end
-  #     end
-  #   end
-  # end
-  # 
-  # verify "Some attributes should be zero or more" do
-  #   BusClass.all.each do |bus_class|
-  #     %w{ gasoline_intensity cng_intensity lng_intensity lpg_intensity methanol_intensity biodiesel_intensity electricity_intensity alternative_fuels_intensity }.each do |attribute|
-  #       value = bus_class.send(:"#{attribute}")
-  #       unless value >= 0
-  #         raise "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be >= 0)"
-  #       end
-  #     end
-  #   end
-  # end
-  # 
-  # verify "Units should be correct" do
-  #   BusClass.all.each do |bus_class|
-  #     [["distance_units", "kilometres"],
-  #      ["speed_units", "kilometres_per_hour"],
-  #      ["diesel_intensity_units", "litres_per_kilometre"],
-  #      ["gasoline_intensity_units", "litres_per_kilometre"],
-  #      ["cng_intensity_units", "litres_per_kilometre"],
-  #      ["lng_intensity_units", "litres_per_kilometre"],
-  #      ["lpg_intensity_units", "litres_per_kilometre"],
-  #      ["methanol_intensity_units", "litres_per_kilometre"],
-  #      ["biodiesel_intensity_units", "litres_per_kilometre"],
-  #      ["electricity_intensity_units", "kilowatt_hours_per_kilometre"],
-  #      ["air_conditioning_emission_factor_units", "kilograms_co2e_per_kilometre"],
-  #      ["alternative_fuels_intensity_units", "litres_per_kilometre"]].each do |pair|
-  #       attribute = pair[0]
-  #       proper_units = pair[1]
-  #       units = bus_class.send(:"#{attribute}")
-  #       unless units == proper_units
-  #         raise "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{units} (should be #{proper_units})"
-  #       end
-  #     end
-  #   end
-  # end
-  # 
-  # verify "Fallbacks should satisfy same constraints as data" do
-  #   %w{ distance passengers speed diesel_intensity air_conditioning_emission_factor }.each do |attribute|
-  #     value = BusClass.fallback.send(:"#{attribute}")
-  #     unless value > 0
-  #       raise "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be > 0)"
-  #     end
-  #   end
-  #   
-  #   %w{ gasoline_intensity cng_intensity lng_intensity lpg_intensity methanol_intensity biodiesel_intensity electricity_intensity alternative_fuels_intensity }.each do |attribute|
-  #     value = BusClass.fallback.send(:"#{attribute}")
-  #     unless value >= 0
-  #       raise "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be >= 0)"
-  #     end
-  #   end
-  #   
-  #   [["distance_units", "kilometres"],
-  #    ["speed_units", "kilometres_per_hour"],
-  #    ["diesel_intensity_units", "litres_per_kilometre"],
-  #    ["gasoline_intensity_units", "litres_per_kilometre"],
-  #    ["cng_intensity_units", "litres_per_kilometre"],
-  #    ["lng_intensity_units", "litres_per_kilometre"],
-  #    ["lpg_intensity_units", "litres_per_kilometre"],
-  #    ["methanol_intensity_units", "litres_per_kilometre"],
-  #    ["biodiesel_intensity_units", "litres_per_kilometre"],
-  #    ["electricity_intensity_units", "kilowatt_hours_per_kilometre"],
-  #    ["air_conditioning_emission_factor_units", "kilograms_co2e_per_kilometre"],
-  #    ["alternative_fuels_intensity_units", "litres_per_kilometre"]].each do |pair|
-  #     attribute = pair[0]
-  #     proper_units = pair[1]
-  #     units = BusClass.fallback.send(:"#{attribute}")
-  #     unless units == proper_units
-  #       raise "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{units} (should be #{proper_units})"
-  #     end
-  #   end
-  # end
 end

data/lib/earth/bus/bus_class/data_miner.rb

@@ -15,7 +15,6 @@ BusClass.class_eval do
       store 'biodiesel_intensity', :units_field_name => 'biodiesel_intensity_units'
       store 'electricity_intensity', :units_field_name => 'electricity_intensity_units'
       store 'air_conditioning_emission_factor', :units_field_name => 'air_conditioning_emission_factor_units'
-      store 'alternative_fuels_intensity', :units_field_name => 'alternative_fuels_intensity_units'
     end
   end
 end

data/lib/earth/bus/bus_fuel/data_miner.rb

@@ -29,30 +29,23 @@ BusFuel.class_eval do
     process "Convert emission factors to metric units" do
       conversion_factor = (1 / 1.609344) * (1.0 / 1_000.0 ) # Google: 1 mile / 1.609344 km * 1 kg / 1000 g
       gwp_ch4 = GreenhouseGas[:ch4].global_warming_potential
-      connection.execute %{
-        UPDATE bus_fuels
-        SET ch4_emission_factor = 1.0 * ch4_emission_factor * #{conversion_factor} * #{gwp_ch4},
-            ch4_emission_factor_units = 'kilograms_co2e_per_kilometre'
-        WHERE ch4_emission_factor_units = 'grams_per_mile'
-      }
-      
+      where(:ch4_emission_factor_units => 'grams_per_mile').update_all(%{
+        ch4_emission_factor = 1.0 * ch4_emission_factor * #{conversion_factor} * #{gwp_ch4},
+        ch4_emission_factor_units = 'kilograms_co2e_per_kilometre'
+      })
       gwp_n2o = GreenhouseGas[:n2o].global_warming_potential
-      connection.execute %{
-        UPDATE bus_fuels
-        SET n2o_emission_factor = 1.0 * n2o_emission_factor * #{conversion_factor} * #{gwp_n2o},
-            n2o_emission_factor_units = 'kilograms_co2e_per_kilometre'
-        WHERE n2o_emission_factor_units = 'grams_per_mile'
-      }
+      where(:n2o_emission_factor_units => 'grams_per_mile').update_all(%{
+        n2o_emission_factor = 1.0 * n2o_emission_factor * #{conversion_factor} * #{gwp_n2o},
+        n2o_emission_factor_units = 'kilograms_co2e_per_kilometre'
+      })
     end
     
     process "Convert energy contents to metric units" do
       conversion_factor = (1 / 947.81712) * (1 / 3.78541178) # Google: 1 MJ / 947.81712 btu * 1 gallon / 3.78541178 l
-      connection.execute %{
-        UPDATE bus_fuels
-        SET energy_content = 1.0 * energy_content * #{conversion_factor},
-            energy_content_units = 'megajoules_per_litre'
-        WHERE energy_content_units = 'btu_per_gallon'
-      }
+      where(:energy_content_units => 'btu_per_gallon').update_all(%{
+        energy_content = 1.0 * energy_content * #{conversion_factor},
+        energy_content_units = 'megajoules_per_litre'
+      })
     end
     
     process 'Calculate CO2 and CO2 biogenic emission factors and units' do

data/lib/earth/bus/bus_fuel_control/data_miner.rb

@@ -11,19 +11,15 @@ BusFuelControl.class_eval do
     
     process "Convert emission factors to metric units" do
       conversion_factor = (1 / 1.609344) * (1.0 / 1_000.0 ) # Google: 1 mile / 1.609344 km * 1 kg / 1000 g
-      connection.execute %{
-        UPDATE bus_fuel_controls
-        SET ch4_emission_factor = 1.0 * ch4_emission_factor * #{conversion_factor},
-            ch4_emission_factor_units = 'kilograms_per_kilometre'
-        WHERE ch4_emission_factor_units = 'grams_per_mile'
-      }
       
-      connection.execute %{
-        UPDATE bus_fuel_controls
-        SET n2o_emission_factor = 1.0 * n2o_emission_factor * #{conversion_factor},
-            n2o_emission_factor_units = 'kilograms_per_kilometre'
-        WHERE n2o_emission_factor_units = 'grams_per_mile'
-      }
+      where(:ch4_emission_factor_units => 'grams_per_mile').update_all(%{
+        ch4_emission_factor = 1.0 * ch4_emission_factor * #{conversion_factor},
+        ch4_emission_factor_units = 'kilograms_per_kilometre'
+      })
+      where(:n2o_emission_factor_units => 'grams_per_mile').update_all(%{
+        n2o_emission_factor = 1.0 * n2o_emission_factor * #{conversion_factor},
+        n2o_emission_factor_units = 'kilograms_per_kilometre'
+      })
     end
     
     # FIXME TODO verify this

data/lib/earth/conversions_ext.rb

@@ -39,6 +39,7 @@ Conversions.register(:cords, :joules, 2.11011171e10)
 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

data/lib/earth/fuel/fuel/data_miner.rb

@@ -8,9 +8,7 @@ Fuel.class_eval do
       ::Earth::Utils.insert_ignore(
         :src => FuelYear,
         :dest => Fuel,
-        :cols => {
-          :fuel_name => :name
-        }
+        :cols => { :fuel_name => :name }
       )
     end
     
@@ -30,57 +28,49 @@ Fuel.class_eval do
     end
     
     process "Convert energy content of liquid fuels to metric units" do
-      conversion_factor = (1_055.05585 / 1.0) * (1.0 / 158.987295) # Google: 1_055.05585 MJ / 1 MMBtu * 1 barrel / 158.987295 l
-      connection.execute %{
-        UPDATE fuels
-        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_litre'
-        WHERE energy_content_units = 'million_btu_per_barrel'
-      }
+      conversion_factor = (1_055.05585) * (1.0 / 158.987295) # Google: 1_055.05585 MJ / 1 MMBtu * 1 barrel / 158.987295 l
+      where(:energy_content_units => 'million_btu_per_barrel').update_all(%{
+        energy_content = 1.0 * energy_content * #{conversion_factor},
+        energy_content_units = 'megajoules_per_litre'
+      })
     end
     
     process "Convert energy content of gaseous fuels to metric units" do
-      conversion_factor = (1.0 / 947.81712) * (35.3146667 / 1.0) # Google: 1.0 MJ / 947.81712 Btu * 35.3146667 cubic feet / 1 cubic m
-      connection.execute %{
-        UPDATE fuels
-        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_cubic_metre'
-        WHERE energy_content_units = 'btu_per_cubic_foot'
-      }
+      conversion_factor = (1.0 / 947.81712) * (35.3146667) # Google: 1.0 MJ / 947.81712 Btu * 35.3146667 cubic feet / 1 cubic m
+      where(:energy_content_units => 'btu_per_cubic_foot').update_all(%{
+        energy_content = 1.0 * energy_content * #{conversion_factor},
+        energy_content_units = 'megajoules_per_cubic_metre'
+      })
     end
     
     process "Convert carbon content to metric units" do
-      conversion_factor = (1_000_000_000_000.0 / 1.0) * (1.0 / 1_055_055_852_620.0) # Google: 1e12 g / Tg * 1 QBtu / 1.055e12 MJ
-      connection.execute %{
-        UPDATE fuels
-        SET carbon_content = 1.0 * carbon_content * #{conversion_factor}, carbon_content_units = 'grams_per_megajoule'
-        WHERE carbon_content_units = 'teragrams_per_quadrillion_btu'
-      }
+      conversion_factor = (1_000_000_000_000.0) * (1.0 / 1_055_055_852_620.0) # Google: 1e12 g / Tg * 1 QBtu / 1.055e12 MJ
+      where(:carbon_content_units => 'teragrams_per_quadrillion_btu').update_all(%{
+        carbon_content = 1.0 * carbon_content * #{conversion_factor},
+        carbon_content_units = 'grams_per_megajoule'
+      })
     end
     
     process "Calculate CO2 and CO2 biogenic emission factors" do
       conversion_factor = (1.0 / 1_000.0) * (44.0 / 12.0) # Google: 1 kg / 1e3 g * 44 CO2 / 12 C
-      connection.execute %{
-        UPDATE fuels
-        SET co2_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * (1 - biogenic_fraction) * #{conversion_factor},
-            co2_biogenic_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * biogenic_fraction * #{conversion_factor}
-      }
+      update_all(%{
+        co2_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * (1 - biogenic_fraction) * #{conversion_factor},
+        co2_biogenic_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * biogenic_fraction * #{conversion_factor}
+      })
     end
     
     process "Update emission factor units for liquid fuels" do
-      connection.execute %{
-        UPDATE fuels
-        SET co2_emission_factor_units = 'kilograms_per_litre',
-            co2_biogenic_emission_factor_units = 'kilograms_per_litre'
-        WHERE energy_content_units = 'megajoules_per_litre'
-      }
+      where(:energy_content_units => 'megajoules_per_litre').update_all(
+        :co2_emission_factor_units => 'kilograms_per_litre',
+        :co2_biogenic_emission_factor_units => 'kilograms_per_litre'
+      )
     end
     
     process "Update emission factor units for gaseous fuels" do
-      connection.execute %{
-        UPDATE fuels
-        SET co2_emission_factor_units = 'kilograms_per_cubic_metre',
-            co2_biogenic_emission_factor_units = 'kilograms_per_cubic_metre'
-        WHERE energy_content_units = 'megajoules_per_cubic_metre'
-      }
+      where(:energy_content_units => 'megajoules_per_cubic_metre').update_all(
+        :co2_emission_factor_units => 'kilograms_per_cubic_metre',
+        :co2_biogenic_emission_factor_units => 'kilograms_per_cubic_metre'
+      )
     end
     
     # FIXME TODO verify this stuff

data/lib/earth/fuel/fuel_year/data_miner.rb

@@ -12,75 +12,64 @@ FuelYear.class_eval do
     end
     
     process "Convert energy content of solid fuels to metric units" do
-      conversion_factor = (1_055.05585 / 1.0) * (1.0 / 907.18474) # Google: 1_055.05585 MJ / 1 MMBtu * 1 short ton / 907.18474 kg
-      connection.execute %{
-        UPDATE fuel_years
-        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_kilogram'
-        WHERE energy_content_units = 'million_btu_per_short_ton'
-      }
+      conversion_factor = (1_055.05585) * (1.0 / 907.18474) # Google: 1_055.05585 MJ / 1 MMBtu * 1 short ton / 907.18474 kg
+      where(:energy_content_units => 'million_btu_per_short_ton').update_all(%{
+        energy_content = 1.0 * energy_content * #{conversion_factor},
+        energy_content_units = 'megajoules_per_kilogram'
+      })
     end
     
     process "Convert energy content of liquid fuels to metric units" do
-      conversion_factor = (1_055.05585 / 1.0) * (1.0 / 158.987295) # Google: 1_055.05585 MJ / 1 MMBtu * 1 barrel / 158.987295 l
-      connection.execute %{
-        UPDATE fuel_years
-        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_litre'
-        WHERE energy_content_units = 'million_btu_per_barrel'
-      }
+      conversion_factor = (1_055.05585) * (1.0 / 158.987295) # Google: 1_055.05585 MJ / 1 MMBtu * 1 barrel / 158.987295 l
+      where(:energy_content_units => 'million_btu_per_barrel').update_all(%{
+        energy_content = 1.0 * energy_content * #{conversion_factor},
+        energy_content_units = 'megajoules_per_litre'
+      })
     end
     
     process "Convert energy content of gaseous fuels to metric units" do
-      conversion_factor = (1.0 / 947.81712) * (35.3146667 / 1.0) # Google: 1.0 MJ / 947.81712 Btu * 35.3146667 cubic feet / 1 cubic m
-      connection.execute %{
-        UPDATE fuel_years
-        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_cubic_metre'
-        WHERE energy_content_units = 'btu_per_cubic_foot'
-      }
+      conversion_factor = (1.0 / 947.81712) * (35.3146667) # Google: 1.0 MJ / 947.81712 Btu * 35.3146667 cubic feet / 1 cubic m
+      where(:energy_content_units => 'btu_per_cubic_foot').update_all(%{
+        energy_content = 1.0 * energy_content * #{conversion_factor},
+        energy_content_units = 'megajoules_per_cubic_metre'
+      })
     end
     
     process "Convert carbon content to metric units" do
-      conversion_factor = (1_000_000_000_000.0 / 1.0) * (1.0 / 1_055_055_852_620.0) # Google: 1e12 g / Tg * 1 QBtu / 1.055e12 MJ
-      connection.execute %{
-        UPDATE fuel_years
-        SET carbon_content = 1.0 * carbon_content * #{conversion_factor}, carbon_content_units = 'grams_per_megajoule'
-        WHERE carbon_content_units = 'teragrams_per_quadrillion_btu'
-      }
+      conversion_factor = (1_000_000_000_000.0) * (1.0 / 1_055_055_852_620.0) # Google: 1e12 g / Tg * 1 QBtu / 1.055e12 MJ
+      where(:carbon_content_units => 'teragrams_per_quadrillion_btu').update_all(%{
+        carbon_content = 1.0 * carbon_content * #{conversion_factor},
+        carbon_content_units = 'grams_per_megajoule'
+      })
     end
     
     process "Calculate CO2 and CO2 biogenic emission factors" do
       conversion_factor = (1.0 / 1_000.0) * (44.0 / 12.0) # Google: 1 kg / 1e3 g * 44 CO2 / 12 C
-      connection.execute %{
-        UPDATE fuel_years
-        SET co2_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * (1 - biogenic_fraction) * #{conversion_factor},
-            co2_biogenic_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * biogenic_fraction * #{conversion_factor}
-      }
+      update_all(%{
+        co2_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * (1 - biogenic_fraction) * #{conversion_factor},
+        co2_biogenic_emission_factor = 1.0 * carbon_content * energy_content * oxidation_factor * biogenic_fraction * #{conversion_factor}
+      })
     end
     
     process "Update emission factor units for solid fuels" do
-      connection.execute %{
-        UPDATE fuel_years
-        SET co2_emission_factor_units = 'kilograms_per_kilogram',
-            co2_biogenic_emission_factor_units = 'kilograms_per_kilogram'
-        WHERE energy_content_units = 'megajoules_per_kilogram'
-      }
+      where(:energy_content_units => 'megajoules_per_kilogram').update_all(
+        :co2_emission_factor_units => 'kilograms_per_kilogram',
+        :co2_biogenic_emission_factor_units => 'kilograms_per_kilogram'
+      )
     end
     
     process "Update emission factor units for liquid fuels" do
-      connection.execute %{
-        UPDATE fuel_years
-        SET co2_emission_factor_units = 'kilograms_per_litre',
-            co2_biogenic_emission_factor_units = 'kilograms_per_litre'
-        WHERE energy_content_units = 'megajoules_per_litre'
-      }
+      where(:energy_content_units => 'megajoules_per_litre').update_all(
+        :co2_emission_factor_units => 'kilograms_per_litre',
+        :co2_biogenic_emission_factor_units => 'kilograms_per_litre'
+      )
     end
     
     process "Update emission factor units for gaseous fuels" do
-      connection.execute %{
-        UPDATE fuel_years
-        SET co2_emission_factor_units = 'kilograms_per_cubic_metre',
-            co2_biogenic_emission_factor_units = 'kilograms_per_cubic_metre'
-        WHERE energy_content_units = 'megajoules_per_cubic_metre'
-      }
+      where(:energy_content_units => 'megajoules_per_cubic_metre').update_all(
+        :co2_emission_factor_units => 'kilograms_per_cubic_metre',
+        :co2_biogenic_emission_factor_units => 'kilograms_per_cubic_metre'
+      )
     end
   end
 end

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

@@ -11,20 +11,26 @@ LodgingClass.class_eval do
     
     process "Convert natural gas intensities to metric units" do
       conversion_factor = 2.83168466 # Google: 2.83168466 cubic m / 100 cubic ft
-      update_all "natural_gas_intensity = 1.0 * natural_gas_intensity * #{conversion_factor}", :natural_gas_intensity_units => 'hundred_cubic_feet_per_room_night'
-      update_all({:natural_gas_intensity_units => 'cubic_metres_per_room_night'}, :natural_gas_intensity_units => 'hundred_cubic_feet_per_room_night')
+      where(:natural_gas_intensity_units => 'hundred_cubic_feet_per_room_night').update_all(%{
+        natural_gas_intensity = 1.0 * natural_gas_intensity * #{conversion_factor},
+        natural_gas_intensity_units = 'cubic_metres_per_room_night'
+      })
     end
     
     process "Convert fuel oil intensities to metric units" do
       conversion_factor = 3.78541178 # Google: 3.78541178 l / gal
-      update_all "fuel_oil_intensity = 1.0 * fuel_oil_intensity * #{conversion_factor}", :fuel_oil_intensity_units => 'gallons_per_room_night'
-      update_all({:fuel_oil_intensity_units => 'litres_per_room_night'}, :fuel_oil_intensity_units => 'gallons_per_room_night')
+      where(:fuel_oil_intensity_units => 'gallons_per_room_night').update_all(%{
+        fuel_oil_intensity = 1.0 * fuel_oil_intensity * #{conversion_factor},
+        fuel_oil_intensity_units = 'litres_per_room_night'
+      })
     end
     
     process "Convert district heat intensities to metric units" do
       conversion_factor = 1.05505585 # Google: 1.05505585 MJ / 1000 Btu
-      update_all "district_heat_intensity = 1.0 * district_heat_intensity * #{conversion_factor}", :district_heat_intensity_units => 'thousand_btu_per_room_night'
-      update_all({:district_heat_intensity_units => 'megajoules_per_room_night'}, :district_heat_intensity_units => 'thousand_btu_per_room_night')
+      where(:district_heat_intensity_units => 'thousand_btu_per_room_night').update_all(%{
+        district_heat_intensity = 1.0 * district_heat_intensity * #{conversion_factor},
+        district_heat_intensity_units = 'megajoules_per_room_night'
+      })
     end
   end
 end