aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2025-04-28 14:24:59 +0200
committerJonas Smedegaard <dr@jones.dk>2025-04-28 14:24:59 +0200
commitd22df4635f2a476178a8137a2b38f94fe72b1362 (patch)
treed83712e995c481fb89644c0a2c1a39970d137bf8
parent8075c97dd59fb393e3a17337dc3859da2b85d3a5 (diff)
rephrase comments
-rw-r--r--src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java
index 4aec572..e91c74e 100644
--- a/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java
+++ b/src/dk.biks.bachelorizer/dk/biks/bachelorizer/Combi.java
@@ -116,7 +116,7 @@ public final class Combi {
}
}
- /// groups of subject modules with no overlapping students
+ /// groups of disjoint choices
///
/// @param g Graph to inspect
/// @return list of non-overlapping sets
@@ -131,11 +131,11 @@ public final class Combi {
return nonOverlapping(g, modules);
}
- /// groups of subject modules with no overlapping students
+ /// groups of disjoint choices seeded by priority list of choices
///
/// @param g Graph to inspect
/// @param vip Ordered list of subject modules to prioritize
- /// @return list of non-overlapping sets
+ /// @return List of sets of disjoint choices
public static ArrayList<Set<Vertex>> nonOverlapping(Graph g, List<Vertex> vip) {
ArrayList<Set<Vertex>> sets = new ArrayList<>();
@@ -186,9 +186,9 @@ System.out.println(" "+v.toString());
/// sum of students' selections as a graph
///
- /// @param sets list of non-overlapping student selections
- /// @param g amount of students choosing each module combination
- /// @return groups of non-overlapping selections as a graph
+ /// @param sets list of disjoint choices
+ /// @param g choices as weights in graph
+ /// @return groups of disjoint choices as a graph
public static Graph moduleGroups(ArrayList<Set<Vertex>> sets, Graph g) {
Graph h = new AdjListGraph();
for (Set<Vertex> s: sets) {
@@ -210,7 +210,7 @@ System.out.println(" "+v.toString());
return h;
}
- /// groups of subject modules with no overlapping students
+ /// groups of disjoint module choices
///
/// @param g groups of non-overlapping selections as a graph
/// @return amount of students in consecutive slots
@@ -222,7 +222,7 @@ System.out.println(" "+v.toString());
return solution(g, v);
}
- /// groups of subject modules with no overlapping students
+ /// groups of disjoint module choices seeded by start vertex
///
/// @param g groups of non-overlapping selections as a graph
/// @param v seed vertex within graph