Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(PeerChat): Group students randomly #94

Merged
merged 4 commits into from
Feb 17, 2022
Merged

feat(PeerChat): Group students randomly #94

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2808dea
feat(PeerChat): Group students randomly
hirokiterashima Jan 31, 2022
4da96fd
Improve addMembersRandomly efficiency
hirokiterashima Feb 10, 2022
591ad88
Merge branch 'issue-37-peer-interaction' into issue-93-peer-chat-grou…
hirokiterashima Feb 15, 2022
6d93890
Optimize addMembersRandomly method
hirokiterashima Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions src/main/java/org/wise/portal/service/peergroup/impl/PeerGroupServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;

import org.json.JSONException;
Expand Down Expand Up @@ -144,16 +145,38 @@ private boolean isLastOnesLeftToPair(Run run, Group period, List<Workgroup> work
}

private Set<Workgroup> getWorkgroupsInPeerGroupUpToMaxMembership(Workgroup workgroup,
PeerGroupActivity activity, Set<Workgroup> possibleMembers) {
PeerGroupActivity activity, Set<Workgroup> possibleMembers) throws JSONException {
Set<Workgroup> members = new HashSet<Workgroup>();
members.add(workgroup);
possibleMembers.remove(workgroup);
if (activity.getLogicName().equals("random")) {
addMembersRandomly(activity, possibleMembers, members);
} else {
addMembersInOrder(activity, possibleMembers, members);
}
return members;
}

private void addMembersRandomly(PeerGroupActivity activity, Set<Workgroup> possibleMembers,
Set<Workgroup> members) {
List<Workgroup> possibleMembersList = new ArrayList<Workgroup>(possibleMembers);
Random random = new Random();
while (members.size() < activity.getMaxMembershipCount()) {
int randomInt = random.nextInt(possibleMembersList.size());
Workgroup randomWorkgroup = possibleMembersList.get(randomInt);
members.add(randomWorkgroup);
possibleMembersList.remove(randomWorkgroup);
}
}

private void addMembersInOrder(PeerGroupActivity activity, Set<Workgroup> possibleMembers,
Set<Workgroup> members) {
for (Workgroup possibleMember : possibleMembers) {
members.add(possibleMember);
if (members.size() == activity.getMaxMembershipCount()) {
break;
}
}
return members;
}

private Set<Workgroup> getWorkgroupsNotInPeerGroupAndCompletedLogicActivity(
Expand Down