From 233b1dcda3f0e62835feb4cf3a0da849c84773a2 Mon Sep 17 00:00:00 2001
From: ltcptgeneral <35508619+ltcptgeneral@users.noreply.github.com>
Date: Wed, 4 Mar 2020 16:53:25 -0600
Subject: [PATCH] superscript.py v 0.0.1.003

---
 data analysis/__pycache__/data.cpython-37.pyc | Bin 3007 -> 2981 bytes
 .../__pycache__/superscript.cpython-37.pyc    | Bin 0 -> 3965 bytes
 data analysis/data.py                         |   2 +-
 data analysis/superscript.py                  |  69 ++++++++++++++++--
 4 files changed, 64 insertions(+), 7 deletions(-)
 create mode 100644 data analysis/__pycache__/superscript.cpython-37.pyc

diff --git a/data analysis/__pycache__/data.cpython-37.pyc b/data analysis/__pycache__/data.cpython-37.pyc
index 3a5788584c97369b15d44cf40f0e2a904a408ebd..6b0bd6cc46924d1ca5adacdcaa0cf379f0de60a1 100644
GIT binary patch
delta 1220
zcmah|&2G~`5bnksd!5vwYV+40T2;`dE=5SF;=fP<LgK<HLZU(h6Px0aIO(jTDyO^w
zQncd44JZ<qBJ~9-ZoC3};stmHm~l$l=7OXBGCP0!?ab^^X}{#$cbv=^eutHpFTV7h
zcR33;q<Mf#e(rz$q^j&0)9QdNr*&$#snt*RgbB5hI@lOTA8-(~xfe!J0IsP81iPI;
z#!?&GL9F?XY(?7i+U+3nHE)D6)<)B7yOx?ZDrGuN8?8>PSqOsCC19&<V?Lk5{TSnH
z23L;Fu_}XE^}*O>CFSrk%c*64FR$%~UhF*ruNk-kij<<Hx_q%PP2vo}>Ac@~dHNhG
z<sf;6nfT+Z$np#->KA`JRYI%gao{!GG@PgSd37g!<>??b?Jp2qBv>L?COCBlZgm0g
zUZWhfW)MSImo*<*meC~1bBqlRhBfs)eY8X>mjM-HBoR<6l2fv3->mlj<C##&Qns|_
zZ-cIcDcoo-TM$E@(ig~RZjCp*ZUBK_^TT=!!%}I(^L=fRJ4S1^GeT!oXFCyE!q?r}
z)y6#Ll9LG3q#Q2JCb3x)xL{p<wE8`&rJFgfBFeCUuqCK4GzoBtbn65a0uw>oF?f+|
zw`8zo#jS+ku(9McQuw53!wa0{s}4nhx$1{lFt1UltA2~U%R~xR=%^I-m}{dJ`Y=?&
z99pU_|JVAyUG9yvo;<Yazlw0?v{i34NEqcsof@#Q$vxlh$Tx$Di0O4C^FXAA^B|aD
zaF?Q15$aS6`Y>7v`*~8zgf-kiE%LjGe<!rHbv$S%)X9E};5G%=$8Uoa$pF(W;10nC
z!AMz0=oi(WOtDAaXZdcT#!Z1s8Lpp_=?d;ROpu=5kT%<1<a-hpX~W|X3pPu}r0;7a
gC1a4ZDJjAx=}uUXlmc75&n{$bVGC1ag_AM=0uHd}=l}o!

delta 1240
zcmah|OKTHR6wb{|W^R%u);3MkTKll}G2K+_dm(~~pops?I19%yGumigJu{&cl`aIA
zV!4072MPu8FBHMG;P!%hSAze*^G!5;P&DCwocI0iIcMGvZx0tP7Yex)|JDZY-Tksz
zcv+OJz;cC8^l@|Ros6y5)|=EbTiq0QgsVP?*^HZBZMf>2xFs@bGW}^f%fW;!ZLQUs
z&5#^hOA1#zVH8K&co@d6`jxIoZN{}m=tz|}=H^Vq8?8>PMa?b1;nn>p_B!o=GANjU
zrEVDG<$l&v!W5%?iegMG3n{3go*Jv7q<$I|kyo~PspMv_`mukFd|X0<C{j|cIW<&<
zI1Jcb`IT82LFK5(kP<mz@!u3>Q4%z*KAYDEOKfM-q2F*aG|CDcQAab2x4WgGPXHzX
zQ-EWDU3ajmhxq*-YIuz>rdl=f0%keFt_a=!doj(cx0&r3Bs+r8oqdJKX4@?6QoXR2
zH~tejmqao+8Erle*CRT_iZ-Jb#e`?mVK^<fukNph6b4>UtH#u8l{Wk!aBYNhwib`}
z(OJ;>PLn;g2kYKa9es!f7%-+HA5#qQxcd3fqIzy`ZlIS=?oSt4rZEOrqA~Sa6jQ=?
z5sqnq0dF=YzZtb#QRv!nD<Rk$EP^HhJB?48)_cHSzDmg<v7ol(gmnU0GwQ2cOGwdi
z)^(a^Y-+=+1q7yvkuaoX$J`;U^Axu0el_%3%}^Um+sXb}G$bY4fFx}N_nW+i+OD?h
z5cX5;?#KlsS%@#SJJCvaOJaOA$&Q?3Pj5#gcK$pPumkG5T-jkyOKf7Er{MkveL9VR
zGYCGAHl2kZ*B;Clj)ZO*bk&dCz{W+k?d6C^Icb_f@X1{=XghsWfF0kGYqkAm;72qL
q3wDPpfMophkdkdkrj@)q=~lOK@FtS5)RX)~J}0x%l6hIkS-$~*&*wA%

diff --git a/data analysis/__pycache__/superscript.cpython-37.pyc b/data analysis/__pycache__/superscript.cpython-37.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3f36ad6398b65079f0f52d839784607fc670fd4e
GIT binary patch
literal 3965
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

literal 0
HcmV?d00001

diff --git a/data analysis/data.py b/data analysis/data.py
index f00943cc..fa1f866e 100644
--- a/data analysis/data.py	
+++ b/data analysis/data.py	
@@ -61,4 +61,4 @@ 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, "data" : 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)
\ No newline at end of file
diff --git a/data analysis/superscript.py b/data analysis/superscript.py
index 35cd1ffe..f25c5931 100644
--- a/data analysis/superscript.py	
+++ b/data analysis/superscript.py	
@@ -3,10 +3,12 @@
 # Notes:
 # setup:
 
-__version__ = "0.0.1.002"
+__version__ = "0.0.1.003"
 
 # changelog should be viewed using print(analysis.__changelog__)
 __changelog__ = """changelog:
+    0.0.1.003:
+        - working
     0.0.1.002:
         - started implement of metrics
     0.0.1.001:
@@ -61,12 +63,19 @@ from analysis import analysis as an
 import data as d
 import time
 
-main()
+def testing():
+
+    competition, config = load_config("config.csv")
+
+    apikey = an.load_csv("keys.txt")[0][0]
+    tbakey = an.load_csv("keys.txt")[1][0]
+
+    metricsloop(tbakey, apikey, "2020mokc", 1583084980)
 
 def main():
     while(True):
         current_time = time.time()
-        print("time: " + time)
+        print("time: " + str(current_time))
 
         print("loading config")
         competition, config = load_config("config.csv")
@@ -147,8 +156,56 @@ def push_to_database(apikey, competition, results, metrics):
 
         d.push_team_tests_data(apikey, competition, team, results[team])
 
-def metricsloop(apikey, competition, timestamp): # listener based metrics update
+def metricsloop(tbakey, apikey, competition, timestamp): # listener based metrics update
 
-    matches = d.pull_new_tba_matches(apikey, competition, timestamp)
+    matches = d.pull_new_tba_matches(tbakey, competition, timestamp)
 
-    return
\ No newline at end of file
+    red = load_metrics(apikey, competition, matches, "red")
+    blu = load_metrics(apikey, competition, matches, "blue")
+
+    return
+
+def load_metrics(apikey, competition, matches, group_name):
+
+    for match in matches:
+
+        for team in match[group_name]:
+
+            group = {}
+
+            db_data = d.get_team_metrics_data(apikey, competition, team)
+
+            if d.get_team_metrics_data(apikey, competition, team) == None:
+
+                elo = {"score": 1500, "N": 1500, "K": 1500}
+                gl2 = {"score": 1500, "rd": 250, "vol": 0.06}
+                ts = {"mu": 25, "sigma": 25/3}
+
+                d.push_team_metrics_data(apikey, competition, team, {"elo":elo, "gliko2":gl2,"trueskill":ts})
+
+                group[team] = {"elo": elo, "gl2": gl2, "ts": ts}
+
+            else:
+
+                metrics = db_data["metrics"]
+                elo = metrics["elo"]
+                gl2 = metrics["gliko2"]
+                ts = metrics["trueskill"]
+
+                group[team] = {"elo": elo, "gl2": gl2, "ts": ts}
+
+    return group
+
+testing()
+
+"""
+Metrics Defaults:
+
+elo starting score = 1500
+elo N = 1500
+elo K = 32
+
+gl2 starting score = 1500
+gl2 starting rd = 350
+gl2 starting vol = 0.06
+"""
\ No newline at end of file