Skip to content

Commit 2d05546

Browse files
committed
More weight refinements & changes.
1 parent 348e208 commit 2d05546

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

main.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ def intro_7th_slide_club_entry_validator(self,) :
552552
if club_purpose == "Academic" :
553553
club_purpose = 3
554554
elif club_purpose == "Volunteering" :
555-
club_purpose = 2
555+
club_purpose = 2.5
556556
else :
557557
club_purpose = 1
558558

@@ -861,7 +861,7 @@ def generate_report(self,) :
861861
tempTotal = 0
862862
for i in self.taken_APs :
863863
tempTotal += i.apValue
864-
864+
865865
for i in self.taken_clubs :
866866
tempTotal += i.clubValue
867867

@@ -871,7 +871,7 @@ def generate_report(self,) :
871871
for i in self.awarded_awards :
872872
tempTotal += i.awardValue
873873

874-
self.student_score += tempTotal/1.5
874+
self.student_score += tempTotal
875875

876876
print(self.student_score)
877877

@@ -984,6 +984,7 @@ def parse_unis(self, ) :
984984
for i in tier1s :
985985
## Ugly but works
986986
self.T1_UNIS.append(universities.university(i, tier1s[i]["acc_rate"], 5, tier1s[i]["75_sat"], tier1s[i]["50_sat"], tier1s[i]["25_sat"], tier1s[i]["tags"]))
987+
print(self.T1_UNIS[len(self.T1_UNIS)-1].universityDifficulty)
987988

988989
with open("tier2.json", 'r') as t2 :
989990
tier2s = json.load(t2)
@@ -1008,6 +1009,7 @@ def parse_unis(self, ) :
10081009

10091010
for i in tier5s :
10101011
self.T5_UNIS.append(universities.university(i, tier5s[i]["acc_rate"], 1, tier5s[i]["75_sat"], tier5s[i]["50_sat"], tier5s[i]["25_sat"], tier5s[i]["tags"]))
1012+
print(self.T5_UNIS[len(self.T5_UNIS)-1].universityDifficulty)
10111013

10121014
## Also a bit janky but also works
10131015
self.ALL_UNIS = self.T1_UNIS + self.T2_UNIS + self.T3_UNIS + self.T4_UNIS + self.T5_UNIS

sports.py

Lines changed: 1 addition & 1 deletion
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 / 4
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

universities.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ 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)*10 + tier*40 +sat50/40 + 10 ## Technically acc_rate is reject rate
12+
self.universityDifficulty = (1-self.acc_rate)*8*tier + sat50/40
13+
if (self.tier <= 3 ) :
14+
self.universityDifficulty -= (8*(2-self.tier))

0 commit comments

Comments
 (0)