Merge pull request #57 from shdoron1/update-2021

Author: floswald

R/build.panel.r

@@ -166,7 +166,7 @@ build.panel <- function(datadir=NULL,fam.vars,ind.vars=NULL,heads.only=FALSE,cur
 	wlth.down <- TRUE  # initiate to something
 
 	# all psid family files
-	family    <- data.frame(year = c( 1968:1997 , seq( 1999 , 2019 , 2 ) ),file = c( 1056 , 1058:1082 , 1047:1051 , 1040 , 1052 , 1132 , 1139 , 1152  , 1156, 1164 , 1183 , 1187 , 1194))
+	family    <- data.frame(year = c( 1968:1997 , seq( 1999 , 2021 , 2 ) ),file = c( 1056 , 1058:1082 , 1047:1051 , 1040 , 1052 , 1132 , 1139 , 1152  , 1156, 1164 , 1183 , 1187 , 1194, 1205))
 	# family    <- data.frame(year = c( 1968:1997 , seq( 1999 , 2013 , 2 ) ),file = c( 1056 , 1058:1082 , 1047:1051 , 1040 , 1052 , 1132 , 1139 , 1152  , 1156, 1164  ))
 
 	#subset to the years we want
@@ -200,7 +200,7 @@ build.panel <- function(datadir=NULL,fam.vars,ind.vars=NULL,heads.only=FALSE,cur
 
 	ind.down <- FALSE
 	# check if datadir contains individual index already
-	if (("IND2019ER.rda" %in% lf) | ("IND2019ER.RData" %in% lf)) {
+	if (("IND2021ER.rda" %in% lf) | ("IND2021ER.RData" %in% lf)) {
 		#download latest individual index
 		ind.down = TRUE
 	}
@@ -212,7 +212,7 @@ build.panel <- function(datadir=NULL,fam.vars,ind.vars=NULL,heads.only=FALSE,cur
 			flog.info("will download family files: %s",paste(family[!families.down,"year"],collapse=", "))
 		} 
 		if (!ind.down) {
-			flog.info("will download latest individual index: IND2019ER")
+			flog.info("will download latest individual index: IND2021ER")
 		} 
 		if (!wlth.down) {
 			flog.info("will download missing wealth files.")
@@ -271,9 +271,9 @@ build.panel <- function(datadir=NULL,fam.vars,ind.vars=NULL,heads.only=FALSE,cur
 			}
 
 			# check if datadir contains individual index already
-			if (!("IND2019ER.rda" %in% lf)) {
+			if (!("IND2021ER.rda" %in% lf)) {
 				#download latest individual index
-				get.psid( 1053 ,name= paste0(datadir, "IND2019ER") , params , curl )
+				get.psid( 1053 ,name= paste0(datadir, "IND2021ER") , params , curl )
 			}
 
 			flog.info('finished downloading files to %s', datadir)

R/makeids.r

@@ -5,7 +5,7 @@
 #' @details this function hardcodes the PSID variable names of "interview number" from both family and individual file for each wave, as well as "sequence number", "relation to head" and numeric value x of that variable such that "relation to head" == x means the individual is the head. Varies over time.
 makeids <- function(){
 
-	id.list <- data.table(year=c(1968:1997,seq(1999,2019,by=2)))
+	id.list <- data.table(year=c(1968:1997,seq(1999,2021,by=2)))
 	id.list$ind.interview <- c("ER30001","ER30020","ER30043","ER30067",
 									"ER30091","ER30117","ER30138","ER30160", 
 									"ER30188","ER30217","ER30246","ER30283",
@@ -15,15 +15,16 @@ makeids <- function(){
 									"ER30733","ER30806","ER33101","ER33201",
 									"ER33301","ER33401","ER33501","ER33601",
 									"ER33701","ER33801","ER33901","ER34001",
-									"ER34101","ER34201","ER34301","ER34501","ER34701")
+									"ER34101","ER34201","ER34301","ER34501",
+									"ER34701", "ER34901")
 
 	id.list$ind.seq <- c(NA,"ER30021","ER30044","ER30068","ER30092","ER30118","ER30139",
 						 "ER30161","ER30189","ER30218","ER30247","ER30284","ER30314", 
 						 "ER30344","ER30374","ER30400","ER30430","ER30464","ER30499", 
 						 "ER30536","ER30571","ER30607","ER30643","ER30690","ER30734", 
 						 "ER30807","ER33102","ER33202","ER33302","ER33402","ER33502", 
 						 "ER33602","ER33702","ER33802","ER33902","ER34002","ER34102",
-						 "ER34202","ER34302","ER34502","ER34702")
+						 "ER34202","ER34302","ER34502","ER34702", "ER34902")
 
 	# name of variable "relationship to head"
 	id.list$ind.head <- c("ER30003",
@@ -66,10 +67,11 @@ makeids <- function(){
 						  "ER34203",
 						  "ER34303",
 						  "ER34503",
-			     			  "ER34703")
+			     		  "ER34703",
+						  "ER34903")
 
 	# numeric code for "i am the head"
-	id.list$ind.head.num <- c(rep(1,15),rep(10,26))
+	id.list$ind.head.num <- c(rep(1,15),rep(10,27))
 
 	id.list$fam.interview <- c("V3"      , "V442"    , "V1102"   , "V1802"   , "V2402"    , "V3002" ,
 							   "V3402"   , "V3802"   , "V4302"   , "V5202"   , "V5702"    ,
@@ -78,7 +80,8 @@ makeids <- function(){
 							   "V16302"  , "V17702"  , "V19002"  , "V20302"  , "V21602"   ,
 							   "ER2002"  , "ER5002"  , "ER7002"  , "ER10002" , "ER13002"  ,
 							   "ER17002" , "ER21002" , "ER25002" , "ER36002" , "ER42002"  , 
-							   "ER47302" , "ER53002" , "ER60002" , "ER66002" , "ER72002")
+							   "ER47302" , "ER53002" , "ER60002" , "ER66002" , "ER72002"  ,
+							   "ER78002")
 	id.list$stratum <- rep("ER31996",nrow(id.list))
 	setkey(id.list,year)
 	return(id.list)