Skip to content

Commit e2a986b

Browse files
IDoUseLinuxIDoUseLinux
committed
Synced changes
1 parent 9f842fb commit e2a986b

File tree

5 files changed

+54
-29
lines changed

5 files changed

+54
-29
lines changed

‎all tiers.json

+30-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Date Generated": "2025-01-02 17:07:07 Hawaiian Standard Time",
2+
"Date Generated": "2025-01-03 14:12:54 Hawaiian Standard Time",
33
"Harvard University": {
44
"acc_rate": 0.032,
55
"75_sat": 1580,
@@ -10,7 +10,7 @@
1010
"LaRge",
1111
"Law",
1212
"Business",
13-
"Medical"
13+
"Medicine"
1414
]
1515
},
1616
"Princeton University": {
@@ -25,7 +25,7 @@
2525
"Business"
2626
]
2727
},
28-
"University of Pensylvania": {
28+
"University of Pennsylvania": {
2929
"acc_rate": 0.065,
3030
"75_sat": 1570,
3131
"50_sat": 1540,
@@ -151,7 +151,7 @@
151151
"tags": [
152152
"Ivy-Adjacent",
153153
"Medium",
154-
"Medical"
154+
"Medicine"
155155
]
156156
},
157157
"University of Chicago": {
@@ -221,7 +221,8 @@
221221
"Public Ivy",
222222
"Business",
223223
"Tech",
224-
"Law"
224+
"Law",
225+
"Engineering"
225226
]
226227
},
227228
"New York University": {
@@ -233,7 +234,7 @@
233234
"Ivy-Adjacent",
234235
"Large",
235236
"Business",
236-
"Medical"
237+
"Medicine"
237238
]
238239
},
239240
"University of California, Los Angeles": {
@@ -249,7 +250,7 @@
249250
"Art",
250251
"Music",
251252
"Tech",
252-
"Medical",
253+
"Medicine",
253254
"Sports",
254255
"Law"
255256
]
@@ -261,7 +262,8 @@
261262
"25_sat": 1410,
262263
"tags": [
263264
"Medium",
264-
"Law"
265+
"Law",
266+
"Medicine"
265267
]
266268
},
267269
"University of Southern California": {
@@ -272,7 +274,9 @@
272274
"tags": [
273275
"Medium",
274276
"Sports",
275-
"STEM"
277+
"Tech",
278+
"Engineering",
279+
"Medicine"
276280
]
277281
},
278282
"Carnegie Mellon University": {
@@ -331,7 +335,7 @@
331335
"25_sat": 1470,
332336
"tags": [
333337
"Medium",
334-
"Medical"
338+
"Medicine"
335339
]
336340
},
337341
"University of Virgina": {
@@ -351,7 +355,7 @@
351355
"25_sat": 1500,
352356
"tags": [
353357
"Medium",
354-
"Medical"
358+
"Medicine"
355359
]
356360
},
357361
"University of Florida": {
@@ -434,6 +438,18 @@
434438
"Art"
435439
]
436440
},
441+
"University of California, San Diego": {
442+
"acc_rate": 0.268,
443+
"75_sat": 1520,
444+
"50_sat": 1410,
445+
"25_sat": 1300,
446+
"tags": [
447+
"UC System",
448+
"Large",
449+
"Public Ivy",
450+
"Engineering"
451+
]
452+
},
437453
"University of California, Davis": {
438454
"acc_rate": 0.37,
439455
"75_sat": 1410,
@@ -499,7 +515,7 @@
499515
"25_sat": 1410,
500516
"tags": [
501517
"Medium",
502-
"Medical"
518+
"Medicine"
503519
]
504520
},
505521
"Florida State University": {
@@ -564,7 +580,7 @@
564580
"25_sat": 1270,
565581
"tags": [
566582
"Large",
567-
"Medical",
583+
"Medicine",
568584
"Engineering"
569585
]
570586
},
@@ -661,7 +677,7 @@
661677
"25_sat": 1270,
662678
"tags": [
663679
"Large",
664-
"Medical",
680+
"Medicine",
665681
"Sports"
666682
]
667683
},

‎main.py

+14-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ class app() :
2424
"Calculus AB",
2525
"Calculus BC",
2626
"Physics 1",
27-
"Physics C",
27+
"Physics 2",
28+
"Physics C (E and M)",
29+
"Physics C (Mechanics)"
2830
"Biology",
2931
"Chemistry",
3032
]
@@ -39,10 +41,11 @@ class app() :
3941
AP_T3 = [
4042
"English Language",
4143
"English Literature",
42-
"Government & Politics",
44+
"US Government & Politics",
4345
"Environmental Science",
4446
"Chinese",
45-
"Spanish",
47+
"Spanish Language",
48+
"Spanish Literature",
4649
"French",
4750
"Japanese",
4851
"Latin",
@@ -61,10 +64,13 @@ class app() :
6164
"Research",
6265
"Seminar",
6366
"CSP",
67+
"Comp. Gov. & Politics"
6468
]
6569

6670
AP_T5 = [
67-
"Art & Design", ## Actual joke of an AP here...
71+
"Art & Design (2D & 3D)", ## Actual joke of an AP here...
72+
"Drawing"
73+
6874
]
6975

7076
ALL_APS = AP_T1 + AP_T2 + AP_T3 + AP_T4 + AP_T5
@@ -371,7 +377,7 @@ def intro_5th_slide_sat_score(self,) :
371377
def intro_5th_slide_sat_score_validator(self,) :
372378
try :
373379
self.sat_score = int(self.sat_tb.get())
374-
assert(isinstance(self.sat_score/10, int))# or (self.sat_score/10).is_integer())
380+
assert((self.sat_score/10).is_integer())
375381
assert(self.sat_score >= 400 and self.sat_score <= 1600)
376382
self.intro_6th_slide()
377383
except :
@@ -556,7 +562,7 @@ def intro_7th_slide_club_entry_validator(self,) :
556562
club_purpose = 3
557563
elif club_purpose == "Volunteering" :
558564
club_purpose = 2.5
559-
else :
565+
else : ## Recreational counts as other as not realy boost
560566
club_purpose = 1
561567

562568
if club_role == "President" :
@@ -650,9 +656,9 @@ def intro_8th_slide_sports_entry_validator(self,) :
650656
assert(sports_role != "-")
651657

652658
if sports_role == "Captain/Leader" :
653-
sports_role = 2.5
659+
sports_role = 2
654660
elif sports_role == "Other leadership role" :
655-
sports_role = 1.5
661+
sports_role = 1.25
656662
else :
657663
sports_role = 1
658664

‎sports.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ def __init__(self, name, position, totalMonths) :
33
self.name = name
44
self.position = position
55
self.totalMonths = totalMonths
6-
self.sportsValue = position * (totalMonths**(2/5)) ## This leads to the gradual decline of extra months of sports, from 8 months compared to 4 months is large, but 20 to 24 is smaller
6+
self.sportsValue = position * (totalMonths**(1/5)) ## This leads to the gradual decline of extra months of sports, from 8 months compared to 4 months is large, but 20 to 24 is smaller

‎tier1.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"25_sat" : 1490,
1414
"tags" : ["Ivy", "Medium", "Law", "Business"]
1515
},
16-
"University of Pensylvania" : {
16+
"University of Pennsylvania" : {
1717
"acc_rate" : 0.065,
1818
"75_sat" : 1570,
1919
"50_sat" : 1540,
@@ -49,7 +49,7 @@
4949
"tags" : ["Ivy", "Large", "Law", "Business"]
5050
},
5151
"Dartmouth College" : {
52-
"acc_rate" : 0.062,
52+
"acc_rate" : 0.064,
5353
"75_sat" : 1560,
5454
"50_sat" : 1500,
5555
"25_sat" : 1440,
@@ -102,7 +102,7 @@
102102
"75_sat" : 1570,
103103
"50_sat" : 1510,
104104
"25_sat" : 1490,
105-
"tags" : ["Ivy-Adjacent", "Medium", "Music"]
105+
"tags" : ["Ivy-Adjacent", "Medium", "Music", "Medicine"]
106106
},
107107
"Rice University" : {
108108
"acc_rate" : 0.09,
@@ -137,6 +137,6 @@
137137
"75_sat" : 1570,
138138
"50_sat" : 1520,
139139
"25_sat" : 1470,
140-
"tags" : ["Ivy-Adjacent", "Large", "Business", "Medicine"]
140+
"tags" : ["Ivy-Adjacent", "Large", "Business", "Medicine", "Engineering"]
141141
}
142142
}

‎universities.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ def __init__(self, name, acc_rate, tier, sat75, sat50, sat25, tags) :
99
self.sat25 = sat25
1010
self.tags = tags
1111

12-
self.universityDifficulty = (1-self.acc_rate)*6*tier + sat75/40
12+
self.universityDifficulty = (1-self.acc_rate)*7*tier + sat75/40
1313
if (self.tier <= 3 ) :
14-
self.universityDifficulty -= (8*(2-self.tier))
14+
self.universityDifficulty -= (5*(2-self.tier))
15+
else :
16+
self.universityDifficulty += (2*self.tier)
17+

0 commit comments

Comments
 (0)