diff --git a/src/main/java/fr/ntr/AccessPoint.java b/src/main/java/fr/ntr/AccessPoint.java index 34b57e5..6ca436d 100644 --- a/src/main/java/fr/ntr/AccessPoint.java +++ b/src/main/java/fr/ntr/AccessPoint.java @@ -7,7 +7,7 @@ public class AccessPoint { private final Cell cell1; private final Cell cell2; - private final Boolean reuse3 = false; + private final boolean reuse3 = false; public AccessPoint (Cell cell1, Cell cell2){ this.cell1 = cell1; @@ -29,15 +29,15 @@ public class AccessPoint { cell1.preScheduling(); cell2.preScheduling(); for(int ts = 0; ts < Cell.getTimeSlotNb(); ts++) { - for (int sp = 0; sp < (reuse3 ? Cell.getSubCarrierNb() : Cell.getSubCarrierNb()/2); sp++) { - User user1 = cell1.schedule(ticks, ts, sp); - User user2 = cell2.schedule(ticks, ts, reuse3 ? 0 : 50 + sp); - boolean haveInterference = user1 == user2 && user1 != null; - cell1.consumeResource(ticks, ts, sp, haveInterference); - cell2.consumeResource(ticks, ts, sp, haveInterference); + for (int sp = 0; sp < (reuse3 ? Cell.getSubCarrierNb() : Cell.getSubCarrierNb()/2); sp++) { + User user1 = cell1.schedule(ticks, ts, sp); + User user2 = cell2.schedule(ticks, ts, reuse3 ? 0 : 50 + sp); + boolean haveInterference = user1 == user2 && user1 != null; + cell1.consumeResource(ticks, ts, sp, haveInterference); + cell2.consumeResource(ticks, ts, sp, haveInterference); - cell1.postScheduling(user1); - cell2.postScheduling(user2); + cell1.postScheduling(user1); + cell2.postScheduling(user2); } }