modify allowDoubleCounting function to be more accurate

cornell-dti · Jan 8, 2022 · 03f3840 · 03f3840
1 parent 0333c45
commit 03f3840
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/components/Requirements/IncompleteSelfCheck.vue b/src/components/Requirements/IncompleteSelfCheck.vue
@@ -152,7 +152,8 @@ export default defineComponent({
           this.selfCheckCourses[option].uniqueID,
           store.state.groupedRequirementFulfillmentReport,
           store.state.toggleableRequirementChoices,
-          store.state.userRequirementsMap
+          store.state.userRequirementsMap,
+          store.state.onboardingData.major
         ),
       }));
     },
@@ -177,7 +178,8 @@ export default defineComponent({
             newCourse.uniqueID,
             store.state.groupedRequirementFulfillmentReport,
             store.state.toggleableRequirementChoices,
-            store.state.userRequirementsMap
+            store.state.userRequirementsMap,
+            store.state.onboardingData.major
           ),
         }),
         this.$gtag

diff --git a/src/components/Semester/Semester.vue b/src/components/Semester/Semester.vue
@@ -285,7 +285,8 @@ export default defineComponent({
               uniqueID,
               store.state.groupedRequirementFulfillmentReport,
               store.state.toggleableRequirementChoices,
-              store.state.userRequirementsMap
+              store.state.userRequirementsMap,
+              store.state.onboardingData.major
             ).filter(it => it !== requirementID);
             choices[uniqueID] = { ...choice, optOut };
           });

diff --git a/src/requirements/requirement-frontend-utils.ts b/src/requirements/requirement-frontend-utils.ts
@@ -445,7 +445,8 @@ export function getAllEligibleRelatedRequirementIds(
   uniqueId: number,
   groupedRequirements: readonly GroupedRequirementFulfillmentReport[],
   toggleableRequirementChoices: AppToggleableRequirementChoices,
-  userRequirementsMap: Readonly<Record<string, RequirementWithIDSourceType>>
+  userRequirementsMap: Readonly<Record<string, RequirementWithIDSourceType>>,
+  majors: readonly string[]
 ): readonly string[] {
   const requirements = groupedRequirements
     .flatMap(it => it.reqs)
@@ -465,7 +466,9 @@ export function getAllEligibleRelatedRequirementIds(
   const constraintViolations = getConstraintViolationsForSingleCourse(
     { uniqueId },
     requirements,
-    requirementID => userRequirementsMap[requirementID].allowCourseDoubleCounting || false
+    requirementID =>
+      !!userRequirementsMap[requirementID] &&
+      requirementAllowDoubleCounting(userRequirementsMap[requirementID], majors)
   );
   if (constraintViolations) {
     const { constraintViolationsGraph } = constraintViolations;

diff --git a/src/requirements/requirement-graph-builder-from-user-data.ts b/src/requirements/requirement-graph-builder-from-user-data.ts
@@ -1,5 +1,5 @@
 import { CREDITS_COURSE_ID } from './data/constants';
-import { getUserRequirements } from './requirement-frontend-utils';
+import { getUserRequirements, requirementAllowDoubleCounting } from './requirement-frontend-utils';
 import RequirementFulfillmentGraph from './requirement-graph';
 import {
   BuildRequirementFulfillmentGraphParameters,
@@ -114,7 +114,9 @@ export default function buildRequirementFulfillmentGraphFromUserData(
   const safeRequirementFulfillmentGraph = dangerousRequirementFulfillmentGraph.copy();
   const { doubleCountedCourseUniqueIDSet } = removeIllegalEdgesFromRequirementFulfillmentGraph(
     safeRequirementFulfillmentGraph,
-    requirementID => userRequirementsMap[requirementID].allowCourseDoubleCounting || false
+    requirementID =>
+      !!userRequirementsMap[requirementID] &&
+      requirementAllowDoubleCounting(userRequirementsMap[requirementID], onboardingData.major)
   );
 
   return {