sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/sorting_bugs' into 'master'

Browse Source 
Fix sorting bugs

See merge request cse1105/2018-2019/oopp-group-43/template!76
This commit is contained in:
Ceren Ugurlu
2019-04-08 12:37:57 +00:00
parent 83611c4ecc b99b66b87b
commit 7043f7253d
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Client/src/main/java/greenify/client/controller/DashBoardController.java
View File

@@ -317,24 +317,23 @@ public class DashBoardController {
* Sorts the scores of users. * Sorts the scores of users.
* @param users the list of users * @param users the list of users
*/ */
public List<String> sortScores(List<String> users) throws InterruptedException { public void sortScores(List<String> users) throws InterruptedException {
for (int i = 0; i < users.size(); i++) { for (int i = 0; i < users.size(); i++) {
for (int j = 0; j < users.size(); j++) { for (int j = 0; j < users.size(); j++) {
Double first = userService.getFootprint(users.get(i)); Double first = userService.getFootprint(users.get(i));
Double second = userService.getFootprint(users.get(j)); Double second = userService.getFootprint(users.get(j));
if (i < j && first > second) { if (i < j && (first.compareTo(second) < 0)) {
String temp = users.get(i); String temp = users.get(i);
users.set(i, users.get(j)); users.set(i, users.get(j));
users.set(j, temp); users.set(j, temp);
} }
if (i > j && first < second) { if (i > j && (first.compareTo(second) > 0)) {
String temp = users.get(i); String temp = users.get(i);
users.set(i, users.get(j)); users.set(i, users.get(j));
users.set(j, temp); users.set(j, temp);
} }
} }
} }
return users;
} }
/** /**
@@ -584,16 +583,16 @@ public class DashBoardController {
//global leaderboard //global leaderboard
globalLeaderboard.getItems().clear(); globalLeaderboard.getItems().clear();
globalLeaderData.removeAll(); globalLeaderData.removeAll();
List<String> userList = userService.getAllUsers();
List<String> firstList = sortScores(userList);
//development leaderboard //development leaderboard
developmentLeaderboard.getItems().clear(); developmentLeaderboard.getItems().clear();
developmentData.removeAll(); developmentData.removeAll();
List<String> secondList = sortDiffScores(userList); List<String> userList = userService.getAllUsers();
sortScores(userList);
for (int i = userList.size() - 1; i >= 0; i--) { for (int i = userList.size() - 1; i >= 0; i--) {
Friend user = new Friend(firstList.get(i), userService.getFootprint(firstList.get(i))); Friend user = new Friend(userList.get(i), userService.getFootprint(userList.get(i)));
globalLeaderData.add(user); globalLeaderData.add(user);
} }
List<String> secondList = sortDiffScores(userList);
for (int j = 0; j < userList.size(); j++) { for (int j = 0; j < userList.size(); j++) {
double diff = Math.round((userService.getFirstFootprint(secondList.get(j)) double diff = Math.round((userService.getFirstFootprint(secondList.get(j))
- userService.getFootprint(secondList.get(j))) * 10) / 10.0; - userService.getFootprint(secondList.get(j))) * 10) / 10.0;
@@ -620,7 +619,7 @@ public class DashBoardController {
friendLeaderboard.getItems().clear(); friendLeaderboard.getItems().clear();
friendLeaderData.removeAll(); friendLeaderData.removeAll();
sortDiffScores(wholeList); sortDiffScores(wholeList);
for (int i = 0; i < friendList.size(); i++) { for (int i = friendList.size() - 1; i >= 0 ; i--) {
Friend user = new Friend(friendList.get(i), userService Friend user = new Friend(friendList.get(i), userService
.getFootprint(friendList.get(i))); .getFootprint(friendList.get(i)));
data.add(user); data.add(user);