Merge branch 'master' of https://github.com/titanscout2022/tr2022-strategy

data analysis/data/aSetOfData.csv

@@ -1,5 +1,5 @@
-2022,4,5,10,15,8,954978,84,74
+4,5,10,15,8,954978,84,74
-2011,3,6,9,12,15,7,856,9
+3,6,9,12,15,7,856,9
-1101,4,16,32,64,128,2,4234,-56
+4,16,32,64,128,2,4234,-56
-821374,7,8,9,79.33333333,170.3333333,636647,5874.666667,-121
+7,8,9,79.33333333,170.3333333,636647,5874.666667,-121
-5,4,8,8,103.8333333,230.3333333,1114135,7949.666667,-186
+4,8,8,103.8333333,230.3333333,1114135,7949.666667,-186

data analysis/data/data.csv

@@ -1,5 +1,5 @@
-2022,1,2,3,4,5,6,7,8
+1,2,3,4,5,6,7,8
-2011,5,6,7,8,9,10,11,12
+5,6,7,8,9,10,11,12
-1101,1000,2000,3000,4000,5000,6000,7000,8000
+1000,2000,3000,4000,5000,6000,7000,8000
-821374,0,0,0,0,0,0,0,1
+0,0,0,0,0,0,0,1
-5,3,5,6,7,8.5,9.8,11.1,12.4
+3,5,6,7,8.5,9.8,11.1,12.4

data analysis/data/scores.csv

@@ -1 +1 @@
-2022, 21, 23, 39, 50, 89, 97, 191, 213, 233, 236, 272, 289, 308, 310, 314, 317, 329, 355, 428, 436
2011, 1, 25, 34, 106, 112, 132, 146, 167, 184, 223, 256, 267, 304, 337, 339, 370, 411, 460, 485, 494
1101, 7, 11, 55, 81, 92, 144, 151, 157, 165, 174, 177, 220, 241, 312, 320, 341, 343, 347, 419, 473
821374, 6, 9, 11, 28, 31, 194, 200, 201, 246, 298, 340, 351, 355, 364, 388, 395, 414, 422, 429, 442
5, 33, 73, 102, 103, 137, 183, 200, 212, 218, 242, 249, 264, 294, 302, 310, 378, 400, 408, 457, 473
+21, 23, 39, 50, 89, 97, 191, 213, 233, 236, 272, 289, 308, 310, 314, 317, 329, 355, 428, 436
1, 25, 34, 106, 112, 132, 146, 167, 184, 223, 256, 267, 304, 337, 339, 370, 411, 460, 485, 494
7, 11, 55, 81, 92, 144, 151, 157, 165, 174, 177, 220, 241, 312, 320, 341, 343, 347, 419, 473
6, 9, 11, 28, 31, 194, 200, 201, 246, 298, 340, 351, 355, 364, 388, 395, 414, 422, 429, 442
33, 73, 102, 103, 137, 183, 200, 212, 218, 242, 249, 264, 294, 302, 310, 378, 400, 408, 457, 473

data analysis/superscript.py

@@ -3,9 +3,11 @@
 #Notes:
 #setup:
 
-__version__ = "1.0.5.002"
+__version__ = "1.0.5.003"
 
 __changelog__ = """changelog:
+1.0.5.003:
+    - hotfix: actually pushes data correctly now
 1.0.5.002:
     - more information given
     - performance improvements
@@ -36,7 +38,7 @@ __author__ = (
     "Arthur Lu <arthurlu@ttic.edu>, "
     "Jacob Levine <jlevine@ttic.edu>,"
     )
-
+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))
+        stats.append(list(measure_stats))
-            nishant = []
+        nishant = []
             
-            for i in range(len(scores)):
+        for i in range(len(scores)):
 
                     ofbest_curve = [None]
                     r2best_curve = [None]
@@ -169,20 +171,22 @@ def titanservice():
 
     #print(stats)
 
-    for i in range(len(teams)):
+    #print(stats[0])
-            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)):
@@ -232,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)