Skip to content

Commit e3ae736

Browse files
committed
merge old vs new check into master shipping
1 parent 2299edb commit e3ae736

File tree

3 files changed

+57
-52
lines changed

3 files changed

+57
-52
lines changed

Portfolios/Code/master.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
rm(list = ls())
2828
# ENTER PROJECT PATH HERE (i.e. this should be the path to your local repo folder & location of SignalDoc.csv)
2929
# if using Rstudio, pathProject = paste0(getwd(), '/') should work
30-
pathProject = paste0(getwd(), '/')
30+
pathProject = 'd:/Dropbox/Open-AP-ac/CrossSection/'
3131

3232
quickrun = F # use T if you want to run quickly for testing
3333
quickrunlist = c('Accruals','AM') # list of signals to use for quickrun
Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,33 @@
55

66
# Prints simple tables to terminal
77

8-
# ENVIRONMENT ====
9-
rm(list = ls())
10-
library(tidyverse)
11-
library(data.table)
12-
library(googledrive)
13-
library(gridExtra)
14-
15-
pathProject = 'D:/Dropbox/AC-OPENAP/CrossSection/'
8+
# # ENVIRONMENT ====
9+
# rm(list = ls())
10+
# library(tidyverse)
11+
# library(data.table)
12+
# library(googledrive)
13+
# library(gridExtra)
14+
15+
# pathProject = 'C:/Dropbox/OPEN-AP-ac/CrossSection/'
1616
setwd(paste0(pathProject,'Shipping/Code/'))
1717

1818
dir.create('../Data/temp')
1919

20-
# root of August 2023 release
21-
OLD_PATH_RELEASES = 'https://drive.google.com/drive/folders/1EP6oEabyZRamveGNyzYU0u6qJ-N43Qfq'
20+
# # root of August 2023 release
21+
# OLD_PATH_RELEASES = 'https://drive.google.com/drive/folders/1EP6oEabyZRamveGNyzYU0u6qJ-N43Qfq'
2222

23-
# root of August 2024
24-
NEW_PATH_RELEASES = 'https://drive.google.com/drive/folders/1-PqsR-tOjv3-U9DRHw85X-VznYlu-Sfc'
25-
26-
# use this for original papers
27-
SUBDIR = 'Full Sets OP'; FILENAME = 'PredictorPortsFull.csv'
28-
29-
# use this for VW or whatever else
30-
# SUBDIR = 'Full Sets Alt'; FILENAME = 'PredictorAltPorts_QuintilesVW.zip'
31-
# SUBDIR = 'Full Sets Alt'; FILENAME = 'PredictorAltPorts_LiqScreen_VWforce.zip'
23+
# root of October 2024
24+
# NEW_PATH_RELEASES = 'https://drive.google.com/drive/folders/1SSoHGbwgyhRwUCzLE0YWvUlS0DjLCd4k'
3225

3326
#=====================================================================#
34-
# Download files ====
27+
# Load data ====
3528
#=====================================================================#
3629

3730
# download old data
31+
FILENAME = 'PredictorPortsFull.csv'
3832
OLD_PATH_RELEASES %>% drive_ls() %>%
3933
filter(name == "Portfolios") %>% drive_ls() %>%
40-
filter(name == SUBDIR) %>% drive_ls() %>%
34+
filter(name == 'Full Sets OP') %>% drive_ls() %>%
4135
filter(name == FILENAME) %>%
4236
drive_download(path = paste0("../Data/temp/",FILENAME), overwrite = TRUE)
4337

@@ -51,30 +45,32 @@ if (grepl('.csv',FILENAME)){
5145
)
5246
}
5347

54-
# download new data
55-
id <- NEW_PATH_RELEASES %>% drive_ls() %>%
56-
filter(name == "Portfolios") %>% drive_ls() %>%
57-
filter(name == SUBDIR) %>% drive_ls() %>%
58-
filter(name == FILENAME) %>%
59-
drive_download(path = paste0("../Data/temp/",FILENAME), overwrite = TRUE)
60-
61-
# import
62-
if (grepl('.csv',FILENAME)){
63-
new_PredictorPortsFull <- fread(paste0("../Data/temp/",FILENAME))
64-
} else{
65-
unzip(zipfile = paste0('../Data/temp',FILENAME), exdir = 'temp')
66-
new_PredictorPortsFull <- fread(
67-
paste0("../Data/temp/",substr(FILENAME, 1,(nchar(FILENAME)-4)),'.csv')
68-
)
69-
}
70-
71-
# download signal doc
72-
NEW_PATH_RELEASES %>% drive_ls() %>%
73-
filter(name == "SignalDoc.csv") %>%
74-
drive_download(path = "../Data/temp/SignalDoc.csv", overwrite = TRUE)
75-
76-
SignalDoc <- fread("../Data/temp/SignalDoc.csv")
77-
48+
# # download new data
49+
# id <- NEW_PATH_RELEASES %>% drive_ls() %>%
50+
# filter(name == "Portfolios") %>% drive_ls() %>%
51+
# filter(name == 'Full Sets OP') %>% drive_ls() %>%
52+
# filter(name == FILENAME) %>%
53+
# drive_download(path = paste0("../Data/temp/",FILENAME), overwrite = TRUE)
54+
55+
# # import
56+
# if (grepl('.csv',FILENAME)){
57+
# new_PredictorPortsFull <- fread(paste0("../Data/temp/",FILENAME))
58+
# } else{
59+
# unzip(zipfile = paste0('../Data/temp',FILENAME), exdir = 'temp')
60+
# new_PredictorPortsFull <- fread(
61+
# paste0("../Data/temp/",substr(FILENAME, 1,(nchar(FILENAME)-4)),'.csv')
62+
# )
63+
# }
64+
65+
# load new data
66+
new_PredictorPortsFull <- fread(
67+
paste0(pathStorage,'Portfolios/Full Sets OP/',FILENAME)
68+
)
69+
70+
# load signal doc
71+
SignalDoc <- fread(
72+
paste0(pathStorage,'SignalDoc.csv')
73+
)
7874

7975

8076
#=====================================================================#
@@ -92,6 +88,9 @@ PredictorPortsFull <- inner_join(
9288
rename(new_ret = ret) %>%
9389
mutate(port = if_else(nchar(port)==2, port, paste0('0',port)))
9490
, by = c("signalname", "port", "date")
91+
) %>%
92+
mutate(
93+
date = as.Date(date)
9594
)
9695

9796
# Keep only relevant variables
@@ -151,9 +150,10 @@ write.csv(check, "../Data/temp/PredictorPortsCheck.csv", row.names = FALSE)
151150

152151

153152
#=====================================================================#
154-
# Summary stats output to console ====
153+
# Summary stats output to pathStorage/storage_checks_part2.txt ====
155154
#=====================================================================#
156155

156+
sink(paste0(pathStorage,'storage_checks_part2.txt'))
157157
check_ls = check %>%
158158
filter(port == 'LS', !is.na(samptype), !is.na(slope))
159159

Shipping/Code/master_shipping.r

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
library(tidyverse)
88
library(readxl)
99
library(data.table) # for speed
10+
library(googledrive)
11+
12+
pathProject = 'C:/Dropbox/Open-AP-ac/CrossSection/' # local code base directory
13+
pathStorage = 'C:/Gdrive/My Drive/Work/Public/Open AP/Data Release 2024.10/' # a place to
14+
OLD_PATH_RELEASES = 'https://drive.google.com/drive/folders/1EP6oEabyZRamveGNyzYU0u6qJ-N43Qfq' # location of previous release for comparison (here August 2023)
1015

11-
pathProject = 'D:/Dropbox/AC-OPENAP/CrossSection/' # local code base directory
12-
pathStorage = 'D:/Gdrive/Work/Public/Open AP/Data Release 2024.08/' # a place to store copies for uploading
1316

1417
pathShipping = paste0(pathProject,'Shipping/') # where Code/master_shipping.r is
1518
pathPredictors = paste0(pathProject, 'Signals/Data/Predictors/')
@@ -25,6 +28,8 @@ dir.create('../Data/Portfolios/')
2528
dir.create('../Data/Portfolios/Individual')
2629
dir.create('../Data/temp')
2730

31+
# trigger googledrive auth
32+
drive_auth()
2833

2934
# function for reading in documentation, copied for Portfolios/Code/
3035
readdocumentation = function(){
@@ -84,7 +89,7 @@ file.copy(
8489
, to = paste0(pathStorage)
8590
)
8691

87-
source('1_pack_signals.r')
88-
source('2_pack_portfolios_and_results.r')
89-
source('3_check_storage.r')
92+
# source('1_pack_signals.r')
93+
# source('2_pack_portfolios_and_results.r')
94+
# source('3_check_storage.r')
9095

0 commit comments

Comments
 (0)