From 57b477a5782889cd3c4f5f7fb808499efb0a1ee0 Mon Sep 17 00:00:00 2001 From: Tr1xt4n Date: Fri, 10 Mar 2023 11:01:51 +0100 Subject: [PATCH] conflit 1 --- src/main/java/fr/ntr/scheduler/MaxSNR.java | 13 ++----------- src/main/java/fr/ntr/scheduler/RoundRobin.java | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main/java/fr/ntr/scheduler/MaxSNR.java b/src/main/java/fr/ntr/scheduler/MaxSNR.java index 5347c32..4dca0c4 100644 --- a/src/main/java/fr/ntr/scheduler/MaxSNR.java +++ b/src/main/java/fr/ntr/scheduler/MaxSNR.java @@ -11,17 +11,8 @@ public class MaxSNR extends Scheduler { public void scheduling() { } - private User selectionUtilisateur(int Ts, int Sp, List Users) { - User selectedUser = null; - double maxSNR= 0; - for (User user : Users) { - double snr = ; - if (snr > maxSNR) { - maxSNR = snr; - selectedUser = user; - } - } - return selectedUser; + private void selectionUtilisateur(List Users) { + for(User u: Users) } public MaxSNR(String name) { diff --git a/src/main/java/fr/ntr/scheduler/RoundRobin.java b/src/main/java/fr/ntr/scheduler/RoundRobin.java index f181539..2d8f8b6 100644 --- a/src/main/java/fr/ntr/scheduler/RoundRobin.java +++ b/src/main/java/fr/ntr/scheduler/RoundRobin.java @@ -27,7 +27,7 @@ public class RoundRobin extends Scheduler { * Entry Time slot (int), Sous porteuse(int), and users ( List) * Return the user in function of TS and SP selected */ - private UserGroup UserSelection(int Ts, int Sp, List Users) { + private UserGroup UserSelection(int Ts, int Sp, UserGroup Users) { for (int i = 0; i < Ts; i++) { for (int j = 0; j < Sp; j++) { index++;