earth 0.3.9 → 0.3.10

data/features/support/imports/automobile_size_class_good.csv

@@ -0,0 +1,3 @@
+name,annual_distance,fuel_efficiency_city,fuel_efficiency_highway,annual_distance_units,fuel_efficiency_city_units,fuel_efficiency_highway_units,hybrid_fuel_efficiency_city_multiplier,hybrid_fuel_efficiency_highway_multiplier,conventional_fuel_efficiency_city_multiplier,conventional_fuel_efficiency_highway_multiplier
+small,1000,10.0,15.0,kilometres,kilometres_per_litre,kilometres_per_litre,1.1,1.2,0.9,0.95
+large,0.5,0.1,0.5,kilometres,kilometres_per_litre,kilometres_per_litre

data/features/support/imports/bus_class_bad.csv

@@ -0,0 +1,3 @@
+name,distance,distance_units,passengers,speed,speed_units,diesel_intensity,diesel_intensity_units,alternative_fuels_intensity,alternative_fuels_intensity_units,air_conditioning_emission_factor,air_conditioning_emission_factor_units
+transit,10,kilometres,15,20,kilometres_per_hour,0.5,litres_per_kilometre,0,litres_per_kilometre,0,kilograms_per_kilometre
+regional,-10,distance_units,0,,,-2,diesel_intensity_units,-2,alternative_fuels_intensity_units

data/features/support/imports/bus_class_good.csv

@@ -0,0 +1,3 @@
+name,distance,distance_units,passengers,speed,speed_units,diesel_intensity,diesel_intensity_units,alternative_fuels_intensity,alternative_fuels_intensity_units,air_conditioning_emission_factor,air_conditioning_emission_factor_units
+transit,10,kilometres,15,20,kilometres_per_hour,0.5,litres_per_kilometre,0,litres_per_kilometre,0,kilograms_per_kilometre
+regional,100,kilometres,30,80,kilometres_per_hour,0.1,litres_per_kilometre,0.2,litres_per_kilometre,0.5,kilograms_per_kilometre

data/features/support/imports/carrier_bad.csv

@@ -0,0 +1,3 @@
+name,package_volume,route_inefficiency_factor,transport_emission_factor,corporate_emission_factor,transport_emission_factor_units,corporate_emission_factor_units
+FedEx,100,1.0,0.1,0.1,kilograms_per_kilogram_kilometre,kilograms_per_package
+UPS,0,0.5,0.0,0.0

data/features/support/imports/carrier_good.csv

@@ -0,0 +1,3 @@
+name,package_volume,route_inefficiency_factor,transport_emission_factor,corporate_emission_factor,transport_emission_factor_units,corporate_emission_factor_units
+FedEx,100,1.0,0.1,0.1,kilograms_per_kilogram_kilometre,kilograms_per_package
+UPS,1000,2.0,1.5,2.0,kilograms_per_kilogram_kilometre,kilograms_per_package

data/features/support/imports/carrier_mode_bad.csv

@@ -0,0 +1,3 @@
+name,package_volume,route_inefficiency_factor,transport_emission_factor,carrier_name,mode_name,include_in_fallbacks,transport_emission_factor_units
+FedEx ground,100,1.0,1.2,FedEx,ground,1,kilograms_per_kilogram_kilometre
+FedEx air,0,0.9,-2.0

data/features/support/imports/carrier_mode_good.csv

@@ -0,0 +1,3 @@
+name,carrier_name,mode_name,include_in_fallbacks,package_volume,route_inefficiency_factor,transport_emission_factor,transport_emission_factor_units
+FedEx ground,FedEx,ground,1,100,1.0,1.2,kilograms_per_kilogram_kilometre
+FedEx air,FedEx,air,0,1,2.0,4.0,kilograms_per_kilogram_kilometre

data/features/support/imports/egrid_region_bad.csv

@@ -0,0 +1,3 @@
+name,loss_factor
+US,0.1
+AK,1

data/features/support/imports/egrid_region_good.csv

@@ -0,0 +1,3 @@
+name,loss_factor
+US,0.1
+AK,0.15

data/features/support/imports/egrid_subregion_bad.csv

@@ -0,0 +1,3 @@
+name,egrid_region_name,electricity_emission_factor,electricity_emission_factor_units
+US,US,1.2,kilograms_per_kilowatt_hour
+AKGD,foo,0

data/features/support/imports/egrid_subregion_good.csv

@@ -0,0 +1,3 @@
+name,egrid_region_name,electricity_emission_factor,electricity_emission_factor_units
+US,US,1.2,kilograms_per_kilowatt_hour
+AKGD,AK,0.9,kilograms_per_kilowatt_hour

data/features/support/imports/rail_class_bad.csv

@@ -0,0 +1,3 @@
+name,passengers,distance,distance_units,speed,speed_units,electricity_intensity,electricity_intensity_units,diesel_intensity,diesel_intensity_units
+commuter,100,50,kilometres,100,kilometres_per_hour,0.7,kilowatt_hours_per_kilometre,0,litres_per_kilometre
+intercity,0,-20,distance_units,-1,speed_units,,elec_intense_units,-1

data/features/support/imports/rail_class_good.csv

@@ -0,0 +1,3 @@
+name,passengers,distance,distance_units,speed,speed_units,electricity_intensity,electricity_intensity_units,diesel_intensity,diesel_intensity_units
+commuter,100,50,kilometres,100,kilometres_per_hour,0.7,kilowatt_hours_per_kilometre,0,litres_per_kilometre
+intercity,150,200,kilometres,150,kilometres_per_hour,0.8,kilowatt_hours_per_kilometre,0.5,litres_per_kilometre

data/features/support/imports/shipment_mode_bad.csv

@@ -0,0 +1,3 @@
+name,route_inefficiency_factor,transport_emission_factor,transport_emission_factor_units
+ground,1.0,0.1,kilograms_per_kilogram_kilometre
+air,0.9,0.0

data/features/support/imports/shipment_mode_good.csv

@@ -0,0 +1,3 @@
+name,route_inefficiency_factor,transport_emission_factor,transport_emission_factor_units
+ground,1.0,0.1,kilograms_per_kilogram_kilometre
+air,1.5,1.0,kilograms_per_kilogram_kilometre

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

@@ -22,24 +22,45 @@ AutomobileFuelType.class_eval do
       key   'code'
       store 'name'
     end
-
+    
     import "a pre-calculated emission factor and average annual distance for each fuel",
-           :url => 'http://static.brighterplanet.com/science/data/transport/automobiles/models_export/automobile_fuel_type.csv' do
-      key   'code', :field_name => 'code'
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDlqeU9vQkVkNG1NZXV4WklKTjJkU3c&hl=en&single=true&gid=0&output=csv' do
+      key   'code'
       store 'name'
-      store 'annual_distance', :units => :kilometres
-      store 'emission_factor', :units => :kilograms_per_litre
+      store 'annual_distance', :units_field_name => 'annual_distance_units'
+      store 'emission_factor', :units_field_name => 'emission_factor_units'
+    end
+    
+    verify "Annual distance should be greater than zero" do
+      AutomobileFuelType.all.each do |fuel_type|
+        unless fuel_type.annual_distance > 0.0
+          raise "Invalid annual_distance for AutomobileFuelType #{fuel_type.name}: #{fuel_type.annual_distance} (should be > 0)"
+        end
+      end
     end
-
-    # pull electricity emission factor from residential electricity
-    import "a pre-calculated emission factor for electricity",
-           :url => 'http://spreadsheets.google.com/pub?key=rukxnmuhhsOsrztTrUaFCXQ',
-           :select => lambda { |row| row['name'] == 'electricity' } do
-      key 'name'
-      store 'emission_factor', :units => :kilograms_per_litre
+    
+    verify "Annual distance units should never be missing" do
+      AutomobileFuelType.all.each do |fuel_type|
+        if fuel_type.annual_distance_units.nil?
+          raise "Missing annual distance units for AutomobileFuelType #{fuel_type.name}"
+        end
+      end
+    end
+    
+    verify "Emission factor should be zero or more" do
+      AutomobileFuelType.all.each do |fuel_type|
+        unless fuel_type.emission_factor >= 0.0
+          raise "Invalid emission_factor for AutomobileFuelType #{fuel_type.name}: #{fuel_type.emission_factor} (should be >= 0)"
+        end
+      end
     end
     
-    # still need distance estimate for electric cars
+    verify "Emission factor units should never be missing" do
+      AutomobileFuelType.all.each do |fuel_type|
+        if fuel_type.emission_factor_units.nil?
+          raise "Missing emission factor units for AutomobileFuelType #{fuel_type.name}"
+        end
+      end
+    end
   end
 end
-

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

@@ -11,11 +11,11 @@ AutomobileMake.class_eval do
       string  'fuel_efficiency_units'
     end
 
-    process "Derive automobile makes from automobile make model year variants" do
-      AutomobileMakeModelYearVariant.run_data_miner!
+    process "Derive manufacturer names from automobile make fleet years" do
+      AutomobileMakeFleetYear.run_data_miner!
       connection.execute %{
         INSERT IGNORE INTO automobile_makes(name)
-        SELECT automobile_make_model_year_variants.make_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.make_name) > 0
+        SELECT DISTINCT automobile_make_fleet_years.make_name FROM automobile_make_fleet_years
       }
     end
     
@@ -25,15 +25,31 @@ AutomobileMake.class_eval do
       store 'major'
     end
     
-    process "Derive average fuel efficiency from automobile makes and years" do
-      AutomobileMakeYear.run_data_miner!
-      make_years = AutomobileMakeYear.arel_table
+    process "Derive average fuel efficiency from automobile make fleet years" do
+      AutomobileMakeFleetYear.run_data_miner!
+      make_fleet_years = AutomobileMakeFleetYear.arel_table
       makes = AutomobileMake.arel_table
-      conditional_relation = makes[:name].eq(make_years[:make_name])
-      relation = AutomobileMakeYear.weighted_average_relation(:fuel_efficiency, :weighted_by => :volume).where(conditional_relation)
+      conditional_relation = makes[:name].eq(make_fleet_years[:make_name])
+      relation = AutomobileMakeFleetYear.weighted_average_relation(:fuel_efficiency, :weighted_by => :volume).where(conditional_relation)
       update_all "fuel_efficiency = (#{relation.to_sql})"
       update_all "fuel_efficiency_units = 'kilometres_per_litre'"
     end
+    
+    verify "Fuel efficiency should be greater than zero" do
+      AutomobileMake.all.each do |make|
+        unless make.fuel_efficiency > 0
+          raise "Invalid fuel efficiency for AutomobileMake #{make.name}: #{make.fuel_efficiency} (should be > 0)"
+        end
+      end
+    end
+    
+    verify "Fuel efficiency units should be kilometres per litre" do
+      AutomobileMake.all.each do |make|
+        unless make.fuel_efficiency_units == "kilometres_per_litre"
+          raise "Invalid fuel efficiency units for AutomobileMake #{make.name}: #{make.fuel_efficiency_units} (should be kilometres_per_litre)"
+        end
+      end
+    end
   end
 end
 
@@ -65,4 +81,3 @@ end
 #   'Maybach' => 'Mercedes',
 #   'Hummer' => 'GM'
 # }
-

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

@@ -24,6 +24,37 @@ AutomobileMakeFleetYear.class_eval do
       store 'fuel_efficiency', :from_units => :miles_per_gallon, :to_units => :kilometres_per_litre
       store 'volume'
     end
+    
+    verify "Year should be between 1978 and 2007" do
+      AutomobileMakeFleetYear.all.each do |fleet_year|
+        unless fleet_year.year > 1977 and fleet_year.year < 2008
+          raise "Invalid year for AutomobileMakeFleetYear #{fleet_year.name}: #{fleet_year.year} (should be between 1978 and 2007)"
+        end
+      end
+    end
+    
+    verify "Fuel efficiency should be greater than zero" do
+      AutomobileMakeFleetYear.all.each do |fleet_year|
+        unless fleet_year.fuel_efficiency > 0
+          raise "Invalid fuel efficiency for AutomobileMakeFleetYear #{fleet_year.name}: #{fleet_year.fuel_efficiency} (should be > 0)"
+        end
+      end
+    end
+    
+    verify "Fuel efficiency units should be kilometres per litre" do
+      AutomobileMakeFleetYear.all.each do |fleet_year|
+        unless fleet_year.fuel_efficiency_units == "kilometres_per_litre"
+          raise "Invalid fuel efficiency units for AutomobileMakeFleetYear #{fleet_year.name}: #{fleet_year.fuel_efficiency_units} (should be kilometres_per_litre)"
+        end
+      end
+    end
+    
+    verify "Volume should be greater than zero" do
+      AutomobileMakeFleetYear.all.each do |fleet_year|
+        unless fleet_year.volume > 0
+          raise "Invalid volume for AutomobileMakeFleetYear #{fleet_year.name}: #{fleet_year.volume} (should be > 0)"
+        end
+      end
+    end
   end
 end
-

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

@@ -24,16 +24,38 @@ AutomobileMakeModel.class_eval do
     # TODO not weighted until we get weightings on auto variants
     process "Derive average fuel economy from automobile make model year variants" do
       AutomobileMakeModelYearVariant.run_data_miner!
-      automobile_make_models = AutomobileMakeModel.arel_table
-      automobile_make_model_year_variants = AutomobileMakeModelYearVariant.arel_table
-      conditional_relation = automobile_make_models[:name].eq(automobile_make_model_year_variants[:make_model_name])
+      models = AutomobileMakeModel.arel_table
+      variants = AutomobileMakeModelYearVariant.arel_table
+      conditional_relation = models[:name].eq(variants[:make_model_name])
       %w{ city highway }.each do |i|
+        null_check = variants[:"fuel_efficiency_#{i}"].not_eq(nil)
         # sabshere 12/6/10 careful, don't use AutomobileMakeModelYearVariant.where here or you will be forced into projecting *
-        relation = automobile_make_model_year_variants.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
+        relation = variants.project(variants[:"fuel_efficiency_#{i}"].average).where(conditional_relation).where(null_check)
         update_all "fuel_efficiency_#{i} = (#{relation.to_sql})"
         update_all "fuel_efficiency_#{i}_units = 'kilometres_per_litre'"
       end
     end
+    
+    verify "Fuel efficiencies should be greater than zero" do
+      AutomobileMakeModel.all.each do |model|
+        %w{ city highway }.each do |type|
+          fuel_efficiency = model.send(:"fuel_efficiency_#{type}")
+          unless fuel_efficiency > 0
+            raise "Invalid fuel efficiency #{type} for AutomobileMakeModel #{model.name}: #{fuel_efficiency} (should be > 0)"
+          end
+        end
+      end
+    end
+    
+    verify "Fuel efficiency units should be kilometres per litre" do
+      AutomobileMakeModel.all.each do |model|
+        %w{ city highway }.each do |type|
+          units = model.send(:"fuel_efficiency_#{type}_units")
+          unless units == "kilometres_per_litre"
+            raise "Invalid fuel efficiency #{type} units for AutomobileMakeModel #{model.name}: #{units} (should be kilometres_per_litre)"
+          end
+        end
+      end
+    end
   end
 end
-

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

@@ -32,12 +32,13 @@ AutomobileMakeModelYear.class_eval do
     # for example, 20km/l for a toyota prius 2006 vs. 13km/l if you use make years
     process "Calculate city and highway fuel efficiency from automobile make model year variants" do
       AutomobileMakeModelYearVariant.run_data_miner!
-      automobile_make_model_years = AutomobileMakeModelYear.arel_table
-      automobile_make_model_year_variants = AutomobileMakeModelYearVariant.arel_table
-      conditional_relation = automobile_make_model_years[:name].eq(automobile_make_model_year_variants[:make_model_year_name])
+      model_years = AutomobileMakeModelYear.arel_table
+      variants = AutomobileMakeModelYearVariant.arel_table
+      conditional_relation = model_years[:name].eq(variants[:make_model_year_name])
       %w{ city highway }.each do |i|
+        null_check = variants[:"fuel_efficiency_#{i}"].not_eq(nil)
         # sabshere 12/6/10 careful, don't use AutomobileMakeModelYearVariant.where here or you will be forced into projecting *
-        relation = automobile_make_model_year_variants.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
+        relation = variants.project(variants[:"fuel_efficiency_#{i}"].average).where(conditional_relation).where(null_check)
         update_all "fuel_efficiency_#{i} = (#{relation.to_sql})"
         update_all "fuel_efficiency_#{i}_units = 'kilometres_per_litre'"
       end
@@ -47,6 +48,35 @@ AutomobileMakeModelYear.class_eval do
       update_all "fuel_efficiency = 1 / ((0.43 / fuel_efficiency_city) + (0.57 / fuel_efficiency_highway))"
       update_all "fuel_efficiency_units = 'kilometres_per_litre'"
     end
+    
+    verify "Year should be between 1985 and 2009" do
+      AutomobileMakeModelYear.all.each do |model_year|
+        unless model_year.year > 1984 and model_year.year < 2010
+          raise "Invalid year for AutomobileMakeModelYear #{model_year.name}: #{model_year.year} (should be between 1985 and 2009)"
+        end
+      end
+    end
+    
+    verify "Fuel efficiencies should be greater than zero" do
+      AutomobileMakeModelYear.all.each do |model_year|
+        %w{ city highway }.each do |type|
+          fuel_efficiency = model_year.send(:"fuel_efficiency_#{type}")
+          unless fuel_efficiency > 0
+            raise "Invalid fuel efficiency #{type} for AutomobileMakeModelYear #{model_year.name}: #{fuel_efficiency} (should be > 0)"
+          end
+        end
+      end
+    end
+    
+    verify "Fuel efficiency units should be kilometres per litre" do
+      AutomobileMakeModelYear.all.each do |model_year|
+        %w{ city highway }.each do |type|
+          units = model_year.send(:"fuel_efficiency_#{type}_units")
+          unless units == "kilometres_per_litre"
+            raise "Invalid fuel efficiency #{type} units for AutomobileMakeModelYear #{model_year.name}: #{units} (should be kilometres_per_litre)"
+          end
+        end
+      end
+    end
   end
 end
-

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

@@ -9,7 +9,7 @@ AutomobileMakeModelYearVariant.class_eval do
     end
 
     def is_a_porsche?(row)
-      row['make'].upcase == 'PORSCHE'
+      row['make'] and row['make'].upcase == 'PORSCHE'
     end
 
     def is_not_a_porsche?(row)
@@ -17,19 +17,19 @@ AutomobileMakeModelYearVariant.class_eval do
     end
 
     def is_a_mercedes_benz?(row)
-      row['make'] =~ /MERCEDES/i
+      row['make'] and row['make'] =~ /MERCEDES/i
     end
 
     def is_a_lexus?(row)
-      row['make'].upcase == 'LEXUS'
+      row['make'] and row['make'].upcase == 'LEXUS'
     end
 
     def is_a_bmw?(row)
-      row['make'].upcase == 'BMW'
+      row['make'] and row['make'].upcase == 'BMW'
     end
 
     def is_a_ford?(row)
-      row['make'].upcase == 'FORD'
+      row['make'] and row['make'].upcase == 'FORD'
     end
 
     def is_a_rolls_royce_and_model_contains_bentley?(row)
@@ -37,11 +37,11 @@ AutomobileMakeModelYearVariant.class_eval do
     end
 
     def is_a_bentley?(row)
-      row['make'].upcase == 'BENTLEY'
+      row['make'] and row['make'].upcase == 'BENTLEY'
     end
 
     def is_a_rolls_royce?(row)
-      row['make'] =~ /ROLLS/i
+      row['make'] and row['make'] =~ /ROLLS/i
     end
 
     def is_a_turbo_brooklands?(row)
@@ -139,7 +139,9 @@ AutomobileMakeModelYearVariant.class_eval do
       bus[:format] = :fixed_width
       bus[:cut] = '13-' if year == 1995
       bus[:schema_name] = :fuel_economy_guide_b
-      bus[:select] = lambda { |row| row['suppress_code'].blank? and row['state_code'] == 'F' }
+      bus[:select] = lambda do |row|
+        (row['suppress_code'].blank? or row['suppress_code'].to_i == 0) and row['state_code'] == 'F'
+      end
       Slither.define :fuel_economy_guide_b do |d|
         d.rows do |row|
           row.trap { true } # there's only one section
@@ -309,7 +311,7 @@ AutomobileMakeModelYearVariant.class_eval do
       index    'make_model_year_name'
     end
     
-    # # 1985---1997
+    # 1985---1997
     (85..97).each do |yy|
       filename = (yy == 96) ? "#{yy}MFGUI.ASC" : "#{yy}MFGUI.DAT"
       import("19#{ yy } Fuel Economy Guide",
@@ -410,34 +412,33 @@ AutomobileMakeModelYearVariant.class_eval do
     end
     
     # 2010--?
-    # sabshere 5/17/10 apparently needs update
-    # {
-    #   2010 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/10data.zip', :filename => '2010FEguide-for DOE-rel dates before 10-16-09-no-sales10-8-09public.xls' }
-    # }.sort { |a, b| a.first <=> b.first }.each do |year, options|
-    #   import "#{ year } Fuel Economy Guide",
-    #          options.merge(:transform => { :class => AutomobileVariant::ParserE, :year => year },
-    #                        :errata => 'http://static.brighterplanet.com/science/data/transport/automobiles/fuel_economy_guide/errata.csv') do
-    #     key   'row_hash'
-    #     store 'name', :field_name => 'model'
-    #     store 'make_name', :field_name => 'make'
-    #     store 'fuel_type_code'
-    #     store 'fuel_efficiency_highway', :static => nil, :units => :kilometres_per_litre
-    #     store 'fuel_efficiency_city', :static => nil, :units => :kilometres_per_litre
-    #     store 'raw_fuel_efficiency_highway', :field_name => 'Hwy Unadj FE - Conventional Fuel', :from_units => :miles_per_gallon, :to_units => :kilometres_per_litre
-    #     store 'raw_fuel_efficiency_city', :field_name => 'City Unadj FE - Conventional Fuel', :from_units => :miles_per_gallon, :to_units => :kilometres_per_litre
-    #     store 'cylinders', :field_name => '# Cyl'
-    #     store 'displacement', :field_name => 'Eng Displ'
-    #     store 'carline_class_code', :field_name => 'Carline Class'
-    #     store 'carline_class_name', :field_name => 'Carline Class Desc'
-    #     store 'year'
-    #     store 'transmission'
-    #     store 'speeds'
-    #     store 'turbo'
-    #     store 'supercharger'
-    #     store 'injection'
-    #     store 'drive'
-    #   end
-    # end
+    {
+      2010 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/10data.zip', :filename => '2010FE Guide for DOE-all rel dates-no-sales 4-9-10public.xls' }
+    }.sort { |a, b| a.first <=> b.first }.each do |year, options|
+      import "#{ year } Fuel Economy Guide",
+             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserE, :year => year },
+                           :errata => 'http://static.brighterplanet.com/science/data/transport/automobiles/fuel_economy_guide/errata.csv') do
+        key   'row_hash'
+        store 'name', :field_name => 'model'
+        store 'make_name', :field_name => 'make'
+        store 'fuel_type_code'
+        store 'fuel_efficiency_highway', :static => nil, :units => :kilometres_per_litre
+        store 'fuel_efficiency_city', :static => nil, :units => :kilometres_per_litre
+        store 'raw_fuel_efficiency_highway', :field_name => 'Hwy Unadj FE - Conventional Fuel', :from_units => :miles_per_gallon, :to_units => :kilometres_per_litre
+        store 'raw_fuel_efficiency_city', :field_name => 'City Unadj FE - Conventional Fuel', :from_units => :miles_per_gallon, :to_units => :kilometres_per_litre
+        store 'cylinders', :field_name => '# Cyl'
+        store 'displacement', :field_name => 'Eng Displ'
+        store 'carline_class_code', :field_name => 'Carline Class'
+        store 'carline_class_name', :field_name => 'Carline Class Desc'
+        store 'year'
+        store 'transmission'
+        store 'speeds'
+        store 'turbo'
+        store 'supercharger'
+        store 'injection'
+        store 'drive'
+      end
+    end
     
     process "Derive model and model year names" do
       update_all "make_model_name = CONCAT(make_name, ' ', name)"
@@ -450,11 +451,51 @@ AutomobileMakeModelYearVariant.class_eval do
       update_all 'fuel_efficiency_highway = 1 / ((0.001376 / 0.425143707) + (1.3466 / raw_fuel_efficiency_highway))'
     end
     
-    %w{ AutomobileMake AutomobileMakeModelYear AutomobileMakeModel }.each do |synthetic_resource|
+    %w{ AutomobileMakeModelYear AutomobileMakeModel }.each do |synthetic_resource|
       process "Synthesize #{synthetic_resource}" do
         synthetic_resource.constantize.run_data_miner!
       end
     end
+    
+    verify "Year should be between 1985 and 2009" do
+      AutomobileMakeModelYearVariant.all.each do |variant|
+        unless variant.year > 1984 and variant.year < 2010
+          raise "Invalid year for AutomobileMakeModelYearVariant #{variant.row_hash}: #{variant.year} (should be between 1985 and 2009)"
+        end
+      end
+    end
+    
+    # FIXME TODO
+    # verify "Fuel type code should be found in AutomobileFuelType" do
+    #   valid_codes = AutomobileFuelType.all.map(&:code)
+    #   puts valid_codes
+    #   AutomobileMakeModelVariant.all.each do |variant|
+    #     unless valid_codes.include? variant.fuel_type_code
+    #       raise "Invalid fuel type code for AutomobileMakeModelYearVariant #{variant.row_hash}: #{variant.fuel_type_code} (should be found in AutomobileFuelType)"
+    #     end
+    #   end
+    # end
+    # 
+    verify "Fuel efficiencies should be greater than zero" do
+      AutomobileMakeModelYearVariant.all.each do |variant|
+        %w{ city highway }.each do |type|
+          fuel_efficiency = variant.send(:"fuel_efficiency_#{type}")
+          unless fuel_efficiency > 0
+            raise "Invalid fuel efficiency #{type} for AutomobileMakeModelYearVariant #{variant.row_hash}: #{fuel_efficiency} (should be < 0)"
+          end
+        end
+      end
+    end
+    
+    verify "Fuel efficiency units should be kilometres per litre" do
+      AutomobileMakeModelYearVariant.all.each do |variant|
+        %w{ city highway }.each do |type|
+          units = variant.send(:"fuel_efficiency_#{type}_units")
+          unless units == "kilometres_per_litre"
+            raise "Invalid fuel efficiency #{type} units for AutomobileMakeModelYearVariant #{variant.row_hash}: #{units} (should be kilometres_per_litre)"
+          end
+        end
+      end
+    end
   end
 end
-