Merge pull request #58 from erik-sth/57-distribution-alg-fallback-str…

…ategys Added sending feedback if alg found solution.
erik-sth · Nov 4, 2023 · 23e5c10 · 23e5c10
2 parents 8cbba5a + 2b2092a
commit 23e5c10
Show file tree

Hide file tree

Showing 5 changed files with 362 additions and 11 deletions.
diff --git a/src/alg/TimeDistribution.ts b/src/alg/TimeDistribution.ts
@@ -26,13 +26,15 @@ function main(
     students: Student[],
     project: Project,
     polls: PollQuestion[]
-): Item[] {
-    let groups = buildGroupsByPaths(polls, students);
+): boolean {
+    const groups = buildGroupsByPaths(polls, students);
     const g = createGraph(items);
-    groups = findPathsForTheGroups(groups, items, g, project);
-    distributeStudentsToPaths(items, groups);
+    const res = findPathsForTheGroups(groups, items, g, project);
+    if (!res) return false;
+    const res2 = distributeStudentsToPaths(items, groups);
+    if (!res2) return false;
     allocateGroupsToItems(items, groups, project);
-    return items;
+    return true;
 }
 
 export { main, getVotingIds };
diff --git a/src/alg/TimeDistribution/DistributeStudents.ts b/src/alg/TimeDistribution/DistributeStudents.ts
@@ -10,26 +10,33 @@ function distributeStudentsToPaths(items: Item[], groups: Group[]) {
         relevantItems,
         amountRelevantStudents(changableGroups)
     );
-    distributeWithMinimumCapacity(changableGroups, relevantItems);
+    return distributeWithMinimumCapacity(changableGroups, relevantItems);
 }
 
 function distributeWithMinimumCapacity(
     changableGroups: Group[],
     relevantItems: Item[]
 ) {
+    let working = true;
     changableGroups.forEach((group) => {
+        let amountStudents = group.studentIds.length;
         group.paths.forEach((path) => {
             const minCapacity = Math.min(
-                ...path.path.map((pathItem) => pathItem.updatedGroupCapacity)
+                ...path.path.map((pathItem) => pathItem.updatedGroupCapacity),
+                group.studentIds.length
             );
             path.valueForTestingStudentDistribution = minCapacity;
+            amountStudents -= minCapacity;
             relevantItems.forEach((item) => {
                 if (path.path.includes(item)) {
                     item.updatedGroupCapacity -= minCapacity;
                 }
             });
         });
+
+        if (amountStudents > 0) working = false;
     });
+    return working;
 }
 
 function amountRelevantStudents(changableGroups: Group[]) {

diff --git a/src/alg/TimeDistribution/FindPaths.ts b/src/alg/TimeDistribution/FindPaths.ts
@@ -10,16 +10,18 @@ function findPathsForTheGroups(
     g: DirectedGraph<Item>,
     project: Project,
     requiredIds: Set<string> = new Set<string>(getDefaultIds(project))
-): Group[] {
+): boolean {
     const entries = g.getNodesWithoutIngoingEdges();
     groups.forEach((group) => {
         const ids = new Set([...requiredIds, ...group.requiredEvents]);
         entries.forEach((entry: GraphNode<Item>) => {
             dfs(entry, ids, [], group.requiredEvents, group, items);
         });
+        if (group.paths.length == 0) {
+            return false;
+        }
     });
-
-    return groups;
+    return true;
 }
 
 function dfs(