Permalink
Browse files

some definitional fixes

  • Loading branch information...
1 parent 2e984bd commit 65b02b5231a837ed4099b4aeefe42e1142107cbf @bentut committed Nov 30, 2012
View
@@ -1786,7 +1786,7 @@ task :bea_identities => :environment do
#this is wrong
"YPC@NBI.A".ts_eval = %Q|"YPC@HI.A".ts - "YPC@HON.A".ts|
- #A isn't really right either right. Q is wrong
+ #A isn't really right either right. Q is wrong. Now A works and other thing is wrong
"SH_YPC@HON.A".ts_eval = %Q|"YPC@HON.A".ts / "YPC@HI.A".ts|
#{}"SH_YPC@HON.Q".ts_eval = %Q|"YPC@HON.Q".ts / "YPC@HI.Q".ts|
@@ -1833,6 +1833,9 @@ task :bea_identities => :environment do
end
end
+ #YPC calculated above needs to get overwritte. Should maybe remove
+ "YPC@NBI.A".ts_eval= %Q|"Y@NBI.A".ts / "NR@NBI.A".ts|
+
#YPC base series needs corrections
["YPC", "YDIV", "YNETR", "YOTLABPEN", "YOTLABSS", "YOTLAB", "YPCBEA", "YPC", "YPROPFA", "YPROPNF", "YPROP", "YRESADJ", "YSOCSECEM", "YSOCSECPR", "YSOCSEC", "YTRNSF", "YWAGE", "Y"].each do |pre|
("#{pre}@NBI.A".ts_eval= %Q|"#{pre}@HI.A".ts - "#{pre}@HON.A".ts|) rescue puts "NBI ERROR FORM #{pre}"
@@ -1914,7 +1917,9 @@ task :bea_identities => :environment do
"HAI@HON.Q".ts_eval= %Q|("FAMSIZE2@HON.Q".ts * "SH_YPC@HON.Q".ts * "YPC@HI.Q".ts) / "HYQUAL@HON.Q".ts * 100 * 1000|
"HAICON@HON.Q".ts_eval= %Q|("FAMSIZE2@HON.Q".ts * "SH_YPC@HON.Q".ts * "YPC@HI.Q".ts) / "HYQUALCON@HON.Q".ts * 100 * 1000|
"FAMSIZE@HON.A".ts_eval= %Q|"FAMSIZE@HON.Q".ts.aggregate(:year, :average)|
- "SH_YPC@HON.A".ts_eval= %Q|"SH_YPC@HON.Q".ts.aggregate(:year, :average)|
+
+ #this (SH_YPC) seems to be flopping back and forth. Commenting this one out for now and deleting from UDAMAN
+ #{}"SH_YPC@HON.A".ts_eval= %Q|"SH_YPC@HON.Q".ts.aggregate(:year, :average)|
"FAMSIZE_TEMP@HI.A".ts_eval= %Q|"YMED@HI.A".ts / "YPC@HI.A".ts|
View
@@ -135,8 +135,9 @@ tour_vexp = {
"VEXPUS@HI.A"=>%Q|"VEXPUS@HI.M".ts.aggregate(:year, :sum)|,
"VEXPJP@HI.A"=>%Q|"VEXPJP@HI.M".ts.aggregate(:year, :sum)|,
-"VXPRUS@HI.A"=>%Q|"VEXPUS@HI.A".ts|,
-"VXPRJP@HI.A"=>%Q|"VEXPJP@HI.A".ts|,
+#VXPR[JP/US]@HI.A gets overwritten by history which is correct in AREMOS anyway
+#{}"VXPRUS@HI.A"=>%Q|"VEXPUS@HI.A".ts|,
+#{}"VXPRJP@HI.A"=>%Q|"VEXPJP@HI.A".ts|,
"VX@HI.A"=>[%Q|"VXPR@HI.A".ts + "VXBU@HI.A".ts|,
%Q|"VX@HI.A".tsn.load_from "/Volumes/UHEROwork/data/tour/update/vexp_upd.xls" |],
@@ -1378,15 +1379,15 @@ task :visitor_identities=>:environment do
["Q", "A"].each do |f|
"PPRM_WITH_CR@HI.#{f}".ts_eval= %Q|("VADC@HI.#{f}".ts - "VADCCRAIR@HI.#{f}".ts * 5 / 7) / ("TRMS@HI.#{f}".ts * "OCUP%@HI.#{f}".ts / 100)|
- "PPRM_WITH_CR@HON.#{f}".ts_eval= %Q|("VADC@HON.#{f}".ts - "VADCCRAIR@HON.#{f}".ts * 5 / 7) / ("TRMS@HON.#{f}".ts * "OCUP%@HON.#{f}".ts / 100)|
- "PPRM_WITH_CR@HAW.#{f}".ts_eval= %Q|("VADC@HAW.#{f}".ts - "VADCCRAIR@HAW.#{f}".ts * 5 / 7) / ("TRMS@HAW.#{f}".ts * "OCUP%@HAW.#{f}".ts / 100)|
- "PPRM_WITH_CR@KAU.#{f}".ts_eval= %Q|("VADC@KAU.#{f}".ts - "VADCCRAIR@KAU.#{f}".ts * 5 / 7) / ("TRMS@KAU.#{f}".ts * "OCUP%@KAU.#{f}".ts / 100)|
- "PPRM_WITH_CR@MAU.#{f}".ts_eval= %Q|("VADC@MAU.#{f}".ts - "VADCCRAIR@MAU.#{f}".ts * 5 / 7) / ("TRMS@MAU.#{f}".ts * "OCUP%@MAU.#{f}".ts / 100)|
+ "PPRM_WITH_CR@HON.#{f}".ts_eval= %Q|("VADC@HON.#{f}".ts - "VADCCRAIR@HON.#{f}".ts * 1 / 7) / ("TRMS@HON.#{f}".ts * "OCUP%@HON.#{f}".ts / 100)|
+ "PPRM_WITH_CR@HAW.#{f}".ts_eval= %Q|("VADC@HAW.#{f}".ts - "VADCCRAIR@HAW.#{f}".ts * 1 / 7) / ("TRMS@HAW.#{f}".ts * "OCUP%@HAW.#{f}".ts / 100)|
+ "PPRM_WITH_CR@KAU.#{f}".ts_eval= %Q|("VADC@KAU.#{f}".ts - "VADCCRAIR@KAU.#{f}".ts * 1 / 7) / ("TRMS@KAU.#{f}".ts * "OCUP%@KAU.#{f}".ts / 100)|
+ "PPRM_WITH_CR@MAU.#{f}".ts_eval= %Q|("VADC@MAU.#{f}".ts - "VADCCRAIR@MAU.#{f}".ts * 2 / 7) / ("TRMS@MAU.#{f}".ts * "OCUP%@MAU.#{f}".ts / 100)|
["HI","HON","HAW", "KAU", "MAU"].each do |cnty|
"PPRM_WITHOUT_CR@#{cnty}.#{f}".ts_eval= %Q|("VADC@#{cnty}.#{f}".ts) / ("TRMS@#{cnty}.#{f}".ts * "OCUP%@#{cnty}.#{f}".ts / 100)|
"PPRM@#{cnty}.#{f}".ts_eval= %Q|"PPRM_WITH_CR@#{cnty}.#{f}".ts|
- "PPRM@#{cnty}.#{f}".ts_eval= %Q|("PPRM_WITHOUT_CR@#{cnty}.#{f}".ts + ("PPRM_WITHOUT_CR@#{cnty}.#{f}".ts - "PPRM_WITH_CR@#{cnty}.#{f}".ts).average).trim("1990-01-01", "2000-12-01")|
+ "PPRM@#{cnty}.#{f}".ts_eval= %Q|("PPRM_WITHOUT_CR@#{cnty}.#{f}".ts - ("PPRM_WITHOUT_CR@#{cnty}.#{f}".ts - "PPRM_WITH_CR@#{cnty}.#{f}".ts).average).trim("1990-01-01", "2000-12-01")|
end
end
# qtemp =
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,21 +1,80 @@
series_name,series_id,new_datapoints_added
-INF@JP.M,7817,491
-CPI@JP.M,7822,504
-PCDMNS@HAW.D,11390,4
+YPCDPI_R@US.Q,7223,2
+GDP_INR@US.Q,7224,1
+GDP_IFX@US.Q,7225,1
+GDP_CD@US.Q,7226,1
+YPCCE@US.Q,7227,1
+YDPI_R@US.Q,7229,2
+GDP_CN@US.Q,7230,1
+YPCCE_R@US.Q,7231,1
+GDP_IFX_R@US.Q,7232,1
+YPCDPI@US.Q,7233,2
+GDP_IIV@US.Q,7234,1
+GDP_NX_R@US.Q,7235,1
+GDP_INR_R@US.Q,7236,1
+GDP_EX_R@US.Q,7237,1
+GDP_IRS@US.Q,7238,1
+GDP_CD_R@US.Q,7239,1
+GDP@US.Q,7240,1
+GNP@US.Q,7241,1
+GDP_NX@US.Q,7242,1
+GDP_IM_R@US.Q,7243,1
+GDP_I@US.Q,7244,1
+GDP_EX@US.Q,7245,1
+GNP_R@US.Q,7246,1
+GNPPC_R@US.Q,7247,1
+GDPPC@US.Q,7248,1
+YCE@US.Q,7249,1
+GDP_I_R@US.Q,7250,1
+GDP_IM@US.Q,7251,1
+GDP_IIV_R@US.Q,7252,1
+GDP_G_R@US.Q,7253,1
+GDP_G@US.Q,7254,1
+YDPI@US.Q,7255,2
+YPC@US.Q,7256,2
+N@US.Q,7257,1
+GDP_C_R@US.Q,7258,1
+GDP_C@US.Q,7259,1
+GDPDEF@US.Q,7756,1
+INFGDPDEF@US.Q,7761,1
+GDP_R@US.Q,7762,1
+GDP_IRS_R@US.Q,7763,1
+YCE_R@US.Q,7764,1
+GDPPC_R@US.Q,7765,1
+Y@US.Q,7766,2
+GNPPC@US.Q,7845,1
+GDP_CS_R@US.Q,7846,1
+GDP_CS@US.Q,7847,1
+GDP_CN_R@US.Q,9295,1
+PCDMNS@HAW.D,11390,6
PCDMNS@HI.D,11391,6
-PCDMNS@HON.D,11392,5
-PCDMNS@KAU.D,11393,4
-PCDMNS@MAU.D,11394,6
-PCITJPNS@HI.D,11395,3
-PCITNS@HI.D,11396,3
-PCITOTNS@HI.D,11397,3
+PCDMNS@HON.D,11392,4
+PCDMNS@KAU.D,11393,5
+PCDMNS@MAU.D,11394,2
+PCITJPNS@HI.D,11395,2
+PCITNS@HI.D,11396,2
+PCITOTNS@HI.D,11397,2
PCNS@HI.D,11398,6
-CPI@JP.Q,18018,123
-INF@JP.Q,18024,167
-YXR_R@JP.M,24039,357
+YCAG_R@HON.A,21103,3
+YC_CTMI_R@HON.A,21782,3
+YC_ELSE_R@HON.A,21789,3
+YC_ELSE_R@MAU.A,21790,3
+YC_FIR_R@HON.A,21796,3
+YC_FIR_R@MAU.A,21797,3
+YC_FIR_R@HAW.A,21798,2
+YC_FIR_R@KAU.A,21799,2
+YC_OT_R@HON.A,21817,3
+YC_OT_R@MAU.A,21818,3
+YC_SV_R@HON.A,21838,3
+YC_TRADE_R@HON.A,21845,3
+YC_TRADE_R@MAU.A,21846,3
+YC_TTU_R@HON.A,21852,3
+YC_TTU_R@MAU.A,21853,3
+YC_TU_R@HON.A,21859,3
+YC_TU_R@MAU.A,21860,3
FAMSIZE_TEMP@HI.A,25980,7
-FAMSIZE@HI.Q,25981,70
-HAI@HI.Q,25985,46
-HAICON@HI.Q,25986,46
-PAFSGF@HI.Q,25987,70
-FAMSIZE@HI.A,25988,18
+FAMSIZE@HI.Q,25981,81
+HAI@HI.Q,25985,57
+HAICON@HI.Q,25986,57
+PAFSGF@HI.Q,25987,81
+FAMSIZE@HI.A,25988,21
Oops, something went wrong.

0 comments on commit 65b02b5

Please sign in to comment.