Permalink
Browse files

final changes

  • Loading branch information...
1 parent 9df6bb9 commit d42fcc7f44c98bbf4742732263fce8c3a83345ca @bentut committed Dec 19, 2012
View
@@ -94,7 +94,13 @@ def validate_arithmetic(other_series)
def rebase(date_string)
new_series_data = {}
- new_base = self.at(date_string).to_f
+
+ if frequency != "year" or frequency != :year
+ annual_series = (self.name.split(".")[0]+".A").ts
+ new_base = annual_series.at(date_string).to_f
+ else
+ new_base = self.at(date_string).to_f
+ end
data.sort.each do |date_string, value|
new_series_data[date_string] = value / new_base * 100
end
View
@@ -102,8 +102,8 @@ task :const_upd_m => :environment do
poil = {
"POILEIASTNS@US.M" => %Q|Series.load_from_download("STEO@eia.gov", { :file_type => "xls", :start_date => "2008-01-01", :sheet => "2tab", :row => "6", :col =>"increment:3:1", :frequency => "M"})/1|,
"POILEIAB@US.A" => %Q|Series.load_from_download("LTEO_B@eia.gov", { :file_type => "xls", :start_date => "2009-01-01", :sheet => "sheet_num:1", :row => "66", :col =>"increment:2:1", :frequency => "A"})/1|,
- "POILEIAH@US.A" => %Q|Series.load_from_download("LTEO_H@eia.gov", { :file_type => "xls", :start_date => "2009-01-01", :sheet => "EIA_LTEO_H", :row => "56", :col =>"increment:2:1", :frequency => "A"})/1|,
- "POILEIAL@US.A" => %Q|Series.load_from_download("LTEO_L@eia.gov", { :file_type => "xls", :start_date => "2009-01-01", :sheet => "EIA_LTEO_L", :row => "56", :col =>"increment:2:1", :frequency => "A"})/1|,
+# "POILEIAH@US.A" => %Q|Series.load_from_download("LTEO_H@eia.gov", { :file_type => "xls", :start_date => "2009-01-01", :sheet => "EIA_LTEO_H", :row => "56", :col =>"increment:2:1", :frequency => "A"})/1|,
+# "POILEIAL@US.A" => %Q|Series.load_from_download("LTEO_L@eia.gov", { :file_type => "xls", :start_date => "2009-01-01", :sheet => "EIA_LTEO_L", :row => "56", :col =>"increment:2:1", :frequency => "A"})/1|,
}
#move these and remove other
View
@@ -142,7 +142,7 @@ tour_vexp = {
%Q|"VX@HI.A".tsn.load_from "/Volumes/UHEROwork/data/tour/update/vexp_upd.xls" |],
"VXBU@HI.A"=>%Q|"VXBU@HI.A".tsn.load_from "/Volumes/UHEROwork/data/tour/update/vexp_upd.xls"|,
-"VXPR@HI.A"=>%Q|"VXPR@HI.A".tsn.load_from "/Volumes/UHEROwork/data/tour/update/vexp_upd.xls"|,
+#{}"VXPR@HI.A"=>%Q|"VXPR@HI.A".tsn.load_from "/Volumes/UHEROwork/data/tour/update/vexp_upd.xls"|,
#add in VX things here
}
View
@@ -15,6 +15,9 @@ task :aremos_exports => :environment do
DataList.write "famsize_q", "/Volumes/UHEROwork/data/udaman/famsize_q.xls" #3.15
DataList.write "famsize_a", "/Volumes/UHEROwork/data/udaman/famsize_a.xls" #0.63
+ #MISC
+ DataList.write "const", "/Volumes/UHEROwork/data/udaman/const.xls" #2.23
+
CSV.open("public/rake_time.csv", "a") {|csv| csv << ["aremos_exports", "%.2f" % (Time.now - t) , t.to_s, Time.now.to_s] }
end
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit d42fcc7

Please sign in to comment.