earth 0.6.2 → 0.6.3

data/earth.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'fixed_width-multibyte'
   s.add_runtime_dependency 'geokit-rails'
   s.add_runtime_dependency 'loose_tight_dictionary', '>=0.2.3'
-  s.add_runtime_dependency 'weighted_average', '>=1'
+  s.add_runtime_dependency 'weighted_average', '>=1.0.1'
   s.add_runtime_dependency 'mini_record-compat' # need https://github.com/DAddYE/mini_record/pull/7
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'activerecord'

data/lib/earth/air/aircraft_class.rb

@@ -28,10 +28,10 @@ class AircraftClass < ActiveRecord::Base
       AircraftFuelUseEquation.run_data_miner!
       find_each do |aircraft_class|
         cumulative_passengers = 0
-        aircraft_class.m3 = 0
-        aircraft_class.m2 = 0
-        aircraft_class.m1 = 0
-        aircraft_class.b = 0
+        aircraft_class.m3 = 0.0
+        aircraft_class.m2 = 0.0
+        aircraft_class.m1 = 0.0
+        aircraft_class.b = 0.0
       
         aircraft_class.aircraft.where('passengers > 0 AND fuel_use_code IS NOT NULL').each do |a|
           cumulative_passengers += a.passengers
@@ -50,13 +50,10 @@ class AircraftClass < ActiveRecord::Base
       
         aircraft_class.seats = aircraft_class.aircraft.weighted_average(:seats, :weighted_by => :passengers)
       
-        aircraft_class.m3_units = 'kilograms_per_cubic_nautical_mile'
-        aircraft_class.m2_units = 'kilograms_per_square_nautical_mile'
-        aircraft_class.m1_units = 'kilograms_per_nautical_mile'
-        aircraft_class.b_units  = 'kilograms'
-      
         aircraft_class.save!
       end
+      
+      update_all :m3_units => 'kilograms_per_cubic_nautical_mile', :m2_units => 'kilograms_per_square_nautical_mile', :m1_units => 'kilograms_per_nautical_mile', :b_units  => 'kilograms'
     end
   end
 end

data/lib/earth/air/flight_segment.rb

@@ -62,17 +62,17 @@ class FlightSegment < ActiveRecord::Base
   
   def self.update_averages!
     # Derive load factor, which is passengers divided by available seats
-    update_all 'load_factor = passengers / seats', 'seats > 0'
+    update_all 'load_factor = 1.0 * passengers / seats', 'seats > 0'
 
     # Assume a load factor of 1 where passengers > available seats
     update_all 'load_factor = 1', 'passengers > seats AND seats > 0'
   
     # TODO: what is 90.718474
     # Derive freight share as a fraction of the total weight carried
-    update_all 'freight_share = (freight + mail) / (freight + mail + (passengers * 90.718474))', '(freight + mail + passengers) > 0'
+    update_all 'freight_share = 1.0 * (freight + mail) / (freight + mail + (passengers * 90.718474))', '(freight + mail + passengers) > 0'
   
     # Derive average seats per flight
-    update_all 'seats_per_flight = seats / flights', 'flights > 0'
+    update_all 'seats_per_flight = 1.0 * seats / flights', 'flights > 0'
     
     # Add a useful date field
     update_all %{approximate_date = DATE(year || '-' || month || '-' || '14')}, 'month IS NOT NULL'

data/lib/earth/air/flight_segment/data_miner.rb

@@ -172,7 +172,7 @@ FlightSegment.class_eval do
   def self.form_data_per_month(year_range)
     months = {}
     year_range.each do |year|
-      (1..12).each do |month|
+      (1..1).each do |month|
         time = ::Time.gm year, month
         form_data = FORM_DATA.dup
         form_data.gsub! '__YEAR__', time.year.to_s
@@ -185,7 +185,7 @@ FlightSegment.class_eval do
   end
   
   data_miner do
-    form_data_per_month(2009..2011).each do |month, form_data|
+    form_data_per_month(2009..2009).each do |month, form_data|
       import "T100 flight segment data for #{month.strftime('%B %Y')}",
              :url => URL,
              :form_data => form_data,

data/lib/earth/automobile/automobile_fuel.rb

@@ -83,12 +83,12 @@ class AutomobileFuel < ActiveRecord::Base
       latest_year = AutomobileTypeFuelYear.maximum('year')
       gas_use = AutomobileTypeFuelYear.where(:year => latest_year, :fuel_common_name => 'gasoline').sum('fuel_consumption')
       diesel_use = AutomobileTypeFuelYear.where(:year => latest_year, :fuel_common_name => 'diesel').sum('fuel_consumption')
-      diesel_use / (gas_use + diesel_use)
+      diesel_use.to_f / (gas_use + diesel_use)
     end
     
     def fallback_co2_emission_factor
-      (Fuel.find_by_name("Motor Gasoline").co2_emission_factor * (1 - AutomobileFuel.fallback_blend_portion)) +
-      (Fuel.find_by_name("Distillate Fuel Oil No. 2").co2_emission_factor * AutomobileFuel.fallback_blend_portion)
+      (Fuel.find_by_name("Motor Gasoline").co2_emission_factor.to_f * (1 - AutomobileFuel.fallback_blend_portion)) +
+      (Fuel.find_by_name("Distillate Fuel Oil No. 2").co2_emission_factor.to_f * AutomobileFuel.fallback_blend_portion)
     end
     
     def fallback_co2_emission_factor_units
@@ -109,7 +109,7 @@ class AutomobileFuel < ActiveRecord::Base
     end
     
     def fallback_ch4_emission_factor
-      fallback_latest_type_fuel_years.weighted_average(:ch4_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:ch4].global_warming_potential
+      fallback_latest_type_fuel_years.weighted_average(:ch4_emission_factor, :weighted_by => :total_travel).to_f * GreenhouseGas[:ch4].global_warming_potential
     end
     
     def fallback_ch4_emission_factor_units
@@ -119,7 +119,7 @@ class AutomobileFuel < ActiveRecord::Base
     end
     
     def fallback_n2o_emission_factor
-      fallback_latest_type_fuel_years.weighted_average(:n2o_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:n2o].global_warming_potential
+      fallback_latest_type_fuel_years.weighted_average(:n2o_emission_factor, :weighted_by => :total_travel).to_f * GreenhouseGas[:n2o].global_warming_potential
     end
     
     def fallback_n2o_emission_factor_units
@@ -130,7 +130,7 @@ class AutomobileFuel < ActiveRecord::Base
     
     def fallback_hfc_emission_factor
       fallback_latest_type_fuel_years.map do |tfy|
-        tfy.total_travel * tfy.type_year.hfc_emission_factor
+        tfy.total_travel.to_f * tfy.type_year.hfc_emission_factor
       end.sum / fallback_latest_type_fuel_years.sum('total_travel')
     end
     

data/lib/earth/automobile/automobile_fuel/data_miner.rb

@@ -39,8 +39,8 @@ AutomobileFuel.class_eval do
     process "Derive co2 emission factor and co2 biogenic emission factors" do
       find_each do |record|
         if record.blend_fuel.present?
-          record.co2_emission_factor = (record.base_fuel.co2_emission_factor * (1 - record.blend_portion)) + (record.blend_fuel.co2_emission_factor * record.blend_portion)
-          record.co2_biogenic_emission_factor = (record.base_fuel.co2_biogenic_emission_factor * (1 - record.blend_portion)) + (record.blend_fuel.co2_biogenic_emission_factor * record.blend_portion)
+          record.co2_emission_factor = (record.base_fuel.co2_emission_factor.to_f * (1 - record.blend_portion)) + (record.blend_fuel.co2_emission_factor.to_f * record.blend_portion)
+          record.co2_biogenic_emission_factor = (record.base_fuel.co2_biogenic_emission_factor.to_f * (1 - record.blend_portion)) + (record.blend_fuel.co2_biogenic_emission_factor.to_f * record.blend_portion)
         else
           record.co2_emission_factor = record.base_fuel.co2_emission_factor
           record.co2_biogenic_emission_factor = record.base_fuel.co2_biogenic_emission_factor
@@ -55,18 +55,18 @@ AutomobileFuel.class_eval do
       find_each do |record|
         scope = record.type_fuel_years.where(:year => record.type_fuel_years.maximum('year'))
         
-        record.ch4_emission_factor = scope.weighted_average(:ch4_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:ch4].global_warming_potential
+        record.ch4_emission_factor = scope.weighted_average(:ch4_emission_factor, :weighted_by => :total_travel).to_f * GreenhouseGas[:ch4].global_warming_potential
         ch4_prefix = scope.first.ch4_emission_factor_units.split("_per_")[0]
         ch4_suffix = scope.first.ch4_emission_factor_units.split("_per_")[1]
         record.ch4_emission_factor_units = ch4_prefix + "_co2e_per_" + ch4_suffix
         
-        record.n2o_emission_factor = scope.weighted_average(:n2o_emission_factor, :weighted_by => :total_travel) * GreenhouseGas[:n2o].global_warming_potential
+        record.n2o_emission_factor = scope.weighted_average(:n2o_emission_factor, :weighted_by => :total_travel).to_f * GreenhouseGas[:n2o].global_warming_potential
         n2o_prefix = scope.first.n2o_emission_factor_units.split("_per_")[0]
         n2o_suffix = scope.first.n2o_emission_factor_units.split("_per_")[1]
         record.n2o_emission_factor_units = n2o_prefix + "_co2e_per_" + n2o_suffix
         
         record.hfc_emission_factor = scope.map do |tfy|
-          tfy.total_travel * tfy.type_year.hfc_emission_factor
+          tfy.total_travel.to_f * tfy.type_year.hfc_emission_factor
         end.sum / scope.sum('total_travel')
         record.hfc_emission_factor_units = scope.first.type_year.hfc_emission_factor_units
         

data/lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb

@@ -415,15 +415,15 @@ AutomobileMakeModelYearVariant.class_eval do
     # Note: need to divide by 0.425143707 b/c equation is designed for miles / gallon not km / l
     # Note: EPA seems to adjust differently for plug-in hybrid electric vehicles (e.g. Leaf and Volt)
     process "Calculate adjusted fuel efficiency using the latest EPA equations from EPA Fuel Economy Trends report Appendix A including conversion from miles per gallon to kilometres per litre" do
-      update_all 'fuel_efficiency_city = 1 / ((0.003259 / 0.425143707) + (1.1805 / raw_fuel_efficiency_city))', 'raw_fuel_efficiency_city > 0'
-      update_all 'fuel_efficiency_highway = 1 / ((0.001376 / 0.425143707) + (1.3466 / raw_fuel_efficiency_highway))', 'raw_fuel_efficiency_highway > 0'
+      update_all 'fuel_efficiency_city = 1.0 / ((0.003259 / 0.425143707) + (1.1805 / raw_fuel_efficiency_city))', 'raw_fuel_efficiency_city > 0'
+      update_all 'fuel_efficiency_highway = 1.0 / ((0.001376 / 0.425143707) + (1.3466 / raw_fuel_efficiency_highway))', 'raw_fuel_efficiency_highway > 0'
     end
     
     # This will be useful later for calculating MakeModel and Make fuel efficiency based on Variant
     # NOTE: we use a 43/57 city/highway weighting per the latest EPA analysis of real-world driving behavior
     # This results in a deviation from EPA fuel economy label values which use a historical 55/45 weighting
     process "Calculate combined adjusted fuel efficiency using the latest EPA equation" do
-      update_all "fuel_efficiency = 1 / ((0.43 / fuel_efficiency_city) + (0.57 / fuel_efficiency_highway))"
+      update_all "fuel_efficiency = 1.0 / ((0.43 / fuel_efficiency_city) + (0.57 / fuel_efficiency_highway))"
     end
     
     process "Set units" do

data/lib/earth/automobile/automobile_type_fuel_age/data_miner.rb

@@ -123,7 +123,7 @@ AutomobileTypeFuelAge.class_eval do
     
     process "Convert annual distance from miles to kilometres" do
       conversion_factor = 1.miles.to(:kilometres)
-      update_all "annual_distance = annual_distance * #{conversion_factor}"
+      update_all "annual_distance = 1.0 * annual_distance * #{conversion_factor}"
       update_all "annual_distance_units = 'kilometres'"
     end
     
@@ -142,7 +142,7 @@ AutomobileTypeFuelAge.class_eval do
               t1.year = #{max_year}
               AND t1.type_name = #{quoted_table_name}.type_name
               AND t1.fuel_common_name = #{quoted_table_name}.fuel_common_name )
-          * #{quoted_table_name}.total_travel_percent / #{quoted_table_name}.annual_distance
+          * 1.0 * #{quoted_table_name}.total_travel_percent / #{quoted_table_name}.annual_distance
       }
     end
   end

data/lib/earth/automobile/automobile_type_fuel_year/data_miner.rb

@@ -52,7 +52,7 @@ AutomobileTypeFuelYear.class_eval do
       conversion_factor = 1_000_000_000.miles.to(:kilometres)
       connection.execute %{
         UPDATE automobile_type_fuel_years
-        SET total_travel = total_travel * #{conversion_factor},
+        SET total_travel = 1.0 * total_travel * #{conversion_factor},
             total_travel_units = 'kilometres'
         WHERE total_travel_units = 'billion_miles'
       }
@@ -76,11 +76,11 @@ AutomobileTypeFuelYear.class_eval do
     process "Calculate CH4 and N2O emision factors from AutomobileTypeFuelYearControl and AutomobileTypeFuelControl" do
       AutomobileTypeFuelYear.all.each do |record|
         record.ch4_emission_factor = record.year_controls.map do |year_control|
-          year_control.total_travel_percent * year_control.control.ch4_emission_factor
+          year_control.total_travel_percent.to_f * year_control.control.ch4_emission_factor
         end.sum * record.total_travel / record.fuel_consumption
         
         record.n2o_emission_factor = record.year_controls.map do |year_control|
-          year_control.total_travel_percent * year_control.control.n2o_emission_factor
+          year_control.total_travel_percent.to_f * year_control.control.n2o_emission_factor
         end.sum * record.total_travel / record.fuel_consumption
         
         record.ch4_emission_factor_units = 'kilograms_per_litre'

data/lib/earth/automobile/automobile_type_fuel_year_age/data_miner.rb

@@ -92,7 +92,7 @@ AutomobileTypeFuelYearAge.class_eval do
       conversion_factor = 1.miles.to(:kilometres)
       connection.execute %{
         UPDATE automobile_type_fuel_year_ages
-        SET annual_distance = annual_distance * #{conversion_factor},
+        SET annual_distance = 1.0 * annual_distance * #{conversion_factor},
             annual_distance_units = 'kilometres'
         WHERE annual_distance_units = 'miles'
       }
@@ -109,7 +109,7 @@ AutomobileTypeFuelYearAge.class_eval do
     process "Calculate number of vehicles from total travel percent and AutomobileTypeFuelYear" do
       total_travel = "(SELECT t1.total_travel FROM #{AutomobileTypeFuelYear.quoted_table_name} AS t1 WHERE t1.name = #{quoted_table_name}.type_fuel_year_name)"
       update_all(
-        %{vehicles = total_travel_percent * #{total_travel} / annual_distance},
+        %{vehicles = 1.0 * total_travel_percent * #{total_travel} / annual_distance},
         %{annual_distance > 0}
       )
     end

data/lib/earth/automobile/automobile_type_year/data_miner.rb

@@ -19,7 +19,7 @@ AutomobileTypeYear.class_eval do
     process "Calculate HFC emission factor from AutomobileTypeFuelYear" do
       total_fuel_consumption = "(SELECT SUM(src.fuel_consumption) FROM #{AutomobileTypeFuelYear.quoted_table_name} AS src WHERE src.type_year_name = #{quoted_table_name}.name)"
       update_all(
-        %{hfc_emission_factor = hfc_emissions / #{total_fuel_consumption}},
+        %{hfc_emission_factor = 1.0 * hfc_emissions / #{total_fuel_consumption}},
         %{#{total_fuel_consumption} > 0}
       )
     end    

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

@@ -31,7 +31,7 @@ BusFuel.class_eval do
       gwp_ch4 = GreenhouseGas[:ch4].global_warming_potential
       connection.execute %{
         UPDATE bus_fuels
-        SET ch4_emission_factor = ch4_emission_factor * #{conversion_factor} * #{gwp_ch4},
+        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'
       }
@@ -39,7 +39,7 @@ BusFuel.class_eval do
       gwp_n2o = GreenhouseGas[:n2o].global_warming_potential
       connection.execute %{
         UPDATE bus_fuels
-        SET n2o_emission_factor = n2o_emission_factor * #{conversion_factor} * #{gwp_n2o},
+        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'
       }
@@ -49,7 +49,7 @@ BusFuel.class_eval 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 = energy_content * #{conversion_factor},
+        SET energy_content = 1.0 * energy_content * #{conversion_factor},
             energy_content_units = 'megajoules_per_litre'
         WHERE energy_content_units = 'btu_per_gallon'
       }
@@ -59,14 +59,14 @@ BusFuel.class_eval do
       BusFuel.all.each do |bus_fuel|
         fuel = bus_fuel.fuel
         if bus_fuel.energy_content.present?
-          co2_factor = (bus_fuel.energy_content * fuel.carbon_content * fuel.oxidation_factor * (1 - fuel.biogenic_fraction))
+          co2_factor = (bus_fuel.energy_content.to_f * fuel.carbon_content * fuel.oxidation_factor * (1 - fuel.biogenic_fraction))
           bus_fuel.co2_emission_factor = co2_factor.grams.to(:kilograms).carbon.to(:co2)
           
           co2_prefix = fuel.co2_emission_factor_units.split("_per_")[0]
           co2_suffix = bus_fuel.energy_content_units.split("_per_")[1]
           bus_fuel.co2_emission_factor_units = co2_prefix + "_per_" + co2_suffix
           
-          co2_biogenic_factor = (bus_fuel.energy_content * fuel.carbon_content * fuel.oxidation_factor * fuel.biogenic_fraction)
+          co2_biogenic_factor = (bus_fuel.energy_content.to_f * fuel.carbon_content * fuel.oxidation_factor * fuel.biogenic_fraction)
           bus_fuel.co2_biogenic_emission_factor = co2_biogenic_factor.grams.to(:kilograms).carbon.to(:co2)
           
           co2_biogenic_prefix = fuel.co2_biogenic_emission_factor_units.split("_per_")[0]
@@ -88,7 +88,7 @@ BusFuel.class_eval do
       BusFuel.all.each do |bus_fuel|
         if bus_fuel.latest_fuel_year_controls.present?
           ch4_factors_by_year = bus_fuel.latest_fuel_year_controls.map do |fyc|
-             fyc.total_travel_percent * fyc.fuel_control.ch4_emission_factor
+             fyc.total_travel_percent.to_f * fyc.fuel_control.ch4_emission_factor
           end
           bus_fuel.ch4_emission_factor = ch4_factors_by_year.sum * GreenhouseGas[:ch4].global_warming_potential
           
@@ -97,7 +97,7 @@ BusFuel.class_eval do
           bus_fuel.ch4_emission_factor_units = ch4_prefix + "_co2e_per_" + ch4_suffix
           
           n2o_factors_by_year = bus_fuel.latest_fuel_year_controls.map do |fyc|
-             fyc.total_travel_percent * fyc.fuel_control.n2o_emission_factor
+             fyc.total_travel_percent.to_f * fyc.fuel_control.n2o_emission_factor
           end
           bus_fuel.n2o_emission_factor = n2o_factors_by_year.sum * GreenhouseGas[:n2o].global_warming_potential
           

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

@@ -13,14 +13,14 @@ BusFuelControl.class_eval 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 = ch4_emission_factor * #{conversion_factor},
+        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 = n2o_emission_factor * #{conversion_factor},
+        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'
       }

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

@@ -33,7 +33,7 @@ Fuel.class_eval 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 = energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_litre'
+        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_litre'
         WHERE energy_content_units = 'million_btu_per_barrel'
       }
     end
@@ -42,7 +42,7 @@ Fuel.class_eval 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 = energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_cubic_metre'
+        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_cubic_metre'
         WHERE energy_content_units = 'btu_per_cubic_foot'
       }
     end
@@ -51,7 +51,7 @@ Fuel.class_eval 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 = carbon_content * #{conversion_factor}, carbon_content_units = 'grams_per_megajoule'
+        SET carbon_content = 1.0 * carbon_content * #{conversion_factor}, carbon_content_units = 'grams_per_megajoule'
         WHERE carbon_content_units = 'teragrams_per_quadrillion_btu'
       }
     end
@@ -60,8 +60,8 @@ Fuel.class_eval 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 = carbon_content * energy_content * oxidation_factor * (1 - biogenic_fraction) * #{conversion_factor},
-            co2_biogenic_emission_factor = carbon_content * energy_content * oxidation_factor * biogenic_fraction * #{conversion_factor}
+        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}
       }
     end
     

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

@@ -15,7 +15,7 @@ FuelYear.class_eval 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 = energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_kilogram'
+        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_kilogram'
         WHERE energy_content_units = 'million_btu_per_short_ton'
       }
     end
@@ -24,7 +24,7 @@ FuelYear.class_eval 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 = energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_litre'
+        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_litre'
         WHERE energy_content_units = 'million_btu_per_barrel'
       }
     end
@@ -33,7 +33,7 @@ FuelYear.class_eval 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 = energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_cubic_metre'
+        SET energy_content = 1.0 * energy_content * #{conversion_factor}, energy_content_units = 'megajoules_per_cubic_metre'
         WHERE energy_content_units = 'btu_per_cubic_foot'
       }
     end
@@ -42,7 +42,7 @@ FuelYear.class_eval 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 = carbon_content * #{conversion_factor}, carbon_content_units = 'grams_per_megajoule'
+        SET carbon_content = 1.0 * carbon_content * #{conversion_factor}, carbon_content_units = 'grams_per_megajoule'
         WHERE carbon_content_units = 'teragrams_per_quadrillion_btu'
       }
     end
@@ -51,8 +51,8 @@ FuelYear.class_eval 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 = carbon_content * energy_content * oxidation_factor * (1 - biogenic_fraction) * #{conversion_factor},
-            co2_biogenic_emission_factor = carbon_content * energy_content * oxidation_factor * biogenic_fraction * #{conversion_factor}
+        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}
       }
     end
     

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

@@ -11,20 +11,20 @@ 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 = natural_gas_intensity * #{conversion_factor} WHERE natural_gas_intensity_units = 'hundred_cubic_feet_per_room_night'"
-      update_all "natural_gas_intensity_units = 'cubic_metres_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 => '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')
     end
     
     process "Convert fuel oil intensities to metric units" do
       conversion_factor = 3.78541178 # Google: 3.78541178 l / gal
-      update_all "fuel_oil_intensity = fuel_oil_intensity * #{conversion_factor} WHERE fuel_oil_intensity_units = 'gallons_per_room_night'"
-      update_all "fuel_oil_intensity_units = 'litres_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 => 'gallons_per_room_night'
+      update_all({:fuel_oil_intensity_units => 'litres_per_room_night'}, :fuel_oil_intensity_units => 'gallons_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 = district_heat_intensity * #{conversion_factor} WHERE district_heat_intensity_units = 'thousand_btu_per_room_night'"
-      update_all "district_heat_intensity_units = 'megajoules_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 => 'thousand_btu_per_room_night'
+      update_all({:district_heat_intensity_units => 'megajoules_per_room_night'}, :district_heat_intensity_units => 'thousand_btu_per_room_night')
     end
   end
 end

data/lib/earth/industry/industry.rb

@@ -10,7 +10,7 @@ class Industry < ActiveRecord::Base
   has_many :sectors, :through => :industry_sectors
   
   col :naics_code
-  col :description
+  col :description, :type => :text
 
   def trade_industry?
     prefix = naics_code.to_s[0,2]

data/lib/earth/industry/industry_product.rb

@@ -6,7 +6,7 @@ class IndustryProduct < ActiveRecord::Base
   belongs_to :industry, :foreign_key => 'naics_code'
   
   col :naics_product_code
-  col :description
+  col :description, :type => :text
   col :value, :type => :float
   col :value_units
   col :naics_code

data/lib/earth/industry/merchant_category.rb

@@ -9,5 +9,5 @@ class MerchantCategory < ActiveRecord::Base
   end
 
   col :mcc
-  col :description
+  col :description, :type => :text
 end

data/lib/earth/industry/product_line.rb

@@ -7,7 +7,7 @@ class ProductLine < ActiveRecord::Base
   has_many :industry_products, :through => :product_line_industry_products
   
   col :ps_code
-  col :description
+  col :description, :type => :text
   col :broadline # FIXME TODO do we need this?
   col :parent    # FIXME TODO do we need this?
 end

data/lib/earth/industry/sector.rb

@@ -4,7 +4,7 @@ class Sector < ActiveRecord::Base
   has_many :industry_sectors, :foreign_key => 'io_code'
   
   col :io_code
-  col :description
+  col :description, :type => :text
   col :value, :type => :float
   col :value_units
 end

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

@@ -32,7 +32,7 @@ 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) / scope.sum(:fuel_consumption)
+      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 %{
@@ -47,7 +47,7 @@ Country.class_eval do
       conversion_factor = 1.miles.to(:kilometres)
       connection.execute %{
         UPDATE countries
-        SET automobile_city_speed = automobile_city_speed * #{conversion_factor},
+        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'
       }
@@ -57,7 +57,7 @@ Country.class_eval do
       conversion_factor = 1.miles.to(:kilometres)
       connection.execute %{
         UPDATE countries
-        SET automobile_highway_speed = automobile_highway_speed * #{conversion_factor},
+        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'
       }
@@ -67,7 +67,7 @@ Country.class_eval do
       conversion_factor = 1.miles.to(:kilometres)
       connection.execute %{
         UPDATE countries
-        SET automobile_trip_distance = automobile_trip_distance * #{conversion_factor},
+        SET automobile_trip_distance = 1.0 * automobile_trip_distance * #{conversion_factor},
             automobile_trip_distance_units = 'kilometres'
         WHERE automobile_trip_distance_units = 'miles'
       }

data/lib/earth/pet/species.rb

@@ -29,7 +29,7 @@ class Species < ActiveRecord::Base
     end
 
     def marginal_dietary_requirement_fallback
-      total_diet_size = thoroughly_researched.map(&:weighted_diet_size).sum
+      total_diet_size = thoroughly_researched.map(&:weighted_diet_size).sum.to_f
       total_population = thoroughly_researched.sum(:population)
       return 0.0 unless total_population > 0.0
       average_weight = thoroughly_researched.weighted_average(:weight, :weighted_by => :population)
@@ -40,12 +40,12 @@ class Species < ActiveRecord::Base
   
   def diet_size
     return unless weight and marginal_dietary_requirement and fixed_dietary_requirement
-    weight * marginal_dietary_requirement + fixed_dietary_requirement
+    weight.to_f * marginal_dietary_requirement + fixed_dietary_requirement
   end
   
   def weighted_diet_size
     return unless _diet_size = diet_size and _population = population
-    _diet_size * _population
+    _diet_size.to_f * _population
   end
   
   def to_s

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

@@ -142,24 +142,24 @@ ResidentialEnergyConsumptionSurveyResponse.class_eval do
         [ 'annual_energy_from_electricity_for_heating_water', :kbtus, :joules ],
         [ 'annual_energy_from_electricity_for_other_appliances', :kbtus, :joules ],
       ].each do |attr_name, from_units, to_units|
-        update_all "#{attr_name} = #{attr_name} * #{Conversions::Unit.exchange_rate from_units, to_units}"
+        update_all "#{attr_name} = 1.0 * #{attr_name} * #{Conversions::Unit.exchange_rate from_units, to_units}"
       end
     end
       
     process 'Add a new field "rooms" that estimates how many rooms are in the house' do
-      update_all 'rooms = total_rooms + full_bathrooms/2 + half_bathrooms/4 + heated_garage*(attached_1car_garage + detached_1car_garage + 2*(attached_2car_garage + detached_2car_garage) + 3*(attached_3car_garage + detached_3car_garage))'
+      update_all 'rooms = total_rooms + full_bathrooms/2.0 + half_bathrooms/4.0 + 1.0*heated_garage*(attached_1car_garage + detached_1car_garage + 2.0*(attached_2car_garage + detached_2car_garage) + 3.0*(attached_3car_garage + detached_3car_garage))'
     end
     
     process 'Add a new field "bathrooms" that synthesizes half and full bathrooms into one number' do
-      update_all 'bathrooms = full_bathrooms + 0.5 * half_bathrooms'
+      update_all 'bathrooms = full_bathrooms + 0.5*half_bathrooms'
     end
     
     process 'Add a new field "lighting_use" that estimates how many hours light bulbs are turned on in the house' do
-      update_all 'lighting_use = 2*(lights_on_1_to_4_hours + efficient_lights_on_1_to_4_hours) + 8*(lights_on_4_to_12_hours + efficient_lights_on_4_to_12_hours) + 16*(lights_on_over_12_hours + efficient_lights_on_over_12_hours) + 12*(outdoor_all_night_lights + outdoor_all_night_gas_lights)'
+      update_all 'lighting_use = 2.0*(lights_on_1_to_4_hours + efficient_lights_on_1_to_4_hours) + 8.0*(lights_on_4_to_12_hours + efficient_lights_on_4_to_12_hours) + 16.0*(lights_on_over_12_hours + efficient_lights_on_over_12_hours) + 12.0*(outdoor_all_night_lights + outdoor_all_night_gas_lights)'
     end
     
     process 'Add a new field "lighting_efficiency" that estimates what percentage of light bulbs in a house are energy-efficient' do
-      update_all 'lighting_efficiency = (2*efficient_lights_on_1_to_4_hours + 8*efficient_lights_on_4_to_12_hours + 16*efficient_lights_on_over_12_hours) / lighting_use', 'lighting_use > 0'
+      update_all 'lighting_efficiency = (2.0*efficient_lights_on_1_to_4_hours + 8.0*efficient_lights_on_4_to_12_hours + 16.0*efficient_lights_on_over_12_hours) / lighting_use', 'lighting_use > 0'
     end
     
     process "synthesize air conditioner use from central AC and window AC use" do

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earth
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-06-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_miner
-  requirement: &2168492720 !ruby/object:Gem::Requirement
+  requirement: &2164719040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2168492720
+  version_requirements: *2164719040
 - !ruby/object:Gem::Dependency
   name: to_regexp
-  requirement: &2168492300 !ruby/object:Gem::Requirement
+  requirement: &2164718620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168492300
+  version_requirements: *2164718620
 - !ruby/object:Gem::Dependency
   name: cohort_scope
-  requirement: &2168491840 !ruby/object:Gem::Requirement
+  requirement: &2164718100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168491840
+  version_requirements: *2164718100
 - !ruby/object:Gem::Dependency
   name: table_warnings
-  requirement: &2168491340 !ruby/object:Gem::Requirement
+  requirement: &2164717600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *2168491340
+  version_requirements: *2164717600
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2168490840 !ruby/object:Gem::Requirement
+  requirement: &2164717020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2168490840
+  version_requirements: *2164717020
 - !ruby/object:Gem::Dependency
   name: falls_back_on
-  requirement: &2168490460 !ruby/object:Gem::Requirement
+  requirement: &2164716640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168490460
+  version_requirements: *2164716640
 - !ruby/object:Gem::Dependency
   name: fixed_width-multibyte
-  requirement: &2168490000 !ruby/object:Gem::Requirement
+  requirement: &2164716160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168490000
+  version_requirements: *2164716160
 - !ruby/object:Gem::Dependency
   name: geokit-rails
-  requirement: &2168489580 !ruby/object:Gem::Requirement
+  requirement: &2164715700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168489580
+  version_requirements: *2164715700
 - !ruby/object:Gem::Dependency
   name: loose_tight_dictionary
-  requirement: &2168489080 !ruby/object:Gem::Requirement
+  requirement: &2164693640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,21 +111,21 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2168489080
+  version_requirements: *2164693640
 - !ruby/object:Gem::Dependency
   name: weighted_average
-  requirement: &2168488580 !ruby/object:Gem::Requirement
+  requirement: &2164693060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2168488580
+  version_requirements: *2164693060
 - !ruby/object:Gem::Dependency
   name: mini_record-compat
-  requirement: &2168488200 !ruby/object:Gem::Requirement
+  requirement: &2164692660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168488200
+  version_requirements: *2164692660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168487740 !ruby/object:Gem::Requirement
+  requirement: &2164692160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168487740
+  version_requirements: *2164692160
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2168487320 !ruby/object:Gem::Requirement
+  requirement: &2164691740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168487320
+  version_requirements: *2164691740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2168486900 !ruby/object:Gem::Requirement
+  requirement: &2164691300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168486900
+  version_requirements: *2164691300
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2168486480 !ruby/object:Gem::Requirement
+  requirement: &2164690840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168486480
+  version_requirements: *2164690840
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2160161960 !ruby/object:Gem::Requirement
+  requirement: &2164690420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160161960
+  version_requirements: *2164690420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160161540 !ruby/object:Gem::Requirement
+  requirement: &2164689940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +199,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160161540
+  version_requirements: *2164689940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2160161120 !ruby/object:Gem::Requirement
+  requirement: &2164689520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,10 +210,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160161120
+  version_requirements: *2164689520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160160700 !ruby/object:Gem::Requirement
+  requirement: &2164689100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -221,10 +221,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160160700
+  version_requirements: *2164689100
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2160160280 !ruby/object:Gem::Requirement
+  requirement: &2164688620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -232,10 +232,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160160280
+  version_requirements: *2164688620
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2160159860 !ruby/object:Gem::Requirement
+  requirement: &2164688140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -243,10 +243,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160159860
+  version_requirements: *2164688140
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2160159440 !ruby/object:Gem::Requirement
+  requirement: &2164687720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -254,7 +254,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160159440
+  version_requirements: *2164687720
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables: