diff options
| -rw-r--r-- | R/build_scenarios.R | 3 | ||||
| -rw-r--r-- | python/intex_scenarios.py | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/R/build_scenarios.R b/R/build_scenarios.R index 6bf06a9f..b49f99e7 100644 --- a/R/build_scenarios.R +++ b/R/build_scenarios.R @@ -29,8 +29,7 @@ source(file.path(root.dir, "code", "R", "cds_functions_generic.R")) source(file.path(root.dir, "code", "R", "cds_utils.R"))
get.reinvassets <- function(dealname, workdate){
- r <- vector("list", 2)
- names(r) <- paste0("REINV_TBA", 1:2)
+ r <- list()
sqlstr <- sprintf("select * from et_historicaldealinfo('%s', '%s') where ReinvFlag Is true",
dealname, workdate)
data <- dbGetQuery(dbCon, sqlstr)
diff --git a/python/intex_scenarios.py b/python/intex_scenarios.py index 6dc78f3f..db4faf96 100644 --- a/python/intex_scenarios.py +++ b/python/intex_scenarios.py @@ -60,11 +60,11 @@ def generate_scenarios(workdate, dealnames, conn, cursor): try:
with open(os.path.join(basedir, "csv", dealname + "-reinvprices.csv"), "rb") as fh:
- dr = csv.Dictreader(fh)
+ dr = csv.DictReader(fh)
reinvprices = {f: [] for f in dr.fieldnames}
for line in dr:
for f in dr.fieldnames:
- reinprices[f].append("{0:.3f}".format(float(line[f])))
+ reinvprices[f].append("{0:.3f}".format(float(line[f])))
except IOError:
reinvflag = False
@@ -120,10 +120,11 @@ def generate_scenarios(workdate, dealnames, conn, cursor): reinv_number, scen_number = m.groups()
reinv_name = "REINV_TBA" + reinv_number
if reinv_name in reinvprices:
- line = "STANDARD_VAR[{0}::#PRICE100_TBA{1},{2}]={3}".format(dealname.upper(),
- reinv_number,
- scen_number,
- " ".join(reinvprices[key]))
+ line = \
+ "STANDARD_VAR[{0}::#PRICE100_TBA{1},{2}]={3}".format(dealname.upper(),
+ reinv_number,
+ scen_number,
+ " ".join(reinvprices[reinv_name]))
fhsss.write(line + "\r\n")
continue
m = pattern5.match(line)
|