From 6a88cdbeab9236e11117b42b686683abeadf8144 Mon Sep 17 00:00:00 2001 From: Bryan Deng Date: Wed, 28 Aug 2024 12:05:42 -0400 Subject: [PATCH 1/4] fix math finance wording --- .../pages/program/DegreeReq/degreeData.json | 74 +++++-------------- 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/frontend/src/pages/program/DegreeReq/degreeData.json b/frontend/src/pages/program/DegreeReq/degreeData.json index e6d3f4fe..c0a922c7 100644 --- a/frontend/src/pages/program/DegreeReq/degreeData.json +++ b/frontend/src/pages/program/DegreeReq/degreeData.json @@ -279,71 +279,31 @@ "STAT330", "STAT331", "STAT333", - "STAT443" + "STAT443", + ["AFM101", "BUS127W"], + ["AFM102", "BUS247W"], + ["AFM131", "ARBUS101", "BUS111W"], + ["AMATH242", "CS335", "CS371"], + ["AMATH250", "AMATH251", "AMATH350"], + ["AMATH351", "CO250", "CO255", "PMATH352"], + ["AMATH353", "CO372", "CS476", "PMATH453"], + ["ECON101", "ECON120W"], + ["ECON102", "ECON140W"], + ["ECON201", "ECON260W"], ], "additionalRequirements": [ { - "name": "AFM requirement 1", - "courses": ["AFM101", "BUS127W"], - "count": 1 - }, - { - "name": "AFM requirement 2", - "courses": ["AFM102", "BUS247W"], - "count": 1 - }, - { - "name": "AFM requirement 3", - "courses": ["AFM131", "ARBUS101", "BUS111W"], - "count": 1 - }, - { - "name": "Complete 1 of the following", - "courses": ["AMATH242", "CS335", "CS371"], - "count": 1 - }, - { - "name": "Complete 1 of the following", - "courses": ["AMATH250", "AMATH251", "AMATH350"], - "count": 1 - }, - { - "name": "Complete 1 of the following", - "courses": ["AMATH351", "CO250", "CO255", "PMATH352"], - "count": 1 - }, - { - "name": "Complete 1 of the following", - "courses": ["AMATH353", "CO372", "CS476", "PMATH453"], - "count": 1 - }, - { - "name": "ECON requirement 1", - "courses": ["ECON101", "ECON120W"], - "count": 1 - }, - { - "name": "ECON requirement 2", - "courses": ["ECON102", "ECON140W"], - "count": 1 - }, - { - "name": "ECON requirement 3", - "courses": ["ECON201", "ECON260W"], - "count": 1 - }, - { - "name": "Complete 1 of the following", + "name": "MATH237 and PMATH333, or MATH247", "options": { - { - "name": "MATH247", - "courses": ["MATH247"], - "count": 1 - }, { "name": "MATH237 and PMATH333", "courses": ["MATH237", "PMATH333"], "count": 2 + }, + { + "name": "MATH247", + "courses": ["MATH247"], + "count": 1 } } } From 4cb23ae010feffccf16da257fc2800a6a352d6f4 Mon Sep 17 00:00:00 2001 From: Bryan Deng Date: Wed, 28 Aug 2024 12:19:28 -0400 Subject: [PATCH 2/4] add minimum averages to stat major --- frontend/src/pages/program/DegreeReq/degreeData.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/program/DegreeReq/degreeData.json b/frontend/src/pages/program/DegreeReq/degreeData.json index c0a922c7..bea2c282 100644 --- a/frontend/src/pages/program/DegreeReq/degreeData.json +++ b/frontend/src/pages/program/DegreeReq/degreeData.json @@ -168,7 +168,11 @@ "courses": ["ACTSC", "AMATH", "CO", "CS", "MATBUS", "MATH", "PMATH", "STAT"], "count": 3 } - ] + ], + "minimumAverages": { + "overall": 60, + "mathMajor": 65 + }, }, "BCS, Data Science": { "extends": "BCS, Computer Science", @@ -289,7 +293,7 @@ ["AMATH353", "CO372", "CS476", "PMATH453"], ["ECON101", "ECON120W"], ["ECON102", "ECON140W"], - ["ECON201", "ECON260W"], + ["ECON201", "ECON260W"] ], "additionalRequirements": [ { From c3176f75133d4575ffb88e4690866e21ba31b869 Mon Sep 17 00:00:00 2001 From: Bryan Deng Date: Wed, 28 Aug 2024 12:21:40 -0400 Subject: [PATCH 3/4] add mimimum averages for math finance --- frontend/src/pages/program/DegreeReq/degreeData.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/program/DegreeReq/degreeData.json b/frontend/src/pages/program/DegreeReq/degreeData.json index bea2c282..b736e135 100644 --- a/frontend/src/pages/program/DegreeReq/degreeData.json +++ b/frontend/src/pages/program/DegreeReq/degreeData.json @@ -311,6 +311,10 @@ } } } - ] + ], + "minimumAverages": { + "overall": 60, + "mathMajor": 70 + } } } From f677638c2e459be9c41c6601c871ed4e8733cdb0 Mon Sep 17 00:00:00 2001 From: Bryan Deng Date: Wed, 28 Aug 2024 12:33:08 -0400 Subject: [PATCH 4/4] add pure math --- .../pages/program/DegreeReq/degreeData.json | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/frontend/src/pages/program/DegreeReq/degreeData.json b/frontend/src/pages/program/DegreeReq/degreeData.json index b736e135..e5e3aa78 100644 --- a/frontend/src/pages/program/DegreeReq/degreeData.json +++ b/frontend/src/pages/program/DegreeReq/degreeData.json @@ -256,6 +256,7 @@ { "name": "Additional courses from specified departments", "courses": ["ACTSC", "AMATH", "CO", "CS", "MATBUS", "MATH", "PMATH", "STAT"] + "count": 1 }, { "name": "Additional ACTSC 300- or 400- level", @@ -316,5 +317,35 @@ "overall": 60, "mathMajor": 70 } + }, + "BMath, Pure Mathematics": { + "extends": "BMath", + "requiredCredits": 20, + "coreCourses": [ + ["MATH237", "MATH247"], + ["MATH239", "MATH249"], + "PMATH347", + "PMATH348", + "PMATH351", + "PMATH352", + "PMATH450", + ["PMATH365", "PMATH367"] + ], + "additionalRequirements": [ + { + "name": "PMATH 400- level", + "courses": ["PMATH4"], + "count": 3 + }, + { + "name": "Additional 400- level courses from specified departments", + "courses": ["ACTSC4", "AMATH4", "CO4", "CS4", "MATBUS4", "MATH4", "PMATH4", "STAT4"], + "count": 2 + } + ], + "minimumAverages": { + "overall": 60, + "mathMajor": 65 + } } }