diff --git a/src/main/java/fr/ntr/Main.java b/src/main/java/fr/ntr/Main.java index e8603aa..3796cd7 100644 --- a/src/main/java/fr/ntr/Main.java +++ b/src/main/java/fr/ntr/Main.java @@ -19,6 +19,7 @@ public class Main { System.exit(1); return; } + AccessPoint accessPoint = new AccessPoint(new RoundRobin("round robin", 0), 0, 50); accessPoint.startSimulation(numberOfTicks, maximumLoad); } else { diff --git a/src/main/java/fr/ntr/scheduler/MaxSNR.java b/src/main/java/fr/ntr/scheduler/MaxSNR.java index a762cda..c346bfd 100644 --- a/src/main/java/fr/ntr/scheduler/MaxSNR.java +++ b/src/main/java/fr/ntr/scheduler/MaxSNR.java @@ -1,9 +1,7 @@ package fr.ntr.scheduler; import java.util.List; -import fr.ntr.AccessPoint; import fr.ntr.User; -import fr.ntr.UserGroup; public class MaxSNR extends Scheduler { diff --git a/src/main/java/fr/ntr/scheduler/RoundRobin.java b/src/main/java/fr/ntr/scheduler/RoundRobin.java index 7431ef0..2e806fe 100644 --- a/src/main/java/fr/ntr/scheduler/RoundRobin.java +++ b/src/main/java/fr/ntr/scheduler/RoundRobin.java @@ -15,11 +15,9 @@ public class RoundRobin extends Scheduler { private List users; private ResourceBlock[][] frame; - public RoundRobin(String name, int index, List users, ResourceBlock[][] frame ) { + public RoundRobin(String name, int index) { this.name = name; this.index = index; - this.users = users; - this.frame = frame; } /** @@ -53,14 +51,14 @@ 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 User UserSelection(int Ts, int Sp, List Users) { + private User UserSelection(int Ts, int Sp, List users) { for (int i = 0; i < Ts; i++){ for (int j = 0; j < Sp; j++) { index++; } } - return Users.get(index%(Users.size() - 1)); + return users.get(index%(users.size() - 1)); } }