Modifying for Python 2 and 3 compatibility

Author: allen-chu-ge

analytics/demo-RTM-loco/demo-RTM-loco-py/config.json

@@ -2,8 +2,8 @@
   "entry-method": "rtm.LocomotiveRegression.driver",
   "conda-libs": [
     "numpy",
-    "scikit-learn",
-    "scipy",
-    "pandas"
+    "scikit-learn==0.20",
+    "scipy==1.2.2",
+    "pandas==0.24.2"
   ]
 }

analytics/demo-RTM-loco/demo-RTM-loco-py/rtm/RTMLocomotiveRegression.py

@@ -6,7 +6,7 @@
 
 class LocomotiveRegression:
     def __init__(self):
-        print "Locomotive Linear Regression"
+        print("Locomotive Linear Regression")
 
     def driver(self, data):
         data_json = json.loads(data)

analytics/demo-RTM-loco/demo-RTM-loco-py/rtm/__init__.py

@@ -1 +1 @@
-from RTMLocomotiveRegression import LocomotiveRegression
+from rtm.RTMLocomotiveRegression import LocomotiveRegression

analytics/demo-RTM-loco/sampleInput-small.json

@@ -0,0 +1,78 @@
+{
+    "test": {
+        "wind_speed": [
+            8, 
+            15, 
+            11, 
+            6, 
+            24, 
+            3, 
+            21, 
+            14, 
+            25, 
+            11
+        ], 
+        "RTM": [
+            369.11, 
+            365.95, 
+            365.87, 
+            371.31, 
+            365.69, 
+            362.92, 
+            364.29, 
+            367.22, 
+            363.9, 
+            357.35
+        ], 
+        "loco_speed": [
+            44.1, 
+            42.8, 
+            40.06, 
+            46.08, 
+            47.23, 
+            35.7, 
+            51.36, 
+            41.4, 
+            44.65, 
+            33.09
+        ]
+    }, 
+    "train": {
+        "wind_speed": [
+            17, 
+            17, 
+            22, 
+            19, 
+            11, 
+            19, 
+            10, 
+            17, 
+            28, 
+            14
+        ], 
+        "RTM": [
+            360.84, 
+            363.66, 
+            364.56, 
+            363.84, 
+            363.14, 
+            360.46, 
+            365.07, 
+            366.93, 
+            360.67, 
+            361.6
+        ], 
+        "loco_speed": [
+            38.28, 
+            41.31, 
+            44.52, 
+            40.93, 
+            38.4, 
+            38.34, 
+            38.63, 
+            45.11, 
+            46.43, 
+            37.46
+        ]
+    }
+}

analytics/demo-RTM-loco/sampleOutput-small.json

@@ -0,0 +1,17 @@
+{
+  "R2": [
+    0.69188
+  ],
+  "Prediction": [
+    370.0659,
+    366.4111,
+    365.6598,
+    371.8394,
+    365.0185,
+    363.5657,
+    366.5063,
+    365.7035,
+    363.5706,
+    356.2802
+  ]
+}

analytics/demo-adder/demo-adder-py/analytic/__init__.py

@@ -1 +1 @@
-from demoAdder import demoAdder
+from analytic.demoAdder import demoAdder

analytics/demo-adder/demo-adder-py/analytic/demoAdder.py

@@ -3,7 +3,7 @@
 
 class demoAdder:
     def __init__(self):
-        print "Create pyadder"
+        print("Create pyadder")
 
     def add(self, data):
         data_json = json.loads(data)

analytics/demo-adder/demo-adder-py/config.json

@@ -4,7 +4,6 @@
     "boto"
   ],
   "conda-libs": [
-    "numpy",
-    "scipy"
+    "numpy"
   ]
 }

analytics/demo-timeseries-adder-with-model/demo-timeseries-adder-with-model-py/analytics/demoTimeSeriesAdder.py

@@ -2,7 +2,7 @@
 
 class demoTimeSeriesAdder:
     def __init__(self):
-        print "Create python time series demo adder"
+        print("Create python time series demo adder")
 
     def add2NumberArrays(self, data, modelmap = {}):
         threshold = float(modelmap['threshold']) if len(modelmap) > 0 else None