@@ -502,20 +502,20 @@ def intro_5th_slide_psat_score(self,) :
502
502
def intro_5th_slide_psat_score_validator (self ,) :
503
503
try :
504
504
psat_score = int (self .psat_tb .get ())
505
- assert (isinstance ( psat_score / 10 , int ) or (psat_score / 10 ).is_integer ())
505
+ assert ((psat_score / 10 ).is_integer ())
506
506
psat_version = self .psat_dd .get ()
507
507
if psat_version == "-" :
508
508
raise AssertionError
509
509
elif psat_version == "8/9" :
510
- psat_score += 160 ## Aprox for SAT conversion
510
+ psat_score += 120 ## Aprox for SAT conversion
511
511
assert (psat_score >= 400 and psat_score <= 1440 )
512
512
else :
513
- psat_score += 80 ## Aprox for SAT conversion
514
- assert (psat_score >= 400 and psat_score <= 1440 )
513
+ psat_score += 60 ## Aprox for SAT conversion
514
+ assert (psat_score >= 400 and psat_score <= 1520 )
515
515
self .sat_score = psat_score
516
516
self .intro_6th_slide ()
517
517
except :
518
- messagebox .showerror ("Invalid SAT Score" , "Invalid SAT Score, SAT score range is from 400 to 1600 ." )
518
+ messagebox .showerror ("Invalid PSAT Score" , "Invalid PSAT Score." )
519
519
520
520
def intro_6th_slide (self ,) :
521
521
self .clearScreen ()
@@ -937,7 +937,8 @@ def generate_report(self,) :
937
937
self .sat_score = "no test"
938
938
self .student_score = self .gpa * 12 ## If no SAT, GPA takes more of SAT's weight, but not all as GPA != SAT
939
939
## Student score eval
940
- else : self .student_score = self .sat_score / 75 + self .gpa * 8 - 10
940
+ else :
941
+ self .student_score = self .sat_score ** (1 / 2 )/ 1.5 + self .gpa * 8 - 10
941
942
942
943
## Very dumb but it works so :shrug:
943
944
for i in self .taken_APs :
0 commit comments