update

3 files changed, 13 insertions, 5 deletions

diff --git a/lstm.py b/lstm.py
index 751b60d..0860628 100755
--- a/lstm.py
+++ b/lstm.py
@@ -46,7 +46,6 @@ def getData_CMC(crypto, crypto_short):
     kwargs = {'close_off_high': lambda x: 2*(x['High']- x['Close'])/(x['High']-x['Low'])-1, 'volatility': lambda x: (x['High']- x['Low'])/(x['Open'])}
     market_info = market_info.assign(**kwargs)
     model_data = market_info[['Date']+[coin+metric for coin in [""] for metric in ['Close','Volume','close_off_high','volatility']]]
-    #model_data = market_info[['Date']+[metric for metric in ['Close','Volume','close_off_high','volatility']]]
     model_data = model_data.sort_values(by='Date')
     print(model_data.head())
     return model_data
diff --git a/marionette.py b/marionette.py
index baa6f04..86c2175 100755
--- a/marionette.py
+++ b/marionette.py
@@ -32,7 +32,7 @@ class Argparser(object):
         parser.add_argument("--dbg", action="store_true", help="debug", default=False)
         self.args = parser.parse_args()
 
-def cnn_type_1():
+def marrionette_type_1():
     url = "https://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data"
     names = ["sepal-length", "sepal-width", "petal-length", "petal-width", "class"]
     dataset = pandas.read_csv(url, names=names)
@@ -86,7 +86,7 @@ def cnn_type_1():
 def premain(argparser):
     signal.signal(signal.SIGINT, SigHandler_SIGINT)
     #here
-    cnn_type_1()
+    marrionette_type_1()
 
 def main():
     argparser = Argparser()
diff --git a/seer.py b/seer.py
index c63c6cf..e95a6d8 100755
--- a/seer.py
+++ b/seer.py
@@ -7,7 +7,7 @@ import readline
 import signal
 import sys
 from ltsm import lstm_type_1, lstm_type_2, lstm_type_3
-from cnn import cnn_type_1
+from cnn import marrionette_type_1
 
 def SigHandler_SIGINT(signum, frame):
     print()
@@ -16,15 +16,24 @@ def SigHandler_SIGINT(signum, frame):
 class Argparser(object):
     def __init__(self):
         parser = argparse.ArgumentParser()
-        parser.add_argument("--string", type=str, help="string")
+        parser.add_argument("--which", type=str, help="which one to run")
         parser.add_argument("--bool", action="store_true", help="bool", default=False)
         parser.add_argument("--dbg", action="store_true", help="debug", default=False)
         self.args = parser.parse_args()
 
+def launch_ais(which):
+    if which == "marionette": marrionette_type_1()
+    elif which == "lstm_type_1": lstm_type_1()
+    elif which == "lstm_type_2": lstm_type_2()
+    elif which == "lstm_type_3": lstm_type_3()
+    elif which == "cnn_type_1": pass
+    else: pass
+
 # write code here
 def premain(argparser):
     signal.signal(signal.SIGINT, SigHandler_SIGINT)
     #here
+    launch_ais(argparser.args.which)
 
 def main():
     argparser = Argparser()