diff --git a/src/main/java/fr/ntr/AccessPoint.java b/src/main/java/fr/ntr/AccessPoint.java index 985fea3..736a2aa 100644 --- a/src/main/java/fr/ntr/AccessPoint.java +++ b/src/main/java/fr/ntr/AccessPoint.java @@ -14,9 +14,7 @@ public class AccessPoint { private Cell cell1; private Cell cell2; - private List users; - private FileOutputStream outputDataFile; public AccessPoint(Cell cell1, Cell cell2){ @@ -29,6 +27,7 @@ public class AccessPoint { * @param duration */ public void startSimulation(int duration) { + /* try{ Files.deleteIfExists(Paths.get("export", this.users.size() + ".csv")); new File("export").mkdir(); @@ -39,6 +38,7 @@ public class AccessPoint { System.exit(1); return; } + */ for (int ticks = 0; ticks < duration; ++ticks) { // Simulation cell1.reset(); @@ -58,8 +58,6 @@ public class AccessPoint { } } - - /* private void analyseData(int tick) throws IOException { for(int i = 0; i < frame.length; i++) { @@ -80,5 +78,4 @@ public class AccessPoint { } */ - } diff --git a/src/main/java/fr/ntr/Cell.java b/src/main/java/fr/ntr/Cell.java index 65bf78c..c6d737b 100644 --- a/src/main/java/fr/ntr/Cell.java +++ b/src/main/java/fr/ntr/Cell.java @@ -8,9 +8,12 @@ import java.util.Random; public class Cell { private List users; + /** + * scheduler utilisé par la cellule + */ private Scheduler scheduler; /** - * nombre de slots + * Nombre de slots */ private static int timeSlotNb; /** @@ -18,7 +21,7 @@ public class Cell { */ private static int subCarrierNb; /** - * trame + * Trame */ private ResourceBlock[][] frame; /** diff --git a/src/main/java/fr/ntr/Main.java b/src/main/java/fr/ntr/Main.java index 0029ac7..8462de4 100644 --- a/src/main/java/fr/ntr/Main.java +++ b/src/main/java/fr/ntr/Main.java @@ -28,10 +28,12 @@ public class Main { for(int i = 2; i < maximumLoad; i+=2) { List users = generateUsers(i, timeSlotNb, subCarrierNb); ResourceBlock[][] frame = new ResourceBlock[timeSlotNb][subCarrierNb]; - Scheduler scheduler = new MaxSNR(frame, users); + //TODO : changes schedulers + Scheduler schedulerCell1 = new MaxSNR(frame, users); + Scheduler schedulerCell2 = new MaxSNR(frame, users); //TODO : modify cells parameters ? - Cell cell1 = new Cell(scheduler, frame, users, timeSlotNb, subCarrierNb, 0, 50); - Cell cell2 = new Cell(scheduler, frame, users, timeSlotNb, subCarrierNb, 0, 50); + Cell cell1 = new Cell(schedulerCell1, frame, users, timeSlotNb, subCarrierNb, 0, 50); + Cell cell2 = new Cell(schedulerCell2, frame, users, timeSlotNb, subCarrierNb, 0, 50); AccessPoint accessPoint = new AccessPoint(cell1, cell2); accessPoint.startSimulation(numberOfTicks); } diff --git a/src/main/java/fr/ntr/scheduler/MaxSNR.java b/src/main/java/fr/ntr/scheduler/MaxSNR.java index be11b54..504d1f5 100644 --- a/src/main/java/fr/ntr/scheduler/MaxSNR.java +++ b/src/main/java/fr/ntr/scheduler/MaxSNR.java @@ -7,10 +7,8 @@ import fr.ntr.User; public class MaxSNR extends Scheduler { private List users; - private ResourceBlock[][] frame; - public MaxSNR( ResourceBlock[][] frame, List users) { this.frame = frame; this.users = users;