Merge branch 'main' of https://github.com/IDoUseLinux/CounselAI-Python

IDoUseLinux · IDoUseLinux · commit 05442e6cabd8 · 2025-01-02T17:06:32.000-10:00
diff --git a/AP.py b/AP.py
@@ -9,4 +9,4 @@ def __init__(self, name, tier, apgrade, score) :
         self.tier = tier
         self.apgrade = apgrade
         self.score = score
-        self.apValue = (score+apgrade)*tier/20
+        self.apValue = (score*0.25+apgrade*0.75)*tier/20
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
 # CounselAI-Python
-A submission to the Honolulu Tech Week Hackathon, the 2024 Congressional App Challenge, and the National STEM Festival
+A submission to the Honolulu Tech Week Hackathon, the 2024 Congressional App Challenge, the National STEM Festival, and the Conrad Challenge. It has scored 2nd place for Congressional App Challenge for HI-01 and  National STEM Festival Champion for HI. 
diff --git a/main.py b/main.py
@@ -31,7 +31,6 @@ class app() :
         "Pre-calculus",
         "Statistics",
         "Pyschology",
-        "US History",
     ]
 
     AP_T3 = [
@@ -50,6 +49,7 @@ class app() :
         "European History",
         "Macroeconomics",
         "Microeconomics",
+        "US History",
     ]
 
     AP_T4 = [
@@ -368,7 +368,7 @@ def intro_5th_slide_sat_score(self,) :
     def intro_5th_slide_sat_score_validator(self,) :
         try :
             self.sat_score = int(self.sat_tb.get())
-            assert(isinstance(self.sat_score/10, int) or (self.sat_score/10).is_integer())
+            assert(isinstance(self.sat_score/10, int))# or (self.sat_score/10).is_integer())
             assert(self.sat_score >= 400 and self.sat_score <= 1600)
             self.intro_6th_slide()
         except : 
@@ -794,20 +794,20 @@ def intro_10th_slide_award_entry_validator(self,) :
             assert(award_region != "-" and award_level != "-")
 
             if award_region == "Local/School" :
-                award_region = 1
+                award_region = 0.75
             elif award_region == "State" :
-                award_region = 2
+                award_region = 1.5
             elif award_region == "Regional" :
                 award_region = 3
             elif award_region == "National" :
                 award_region = 5
             else :
-                award_region = 7
+                award_region = 6
             
             if award_level == "Top 3" :
-                award_level = 5
+                award_level = 4
             elif award_level == "Finalist" :
-                award_level = 3
+                award_level = 2
             else :
                 award_level = 1
 
@@ -856,7 +856,7 @@ def generate_report(self,) :
             career_path = self.career_dd.get()
             assert (career_path != "-")
 
-            self.student_score = self.sat_score/50 + self.gpa*4.5
+            self.student_score = self.sat_score/75 + self.gpa*8
             
             ## Very dumb but it works so :shrug:
             tempTotal = 0
@@ -877,55 +877,54 @@ def generate_report(self,) :
             print(self.student_score)
                         
             self.clearScreen()
-            if career_path == "STEM" :
+            if career_path == "STEM" : ## TODO: Change this later into things for tech, chem, and other sciences
                 tag = "Tech"
             elif career_path == "Undecided" or career_path == "Other" :
                 tag = None
             else :
                 tag = career_path
             
             recommend_unis = []
-            if self.student_score >= 75 :
+            if self.student_score >= 65 :
                 for i in self.T1_UNIS :
                     if tag in i.tags :
                         recommend_unis.append(i)
                 if tag == "" :
                     for i in range(3) :
                         recommend_unis.append(random.choice(self.T1_UNIS))
 
-            if self.student_score >= 50 and self.student_score <= 90 :
+            if self.student_score >= 50 and self.student_score <= 80 :
                 for i in self.T2_UNIS :
                     if tag in i.tags :
                         recommend_unis.append(i)
                 if tag == "" :
                     for i in range(3) :
                         recommend_unis.append(random.choice(self.T2_UNIS))
 
-            if self.student_score >= 40 and self.student_score <= 80 :
+            if self.student_score >= 40 and self.student_score <= 70 :
                 for i in self.T3_UNIS :
                     if tag in i.tags :
                         recommend_unis.append(i)
                 if tag == "" :
                     for i in range(3) :
                         recommend_unis.append(random.choice(self.T3_UNIS))
 
-            if self.student_score >= 30 and self.student_score <= 55 :
+            if self.student_score >= 30 and self.student_score <= 50 :
                 for i in self.T4_UNIS :
                     if tag in i.tags :
                         recommend_unis.append(i)
                 if tag == "" :
                     for i in range(3) :
                         recommend_unis.append(random.choice(self.T4_UNIS))
                         
-            if self.student_score <= 45 :
+            if self.student_score <= 40 :
                 for i in self.T5_UNIS :
                     if tag in i.tags :
                         recommend_unis.append(i)
                 if tag == "" :
                     for i in range(3) :
                         recommend_unis.append(random.choice(self.T5_UNIS))
             
-            
             for i in recommend_unis :
                 print(i.name)
 
diff --git a/systemprompt.txt b/systemprompt.txt
@@ -1 +1 @@
-You are a college consular that gives information to users about colleges that they should apply to. They should apply to schools that are within their capability but should also push them for a better education than most state schools. The colleges should be in the United States as that is the user's location. Please keep responses short and concise. Do not write long responses.
+Your name is CounselAI, a college consular that gives information to users about colleges that they should apply to. They should apply to schools that are within their capability but should also push them for a better education than most state schools. The colleges should be in the United States as that is the user's location. Please keep responses short and concise. Do not write long responses.
diff --git a/tier1.json b/tier1.json
@@ -4,7 +4,7 @@
         "75_sat" : 1580,
         "50_sat" : 1550,
         "25_sat" : 1490,
-        "tags" : ["Ivy", "Medium", "Law", "Business", "Medical"]
+        "tags" : ["Ivy", "LaRge", "Law", "Business", "Medical"]
     },
     "Princeton University" : {
         "acc_rate" : 0.057,
@@ -117,5 +117,26 @@
         "50_sat" : 1500,
         "25_sat" : 1490,
         "tags" : ["Ivy-Adjacent", "Large", "Business"]
+    },
+    "Colby College" : {
+        "acc_rate" : 0.08,
+        "75_sat" : 1530,
+        "50_sat" : 1470,
+        "25_sat" : 1450,
+        "tags" : ["Ivy-Adjacent", "Small", "Art"]
+    },
+    "University of California, Berkeley" : {
+        "acc_rate" : 0.11,
+        "75_sat" : 1530,
+        "50_sat" : 1420,
+        "25_sat" : 1340,
+        "tags" : ["Ivy-Adjacent", "UC System", "Large", "Public Ivy", "Business", "Tech", "Law"]
+    }, 
+    "New York University" : {
+        "acc_rate" : 0.09,
+        "75_sat" : 1570,
+        "50_sat" : 1520,
+        "25_sat" : 1470,
+        "tags" : ["Ivy-Adjacent", "Large", "Business", "Medical"]
     }
-}
+}
diff --git a/tier2.json b/tier2.json
@@ -1,17 +1,10 @@
 {
     "University of California, Los Angeles" : {
-        "acc_rate" : 0.086,
+        "acc_rate" : 0.09,
         "75_sat" : 1550,
         "50_sat" : 1490,
         "25_sat" : 1460,
-        "tags" : ["UC System", "Large", "Public Ivy", "Business", "Art", "Music", "Tech", "Medical"]
-    },
-    "University of California, Berkeley" : {
-        "acc_rate" : 0.116,
-        "75_sat" : 1530,
-        "50_sat" : 1420,
-        "25_sat" : 1340,
-        "tags" : ["UC System", "Large", "Public Ivy", "Business", "Tech"]
+        "tags" : ["UC System", "Large", "Public Ivy", "Business", "Art", "Music", "Tech", "Medical", "Sports", "Law"]
     },
     "Georgetown University" : {
         "acc_rate" : 0.12,
@@ -25,14 +18,7 @@
         "75_sat" : 1520,
         "50_sat" : 1440,
         "25_sat" : 1330,
-        "tags" : ["Medium", "Sports"]
-    },
-    "New York University" : {
-        "acc_rate" : 0.125,
-        "75_sat" : 1570,
-        "50_sat" : 1520,
-        "25_sat" : 1470,
-        "tags" : ["Large", "Business"]
+        "tags" : ["Medium", "Sports", "STEM"]
     },
     "Carnegie Mellon University" : {
         "acc_rate": 0.11,
@@ -130,7 +116,7 @@
         "75_sat" : 1560,
         "50_sat"  : 1520,
         "25_sat" : 1470,
-        "tags" : ["Medium"]
+        "tags" : ["Medium", "Art"]
     },
     "California Instute of the Arts" : {
         "acc_rate" : 0.25,
diff --git a/tier3.json b/tier3.json
@@ -63,7 +63,7 @@
         "tags" : ["Medium"]
     },
     "University of Wisconsin, Madison" : {
-        "acc_rate" : 0.49,
+        "acc_rate" : 0.43,
         "75_sat" : 1500,
         "50_sat" : 1400,
         "25_sat" : 1370,
@@ -82,5 +82,26 @@
         "50_sat" : 1380,
         "25_sat" : 1370,
         "tags" : ["Large"]
+    },
+    "Southwestern University" : {
+        "acc_rate" : 0.39,
+        "75_sat" : 1320,
+        "50_sat" : 1240,
+        "25_sat" : 1180,
+        "tags" : ["Small", "Art"]
+    },
+    "University of Pittsburgh" : {
+        "acc_rate" : 0.49,
+        "75_sat" : 1450,
+        "50_sat" : 1360,
+        "25_sat" : 1270,
+        "tags" : ["Large", "Medical", "Engineering"]
+    },
+    "Landmark College" : {
+        "acc_rate" : 0.45,
+        "75_sat" : 1210,
+        "50_sat" : 1070,
+        "25_sat" : 930, 
+        "tags" : ["Small"]
     }
 }
diff --git a/tier4.json b/tier4.json
@@ -61,5 +61,19 @@
         "50_sat" : 1340,
         "25_sat" : 1270,
         "tags" : ["Large", "Medical", "Sports"]
+    },
+    "University of Massachusetts, Amherst" : {
+        "acc_rate" : 0.58,
+        "75_sat" : 1460,
+        "50_sat" : 1360,
+        "25_sat" : 1310,
+        "tags" : ["Large"]
+    },
+    "Southeastern University" : {
+        "acc_rate" : 0.74,
+        "75_sat" : 1210,
+        "50_sat" : 1100,
+        "25_sat" : 1010,
+        "tags" : ["Medium", "Christian"]
     }
 }
diff --git a/tier5.json b/tier5.json
@@ -4,7 +4,7 @@
         "75_sat" : 1320,
         "50_sat" : 1210,
         "25_sat" : 1100,
-        "tags" : ["Large"]
+        "tags" : ["Large", "Sports"]
     },
     "Oregon State University" : {
         "acc_rate" : 0.825,
@@ -47,5 +47,12 @@
         "50_sat" : 1230,
         "25_sat" : 1140,
         "tags" : ["Large", "Sports"]
+    },
+    "University of Colorado Boulder" : {
+        "acc_rate" : 0.81,
+        "75_sat" : 1380,
+        "50_sat" : 1250,
+        "25_sat" : 1160,
+        "tags" : ["Large", "Engineering"]
     }
 }
diff --git a/todo.txt b/todo.txt
@@ -0,0 +1,7 @@
+Give some suggestions on improving academic performance
+- General GPA
+- Give the some prep talk about the importance of certain things. 
+- Major preperation
+- SAT recommendations 
+- Recommendation for club engagement, such as leadership position, different skills, and talents
+- Have some recommendations for the user to improve upon themselves
diff --git a/universities.py b/universities.py
@@ -9,6 +9,6 @@ def __init__(self, name, acc_rate, tier, sat75, sat50, sat25, tags) :
         self.sat25 = sat25
         self.tags = tags
 
-        self.universityDifficulty = (1-self.acc_rate)*8*tier + sat50/40 
+        self.universityDifficulty = (1-self.acc_rate)*6*tier + sat75/40
         if (self.tier <= 3 ) :
             self.universityDifficulty -= (8*(2-self.tier))

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# CounselAI-Python`
`2`		`-A submission to the Honolulu Tech Week Hackathon, the 2024 Congressional App Challenge, and the National STEM Festival`
	`2`	`+A submission to the Honolulu Tech Week Hackathon, the 2024 Congressional App Challenge, the National STEM Festival, and the Conrad Challenge. It has scored 2nd place for Congressional App Challenge for HI-01 and National STEM Festival Champion for HI.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-You are a college consular that gives information to users about colleges that they should apply to. They should apply to schools that are within their capability but should also push them for a better education than most state schools. The colleges should be in the United States as that is the user's location. Please keep responses short and concise. Do not write long responses.`
	`1`	`+Your name is CounselAI, a college consular that gives information to users about colleges that they should apply to. They should apply to schools that are within their capability but should also push them for a better education than most state schools. The colleges should be in the United States as that is the user's location. Please keep responses short and concise. Do not write long responses.`