Update docker and runExample script

Author: mgroncki

Docker/Dockerfile-ORESWIG

@@ -41,5 +41,4 @@ RUN mv /swig/OREAnalytics-SWIG/Python/build.release/ORE.py oreswig \
 
 ENV PYTHONPATH=/oreswig
 
-WORKDIR /swig/OREAnalytics-SWIG/Python/Examples
-RUN ./runExamples.sh
+WORKDIR /swig/OREAnalytics-SWIG/Python/Examples

Docker/Dockerfile-ORESWIG-App

@@ -8,7 +8,7 @@ FROM env_ore:${ore_version} as env_ore
 FROM debian:${debian_tag}
 
 RUN apt-get update \
-  && DEBIAN_FRONTEND=noninteractive apt-get install -y dos2unix python3 python3-pip \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y dos2unix python3 python3-pip vim \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

OREAnalytics-SWIG/Python/Examples/ore.py

@@ -39,9 +39,6 @@
 for name in analyticTypes:
     print("analytc:", name)
 
-print("\npress <enter> ...")
-sys.stdin.readline()
-
 #####################################
 # List all results, reports and cubes
 
@@ -55,9 +52,6 @@
 for name in cubeNames:
     print("cube:", name)
 
-print("\npress <enter> ...")
-sys.stdin.readline()
-
 #######################
 # Access report details
 
@@ -78,19 +72,13 @@
 for i in range(0, report.columns()):
     print("colum", i, "header", report.header(i), "type", report.columnType(i), columnTypes[report.columnType(i)])
 
-print("\npress <enter> ...")
-sys.stdin.readline()
-
 time = report.dataAsReal(2);
 epe = report.dataAsReal(3);
 ene = report.dataAsReal(4);
 print ("#Time", "EPE")
 for i in range(0, report.rows()):
     print("%5.2f  %12.2f  %12.2f" % (time[i], epe[i], ene[i]))
 
-print("\npress <enter> ...")
-sys.stdin.readline()
-
 #####################
 # Access cube details
 
@@ -102,9 +90,6 @@
 print ("cube dates:", cube.numDates())
 print ("cube depth:", cube.depth())
 
-print("\npress <enter> ...")
-sys.stdin.readline()
-
 cubeIds = cube.ids() 
 cubeDates = cube.dates()
 
@@ -118,9 +103,6 @@
 ###########################################################
 # Access one analytic e.g. to query the market or portfolio
 
-print("\npress <enter> ...")
-sys.stdin.readline()
-
 print("Inspect NPV analytic ...")
 analytic = ore.getAnalytic("NPV")
 market  = analytic.getMarket()

OREAnalytics-SWIG/Python/Examples/runExamples.sh

@@ -1,4 +1,13 @@
-#!/bin/sh 
-echo RUN commodityforward.py
-python3 commodityforward.py
-python3 conventions.py
+#!/bin/sh
+status = 0
+for file in *.py; do
+    if [ -f "$file" ]; then
+        echo RUN $file
+        python3 "$file" || status = 1
+        return_code = $?
+        if [$return_code -gt $status]; then
+                status = $return_code
+        fi
+    fi
+done
+exit $status