conflit 1

This commit is contained in:
Tr1xt4n 2023-03-10 11:01:51 +01:00
parent ad8b56454c
commit 57b477a578
2 changed files with 3 additions and 12 deletions

View File

@ -11,17 +11,8 @@ public class MaxSNR extends Scheduler {
public void scheduling() { public void scheduling() {
} }
private User selectionUtilisateur(int Ts, int Sp, List<User> Users) { private void selectionUtilisateur(List<User> Users) {
User selectedUser = null; for(User u: Users)
double maxSNR= 0;
for (User user : Users) {
double snr = ;
if (snr > maxSNR) {
maxSNR = snr;
selectedUser = user;
}
}
return selectedUser;
} }
public MaxSNR(String name) { public MaxSNR(String name) {

View File

@ -27,7 +27,7 @@ public class RoundRobin extends Scheduler {
* Entry Time slot (int), Sous porteuse(int), and users ( List<User>) * Entry Time slot (int), Sous porteuse(int), and users ( List<User>)
* Return the user in function of TS and SP selected * Return the user in function of TS and SP selected
*/ */
private UserGroup UserSelection(int Ts, int Sp, List<UserGroup> Users) { private UserGroup UserSelection(int Ts, int Sp, UserGroup Users) {
for (int i = 0; i < Ts; i++) { for (int i = 0; i < Ts; i++) {
for (int j = 0; j < Sp; j++) { for (int j = 0; j < Sp; j++) {
index++; index++;