From df7cce80d6308653a65e9f83889da2b9b615b6f2 Mon Sep 17 00:00:00 2001
From: ltcptgeneral <35508619+ltcptgeneral@users.noreply.github.com>
Date: Wed, 4 Mar 2020 23:59:50 -0600
Subject: [PATCH] superscript.py v 0.0.2.001

---
 data analysis/__pycache__/data.cpython-37.pyc | Bin 2981 -> 3403 bytes
 data analysis/config.csv                      |  10 ++---
 data analysis/data.py                         |  14 ++++++-
 data analysis/superscript.py                  |  38 ++++++++++++++----
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/data analysis/__pycache__/data.cpython-37.pyc b/data analysis/__pycache__/data.cpython-37.pyc
index 6b0bd6cc46924d1ca5adacdcaa0cf379f0de60a1..b84e9ed598b2eddf1630d27a5cf89af25a352be2 100644
GIT binary patch
delta 379
zcmZ1~ep-spiI<m)0SE*e6XMKyCh|!z7EDz4(G*YNOW|)}jN(d>ND)jC0<ySMgi}OX
z7@~MmL{r3oG;a!HFoUM##-0`~@nj~D5kSBS#m+#wSYz^Bc3IaN#uUaBrcB06#)Tja
z%zjnuDybEj#U;fdnyf{#K!rteAVL#J++t13NlY&;(gw1Dl42ks7Ld^7b)52QLg}d`
z@rikfIhDnk#qnU3PCymK96*ABk&BTH2#cI2A7qha)R}ynMcxf&aSc-n(?VuKmKQk!
zjVZDM5}IsatBXLU7s*UM$fcwvRE%M_2T&H(ZkNft+%k-OleM@Vxj`XN<N_i%CO5JO
UPp;?YW0aWO$1Tpn#m2z~0C0&=MF0Q*

delta 114
zcmX>twN#wXiI<m)0SGp!C&Vq|n#d=?m@rY@M^ZS2FNME_F^VfiBt<Yq2*~12VGL%_
z6x}$dg-c44sYny3r^p;gz}Q+KHqYckJdTVUlP9tW^K;nb=BJeAq}nk8Wr{^68}Nz)
E0FtU09RL6T

diff --git a/data analysis/config.csv b/data analysis/config.csv
index 8dc01547..900ccba9 100644
--- a/data analysis/config.csv	
+++ b/data analysis/config.csv	
@@ -1,6 +1,6 @@
 2020ilch
-balls-blocked,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal
-balls-collected,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal
-balls-lower,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal
-balls-started,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal
-balls-upper,basic_stats,historical_analysis,regression_linear,regression_logarithmic,regression_exponential,regression_polynomial,regression_sigmoidal
\ No newline at end of file
+balls-blocked,basic_stats,historical_analysis
+balls-collected,basic_stats,historical_analysis
+balls-lower,basic_stats,historical_analysis
+balls-started,basic_stats,historical_analysis
+balls-upper,basic_stats,historical_analysis
\ No newline at end of file
diff --git a/data analysis/data.py b/data analysis/data.py
index fa1f866e..9d51455d 100644
--- a/data analysis/data.py	
+++ b/data analysis/data.py	
@@ -61,4 +61,16 @@ def push_team_metrics_data(apikey, competition, team_num, data, dbname = "data_p
     client = pymongo.MongoClient(apikey)
     db = client[dbname]
     mdata = db[colname]
-    mdata.replace_one({"competition" : competition, "team": team_num}, {"_id": competition+str(team_num)+"am", "competition" : competition, "team" : team_num, "metrics" : data}, True)
\ No newline at end of file
+    mdata.replace_one({"competition" : competition, "team": team_num}, {"_id": competition+str(team_num)+"am", "competition" : competition, "team" : team_num, "metrics" : data}, True)
+
+def get_analysis_flags(apikey, flag):
+    client = pymongo.MongoClient(apikey)
+    db = client.data_processing
+    mdata = db.flags
+    return mdata.find_one({flag:{"$exists":True}})
+
+def set_analysis_flags(apikey, flag, data):
+    client = pymongo.MongoClient(apikey)
+    db = client.data_processing
+    mdata = db.flags
+    return mdata.replace_one({flag:{"$exists":True}}, data, True)
\ No newline at end of file
diff --git a/data analysis/superscript.py b/data analysis/superscript.py
index b66434cf..3e6aacdc 100644
--- a/data analysis/superscript.py	
+++ b/data analysis/superscript.py	
@@ -3,10 +3,16 @@
 # Notes:
 # setup:
 
-__version__ = "0.0.1.004"
+__version__ = "0.0.2.001"
 
 # changelog should be viewed using print(analysis.__changelog__)
 __changelog__ = """changelog:
+    0.0.2.001:
+        - minor stability patches
+        - implemented db syncing for timestamps
+        - fixed bugs
+    0.0.2.000:
+        - finalized testing and small fixes
     0.0.1.004:
         - finished metrics implement, trueskill is bugged
     0.0.1.003:
@@ -67,6 +73,7 @@ import time
 
 def main():
     while(True):
+
         current_time = time.time()
         print("time: " + str(current_time))
 
@@ -79,6 +86,19 @@ def main():
         tbakey = an.load_csv("keys.txt")[1][0]
         print(" loaded keys")
 
+        previous_time = d.get_analysis_flags(apikey, "latest_update")
+
+        if(previous_time == None):
+
+            d.set_analysis_flags(apikey, "latest_update", 0)
+            previous_time = 0
+
+        else:
+
+            previous_time = previous_time["latest_update"]
+
+        print(" analysis backtimed to: " + str(previous_time))
+
         print(" loading data")
         data = d.get_data_formatted(apikey, competition)
         print(" loaded data")
@@ -88,8 +108,10 @@ def main():
         print(" finished tests")
 
         print(" running metrics")
-        metrics = metricsloop(tbakey, apikey, competition, 0)
+        metrics = metricsloop(tbakey, apikey, competition, previous_time)
         print(" finished metrics")
+
+        d.set_analysis_flags(apikey, "latest_update", {"latest_update":current_time})
         
         print(" pushing to database")
         push_to_database(apikey, competition, results, metrics)
@@ -127,22 +149,22 @@ def simplestats(data, test):
         return an.basic_stats(data)
 
     if(test == "historical_analysis"):
-        return an.histo_analysis(data)
+        return an.histo_analysis([list(range(len(data))), data])
 
     if(test == "regression_linear"):
-        return an.regression('cpu', list(range(len(data))), data, ['lin'])
+        return an.regression('cpu', [list(range(len(data)))], [data], ['lin'], _iterations = 5000)
 
     if(test == "regression_logarithmic"):
-        return an.regression('cpu', list(range(len(data))), data, ['log'])
+        return an.regression('cpu', [list(range(len(data)))], [data], ['log'], _iterations = 5000)
 
     if(test == "regression_exponential"):
-        return an.regression('cpu', list(range(len(data))), data, ['exp'])
+        return an.regression('cpu', [list(range(len(data)))], [data], ['exp'], _iterations = 5000)
 
     if(test == "regression_polynomial"):
-        return an.regression('cpu', list(range(len(data))), data, ['ply'])
+        return an.regression('cpu', [list(range(len(data)))], [data], ['ply'], _iterations = 5000)
 
     if(test == "regression_sigmoidal"):
-        return an.regression('cpu', list(range(len(data))), data, ['sig'])
+        return an.regression('cpu', [list(range(len(data)))], [data], ['sig'], _iterations = 5000)
 
 def push_to_database(apikey, competition, results, metrics):