diff options
| -rw-r--r-- | R/build_portfolios.R | 2 | ||||
| -rw-r--r-- | R/build_scenarios.R | 2 | ||||
| -rw-r--r-- | python/monitor.py | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/R/build_portfolios.R b/R/build_portfolios.R index 01b689d7..8ae071d2 100644 --- a/R/build_portfolios.R +++ b/R/build_portfolios.R @@ -104,7 +104,7 @@ for(deal.name in dealnames){ }
save(deal.portfolio, A, S, deal.weights, deal.dates, deal.spread5y,
deal.spreadatmaturity, deal.data, file=file.path(save.dir, paste0(deal.name, ".RData")))
- cat(deal.name, "... done\n", file = stderr())
+ cat(deal.name, "... done\n")
dealupdatedate <- currdealnames$updatedate[currdealnames$dealname %in% deal.name]
if(length(dealupdatedate) && dealupdatedate == workdate){
sqlstring <- sprintf(
diff --git a/R/build_scenarios.R b/R/build_scenarios.R index 41670c80..e089b38f 100644 --- a/R/build_scenarios.R +++ b/R/build_scenarios.R @@ -17,7 +17,7 @@ if(length(args) >=2){ reinvflags <- rep(TRUE, length(dealnames))
}else{
data <- read.table(file.path(root.dir, "scripts", "scenarios.txt"))
- dealnames <- data$V1
+ dealnames <- as.character(data$V1)
reinvflags <- data$V2
unlink(file.path(root.dir, "scripts", "scenarios.txt"))
}
diff --git a/python/monitor.py b/python/monitor.py index 1929cb35..1f6001af 100644 --- a/python/monitor.py +++ b/python/monitor.py @@ -15,14 +15,14 @@ while True: workdate = str(datetime.date.today()) if os.path.exists(cusipsfile): with open(os.path.join(logpath, "build_portfolios.Rout"), "w") as fh: - p = subprocess.Popen(args1, stderr = fh) + p = subprocess.Popen(args1, stderr = subprocess.STDOUT, stdout = fh) if os.path.exists(scenariosfile): with open(scenariosfile) as fh: - dealnames = [line.split("\t")[0] for line in fh.readline()] + dealnames = [line.split(" ")[0] for line in fh] with open(os.path.join(logpath, "build_scenarios.Rout"), "w") as fh: - p = subprocess.(args2, stderr = fh) + p = subprocess.Popen(args2, stderr = subprocess.STDOUT, stdout = fh) p.wait() - generate_scenarios(workdate, dealnames, common.conn.common.cursor) + generate_scenarios(workdate, dealnames, common.conn, common.cursor) time.sleep(3) common.cursor.close() common.conn.close() |