aboutsummaryrefslogtreecommitdiffstats
path: root/python/tasks.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/tasks.py')
-rw-r--r--python/tasks.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/python/tasks.py b/python/tasks.py
index 62e3a490..6f6e5536 100644
--- a/python/tasks.py
+++ b/python/tasks.py
@@ -2,17 +2,18 @@ import subprocess
from intex.intex_scenarios import generate_scenarios
import os
-Rpath = os.path.join(os.environ['CODE_DIR'], "code", "R")
-logpath = os.path.join(os.environ['CODE_DIR'], "logs")
-
def build_portfolio(workdate, dealname, reinvflag):
- args = ["Rscript", "--vanilla", os.path.join(Rpath, "build_portfolios.R"), \
+ rpath = os.path.join(os.environ['CODE_DIR'], "code", "R")
+ logpath = os.path.join(os.environ['LOG_DIR'])
+ args = ["Rscript", "--vanilla", os.path.join(rpath, "build_portfolios.R"), \
workdate, dealname + "," + reinvflag]
with open(os.path.join(logpath, "build_portfolios.Rout"), "w") as fh:
subprocess.call(args, stderr = subprocess.STDOUT, stdout = fh, env=os.environ)
def build_scenarios(workdate, dealname, reinvflag):
- args = ["Rscript", "--vanilla", os.path.join(Rpath, "build_scenarios.R"), \
+ rpath = os.path.join(os.environ['CODE_DIR'], "code", "R")
+ logpath = os.path.join(os.environ['LOG_DIR'])
+ args = ["Rscript", "--vanilla", os.path.join(rpath, "build_scenarios.R"), \
workdate, dealname + "," + reinvflag]
with open(os.path.join(logpath, "build_scenarios.Rout"), "w") as fh:
subprocess.call(args, stderr = subprocess.STDOUT, stdout = fh, env=os.environ)