earth 0.5.4 → 0.6.0

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

@@ -17,93 +17,5 @@ BusClass.class_eval do
       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
-    
-    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
-            puts "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be > 0)"
-            fail
-          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
-            puts "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be >= 0)"
-            fail
-          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
-            puts "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{units} (should be #{proper_units})"
-            fail
-          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
-          puts "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be > 0)"
-          fail
-        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
-          puts "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be >= 0)"
-          fail
-        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
-          puts "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{units} (should be #{proper_units})"
-          fail
-        end
-      end
-    end
   end
 end

data/lib/earth/bus/bus_fuel.rb

@@ -8,18 +8,86 @@ class BusFuel < ActiveRecord::Base
     fuel_year_controls.where(:year => fuel_year_controls.maximum('year'))
   end
   
-  force_schema do
-    string 'name'
-    string 'fuel_name'
-    float  'energy_content'
-    string 'energy_content_units'
-    float  'co2_emission_factor'
-    string 'co2_emission_factor_units'
-    float  'co2_biogenic_emission_factor'
-    string 'co2_biogenic_emission_factor_units'
-    float  'ch4_emission_factor'
-    string 'ch4_emission_factor_units'
-    float  'n2o_emission_factor'
-    string 'n2o_emission_factor_units'
-  end
-end
+  col :name
+  col :fuel_name
+  col :energy_content, :type => :float
+  col :energy_content_units
+  col :co2_emission_factor, :type => :float
+  col :co2_emission_factor_units
+  col :co2_biogenic_emission_factor, :type => :float
+  col :co2_biogenic_emission_factor_units
+  col :ch4_emission_factor, :type => :float
+  col :ch4_emission_factor_units
+  col :n2o_emission_factor, :type => :float
+  col :n2o_emission_factor_units
+  
+  # # FIXME TODO verify fuel_name appears in fuels
+  # verify "Fuel name should never be missing" do
+  #   BusFuel.all.each do |fuel|
+  #     value = fuel.send(:fuel_name)
+  #     unless value.present?
+  #       raise "Missing fuel name for BusFuel #{fuel.name}"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Energy content should be greater than zero if present" do
+  #   BusFuel.all.each do |fuel|
+  #     value = fuel.send(:energy_content)
+  #     if value.present?
+  #       unless value > 0
+  #         raise "Invalid energy content for BusFuel #{fuel.name}: #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # %w{ co2_emission_factor co2_biogenic_emission_factor }.each do |attribute|
+  #   verify "#{attribute.humanize} should be 0 or more" do
+  #     BusFuel.all.each do |fuel|
+  #       value = fuel.send(attribute)
+  #       unless value >= 0
+  #         raise "Invalid #{attribute.humanize.downcase} for BusFuel #{fuel.name}: #{value} (should be 0 or more)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # %w{ ch4_emission_factor n2o_emission_factor }.each do |attribute|
+  #   verify "#{attribute.humanize} should be > 0" do
+  #     BusFuel.all.each do |fuel|
+  #       value = fuel.send(attribute)
+  #       unless value > 0
+  #         raise "Invalid #{attribute.humanize.downcase} for BusFuel #{fuel.name}: #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Energy content units should be megajoules per litre if present" do
+  #   BusFuel.all.each do |fuel|
+  #     units = fuel.send(:energy_content_units)
+  #     if units.present?
+  #       unless units == "megajoules_per_litre"
+  #         raise "Invalid energy content units for BusFuel #{fuel.name}: #{units} (should be megajoules_per_litre)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # [["co2_emission_factor_units", "kilograms_per_litre"],
+  #  ["co2_biogenic_emission_factor_units", "kilograms_per_litre"],
+  #  ["ch4_emission_factor_units", "kilograms_co2e_per_kilometre"],
+  #  ["n2o_emission_factor_units", "kilograms_co2e_per_kilometre"]].each do |pair|
+  #   attribute = pair[0]
+  #   proper_units = pair[1]
+  #   verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
+  #     BusFuel.all.each do |fuel|
+  #       units = fuel.send(:"#{attribute}")
+  #       unless units == proper_units
+  #         raise "Invalid #{attribute.humanize.downcase} for BusFuel #{fuel.name}: #{units} (should be #{proper_units})"
+  #       end
+  #     end
+  #   end
+  # end
+end

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

@@ -109,81 +109,5 @@ BusFuel.class_eval do
         bus_fuel.save!
       end
     end
-    
-    # FIXME TODO verify fuel_name appears in fuels
-    verify "Fuel name should never be missing" do
-      BusFuel.all.each do |fuel|
-        value = fuel.send(:fuel_name)
-        unless value.present?
-          puts "Missing fuel name for BusFuel #{fuel.name}"
-          fail
-        end
-      end
-    end
-    
-    verify "Energy content should be greater than zero if present" do
-      BusFuel.all.each do |fuel|
-        value = fuel.send(:energy_content)
-        if value.present?
-          unless value > 0
-            puts "Invalid energy content for BusFuel #{fuel.name}: #{value} (should be > 0)"
-            fail
-          end
-        end
-      end
-    end
-    
-    %w{ co2_emission_factor co2_biogenic_emission_factor }.each do |attribute|
-      verify "#{attribute.humanize} should be 0 or more" do
-        BusFuel.all.each do |fuel|
-          value = fuel.send(attribute)
-          unless value >= 0
-            puts "Invalid #{attribute.humanize.downcase} for BusFuel #{fuel.name}: #{value} (should be 0 or more)"
-            fail
-          end
-        end
-      end
-    end
-    
-    %w{ ch4_emission_factor n2o_emission_factor }.each do |attribute|
-      verify "#{attribute.humanize} should be > 0" do
-        BusFuel.all.each do |fuel|
-          value = fuel.send(attribute)
-          unless value > 0
-            puts "Invalid #{attribute.humanize.downcase} for BusFuel #{fuel.name}: #{value} (should be > 0)"
-            fail
-          end
-        end
-      end
-    end
-    
-    verify "Energy content units should be megajoules per litre if present" do
-      BusFuel.all.each do |fuel|
-        units = fuel.send(:energy_content_units)
-        if units.present?
-          unless units == "megajoules_per_litre"
-            puts "Invalid energy content units for BusFuel #{fuel.name}: #{units} (should be megajoules_per_litre)"
-            fail
-          end
-        end
-      end
-    end
-    
-    [["co2_emission_factor_units", "kilograms_per_litre"],
-     ["co2_biogenic_emission_factor_units", "kilograms_per_litre"],
-     ["ch4_emission_factor_units", "kilograms_co2e_per_kilometre"],
-     ["n2o_emission_factor_units", "kilograms_co2e_per_kilometre"]].each do |pair|
-      attribute = pair[0]
-      proper_units = pair[1]
-      verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
-        BusFuel.all.each do |fuel|
-          units = fuel.send(:"#{attribute}")
-          unless units == proper_units
-            puts "Invalid #{attribute.humanize.downcase} for BusFuel #{fuel.name}: #{units} (should be #{proper_units})"
-            fail
-          end
-        end
-      end
-    end
   end
 end

data/lib/earth/bus/bus_fuel_control.rb

@@ -1,12 +1,10 @@
 class BusFuelControl < ActiveRecord::Base
   set_primary_key :name
-  force_schema do
-    string 'name'
-    string 'bus_fuel_name'
-    string 'control'
-    float  'ch4_emission_factor'
-    string 'ch4_emission_factor_units'
-    float  'n2o_emission_factor'
-    string 'n2o_emission_factor_units'
-  end
-end
+  col :name
+  col :bus_fuel_name
+  col :control
+  col :ch4_emission_factor, :type => :float
+  col :ch4_emission_factor_units
+  col :n2o_emission_factor, :type => :float
+  col :n2o_emission_factor_units
+end

data/lib/earth/bus/bus_fuel_year_control.rb

@@ -3,12 +3,10 @@ class BusFuelYearControl < ActiveRecord::Base
   
   belongs_to :fuel_control, :class_name => 'BusFuelControl', :foreign_key => 'bus_fuel_control_name'
 
-  force_schema do
-    string  'name'
-    string  'bus_fuel_name'
-    integer 'year'
-    string  'control'
-    string  'bus_fuel_control_name'
-    float   'total_travel_percent'
-  end
-end
+  col :name
+  col :bus_fuel_name
+  col :year, :type => :integer
+  col :control
+  col :bus_fuel_control_name
+  col :total_travel_percent, :type => :float
+end

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

@@ -14,11 +14,7 @@ BusFuelYearControl.class_eval do
     end
     
     process "Derive bus fuel control name for association with BusFuelControl" do
-      if ActiveRecord::Base.connection.adapter_name.downcase == 'sqlite'
-        update_all "bus_fuel_control_name = bus_fuel_name || ' ' || control"
-      else
-        update_all "bus_fuel_control_name = CONCAT(bus_fuel_name, ' ', control)"
-      end
+      update_all "bus_fuel_control_name = bus_fuel_name || ' ' || control"
     end
     
     # FIXME TODO verify that for any year the percentages sum to 1

data/lib/earth/computation/computation_carrier.rb

@@ -4,8 +4,14 @@ class ComputationCarrier < ActiveRecord::Base
   falls_back_on :name => 'fallback',
                 :power_usage_effectiveness => lambda { ComputationCarrier.maximum('power_usage_effectiveness') }
   
-  force_schema do
-    string 'name'
-    float  'power_usage_effectiveness'
-  end
-end
+  col :name
+  col :power_usage_effectiveness, :type => :float
+  
+  # verify "Power usage effectiveness should be one or more" do
+  #   ComputationCarrier.all.each do |carrier|
+  #     unless carrier.power_usage_effectiveness >= 1.0
+  #       raise "Invalid power usage effectiveness for ComputationCarrier #{carrier.name}: #{carrier.power_usage_effectiveness} (should be >= 1.0)"
+  #     end
+  #   end
+  # end
+end

data/lib/earth/computation/computation_carrier/data_miner.rb

@@ -6,12 +6,5 @@ ComputationCarrier.class_eval do
       store 'power_usage_effectiveness'
     end
     
-    verify "Power usage effectiveness should be one or more" do
-      ComputationCarrier.all.each do |carrier|
-        unless carrier.power_usage_effectiveness >= 1.0
-          raise "Invalid power usage effectiveness for ComputationCarrier #{carrier.name}: #{carrier.power_usage_effectiveness} (should be >= 1.0)"
-        end
-      end
-    end
   end
 end

data/lib/earth/computation/computation_carrier_instance_class.rb

@@ -7,11 +7,28 @@ class ComputationCarrierInstanceClass < ActiveRecord::Base
                 :electricity_intensity => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity },
                 :electricity_intensity_units => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity_units }
   
-  force_schema do
-    string 'name'
-    string 'computation_carrier_name'
-    string 'instance_class'
-    float  'electricity_intensity'
-    string 'electricity_intensity_units'
-  end
-end
+  col :name
+  col :computation_carrier_name
+  col :instance_class
+  col :electricity_intensity, :type => :float
+  col :electricity_intensity_units
+  
+  # FIXME TODO verify that computation carrier name appears in computation_carriers
+  
+  # verify "Electricity intensity should be more than zero" do
+  #   ComputationCarrierInstanceClass.all.each do |instance_class|
+  #     unless instance_class.electricity_intensity > 0
+  #       raise "Invalid electricity intensity for ComputationCarrierInstanceClass #{instance_class.name}: #{instance_class.electricity_intensity} (should be > 0)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Electricity intensity units should be kilowatts" do
+  #   ComputationCarrierInstanceClass.all.each do |instance_class|
+  #     unless instance_class.electricity_intensity_units == 'kilowatts'
+  #       raise "Invalid electricity intensity units for ComputationCarrierInstanceClass #{instance_class.name}: #{instance_class.electricity_intensity_units} (should be kilowatts)"
+  #     end
+  #   end
+  # end
+  
+end

data/lib/earth/computation/computation_carrier_instance_class/data_miner.rb

@@ -7,23 +7,5 @@ ComputationCarrierInstanceClass.class_eval do
       store 'instance_class'
       store 'electricity_intensity', :units_field_name => 'electricity_intensity_units'
     end
-    
-    # FIXME TODO verify that computation carrier name appears in computation_carriers
-    
-    verify "Electricity intensity should be more than zero" do
-      ComputationCarrierInstanceClass.all.each do |instance_class|
-        unless instance_class.electricity_intensity > 0
-          raise "Invalid electricity intensity for ComputationCarrierInstanceClass #{instance_class.name}: #{instance_class.electricity_intensity} (should be > 0)"
-        end
-      end
-    end
-    
-    verify "Electricity intensity units should be kilowatts" do
-      ComputationCarrierInstanceClass.all.each do |instance_class|
-        unless instance_class.electricity_intensity_units == 'kilowatts'
-          raise "Invalid electricity intensity units for ComputationCarrierInstanceClass #{instance_class.name}: #{instance_class.electricity_intensity_units} (should be kilowatts)"
-        end
-      end
-    end
   end
 end

data/lib/earth/computation/computation_carrier_region.rb

@@ -3,10 +3,8 @@ class ComputationCarrierRegion < ActiveRecord::Base
   
   belongs_to :egrid_subregion, :foreign_key => 'egrid_subregion_abbreviation'
 
-  force_schema do
-    string 'name'
-    string 'computation_carrier_name'
-    string 'region'
-    string 'egrid_subregion_abbreviation'
-  end
-end
+  col :name
+  col :computation_carrier_name
+  col :region
+  col :egrid_subregion_abbreviation
+end

data/lib/earth/diet/diet_class.rb

@@ -7,19 +7,17 @@ class DietClass < ActiveRecord::Base
     end
   end
   
-  force_schema do
-    string 'name'
-    float  'intensity'
-    string 'intensity_units'
-    float  'red_meat_share'
-    float  'poultry_share'
-    float  'fish_share'
-    float  'eggs_share'
-    float  'nuts_share'
-    float  'dairy_share'
-    float  'cereals_and_grains_share'
-    float  'fruit_share'
-    float  'vegetables_share'
-    float  'oils_and_sugars_share'
-  end
-end
+  col :name
+  col :intensity, :type => :float
+  col :intensity_units
+  col :red_meat_share, :type => :float
+  col :poultry_share, :type => :float
+  col :fish_share, :type => :float
+  col :eggs_share, :type => :float
+  col :nuts_share, :type => :float
+  col :dairy_share, :type => :float
+  col :cereals_and_grains_share, :type => :float
+  col :fruit_share, :type => :float
+  col :vegetables_share, :type => :float
+  col :oils_and_sugars_share, :type => :float
+end