From 81c52a392ad8c0b53c923198878432bfcbd50307 Mon Sep 17 00:00:00 2001 From: ltcptgeneral <35508619+ltcptgeneral@users.noreply.github.com> Date: Fri, 8 Mar 2019 17:43:38 -0600 Subject: [PATCH 1/2] superscript v 1.0.5.003 changelog: - hotfix: actually pushes data correctly now --- .../__pycache__/analysis.cpython-37.pyc | Bin 25608 -> 25263 bytes .../__pycache__/visualization.cpython-37.pyc | Bin 3908 -> 3908 bytes data analysis/data/aSetOfData.csv | 10 ++++---- data analysis/data/data.csv | 10 ++++---- data analysis/data/scores.csv | 2 +- data analysis/superscript.py | 24 ++++++++++-------- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/data analysis/__pycache__/analysis.cpython-37.pyc b/data analysis/__pycache__/analysis.cpython-37.pyc index 5d9f4727015df54b08bf11e72f6cc3c6d6673271..78865bc6144480af27cac55c7b0e28a59c67b58e 100644 GIT binary patch delta 7534 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 delta 7583 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 I#qrbs54-PLg#Z8m diff --git a/data analysis/__pycache__/visualization.cpython-37.pyc b/data analysis/__pycache__/visualization.cpython-37.pyc index 14d8a833780cfc3c127f6781287714e54268fd29..c0bb061078914b0c5b1649618542c48871fcce67 100644 GIT binary patch delta 20 acmX>icSMfciIicSMfciI, " "Jacob Levine ," ) - +s import firebase_admin from firebase_admin import credentials from firebase_admin import firestore @@ -72,7 +74,7 @@ def titanservice(): end = time.time() - print("[OK] loaded data in " + str(end - start) + "seconds") + print("[OK] loaded data in " + str(end - start) + " seconds") #assumes that team number is in the first column, and that the order of teams is the same across all files #unhelpful comment @@ -117,10 +119,10 @@ def titanservice(): measure_stats.append(teams[i] + list(analysis.basic_stats(line, 0, 0)) + list(analysis.histo_analysis(line, 1, -3, 3)) + ofbest_curve + r2best_curve) - stats.append(list(measure_stats)) - nishant = [] + stats.append(list(measure_stats)) + nishant = [] - for i in range(len(scores)): + for i in range(len(scores)): ofbest_curve = [None] r2best_curve = [None] @@ -168,21 +170,23 @@ def titanservice(): score_out = {} #print(stats) + + #print(stats[0]) - for i in range(len(teams)): - json_out[str(teams[i][0])] = (stats[0][i]) + #for i in range(len(teams)): + # json_out[str(teams[i][0])] = (stats[0][i]) for i in range(len(teams)): score_out[str(teams[i][0])] = (nishant[i]) - print(json_out) - #print(json_out.get('5')) location = db.collection(u'stats').document(u'stats-noNN') for i in range(len(teams)): general_general_stats = location.collection(teams[i][0]) + for j in range(len(files)): + json_out[str(teams[i][0])] = (stats[j][i]) general_general_stats.document(files[j]).set({'stats':json_out.get(teams[i][0])}) for i in range(len(teams)): From d6e4ddc6cbedfc150fa8cdc00fa4efb59b344485 Mon Sep 17 00:00:00 2001 From: ltcptgeneral <35508619+ltcptgeneral@users.noreply.github.com> Date: Fri, 8 Mar 2019 19:00:02 -0600 Subject: [PATCH 2/2] Update superscript.py --- data analysis/superscript.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data analysis/superscript.py b/data analysis/superscript.py index 7ccb3165..81b44cc9 100644 --- a/data analysis/superscript.py +++ b/data analysis/superscript.py @@ -236,7 +236,7 @@ def service(): time.sleep(300 - (end - start)) #executes once every 5 minutes warnings.simplefilter("ignore") -# Use a service account +#Use a service account cred = credentials.Certificate('keys/keytemp.json') firebase_admin.initialize_app(cred)