quentinlegot/ntr-interferences
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/18008147/ntr

Browse Source
This commit is contained in:
Tr1xt4n 2023-04-04 11:08:48 +02:00
commit 376c76b17c
4 changed files with 54 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/fr/ntr/Main.java
View File

@ -1,6 +1,7 @@
package fr.ntr; package fr.ntr;
import fr.ntr.scheduler.RoundRobin; import fr.ntr.scheduler.MaxSNR;
import fr.ntr.scheduler.ProportionalFair;
import fr.ntr.scheduler.Scheduler; import fr.ntr.scheduler.Scheduler;
import java.io.File; import java.io.File;
@ -10,6 +11,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
public class Main { public class Main {
@ -44,16 +46,23 @@ public class Main {
}); });
AccessPoint.setTimeSlotNb(timeSlotNb); AccessPoint.setTimeSlotNb(timeSlotNb);
AccessPoint.setSubCarrierNb(subCarrierNb); AccessPoint.setSubCarrierNb(subCarrierNb);
try(ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors())) { ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
for(int i = 2; i <= maximumLoad; i += 2) { for(int i = 2; i <= maximumLoad; i += 2) {
List<User> users = generateUsers(i, timeSlotNb, subCarrierNb); List<User> users = generateUsers(i, timeSlotNb, subCarrierNb);
ResourceBlock[][] frame = new ResourceBlock[timeSlotNb][subCarrierNb]; ResourceBlock[][] frame = new ResourceBlock[timeSlotNb][subCarrierNb];
// Scheduler scheduler = new MaxSNR(frame, users); // Scheduler scheduler = new MaxSNR(frame, users);
// Scheduler scheduler = new ProportionalFair(frame, users); Scheduler scheduler = new ProportionalFair(frame, users);
Scheduler scheduler = new RoundRobin(frame, users); // Scheduler scheduler = new RoundRobin(frame, users);
AccessPoint accessPoint = new AccessPoint(scheduler, frame, users); AccessPoint accessPoint = new AccessPoint(scheduler, frame, users);
executor.submit(() -> accessPoint.startSimulation(numberOfTicks)); executor.submit(() -> accessPoint.startSimulation(numberOfTicks));
} }
executor.shutdown();
try {
if(!executor.awaitTermination(2, TimeUnit.MINUTES)) {
executor.shutdownNow();
}
} catch (InterruptedException e) {
e.printStackTrace();
} }
} else { } else {
System.err.println("Please give launch arguments"); System.err.println("Please give launch arguments");

17
src/main/java/fr/ntr/scheduler/MaxSNR.java
View File

@ -1,18 +1,18 @@
package fr.ntr.scheduler; package fr.ntr.scheduler;
import java.util.List; import java.util.List;
import fr.ntr.Packets; import fr.ntr.AccessPoint;
import fr.ntr.ResourceBlock; import fr.ntr.ResourceBlock;
import fr.ntr.User; import fr.ntr.User;
public class MaxSNR extends Scheduler { public class MaxSNR extends Scheduler {
private List<User> users; private final List<User> users;
private ResourceBlock[][] frame; private final ResourceBlock[][] frame;
public MaxSNR( ResourceBlock[][] frame, List<User> users) { public MaxSNR(ResourceBlock[][] frame, List<User> users) {
this.frame = frame; this.frame = frame;
this.users = users; this.users = users;
} }
@ -20,8 +20,8 @@ public class MaxSNR extends Scheduler {
@Override @Override
public void scheduling(int ticks) { public void scheduling(int ticks) {
User userMax; User userMax;
for(int ts = 0; ts < 2; ts++){ for(int ts = 0; ts < AccessPoint.getTimeSlotNb(); ts++){
for(int sp = 0; sp < 100; sp++){ for(int sp = 0; sp < AccessPoint.getSubCarrierNb(); sp++){
userMax = userSelection(ts, sp); userMax = userSelection(ts, sp);
allocateRessource(userMax, frame, ts, sp, ticks); allocateRessource(userMax, frame, ts, sp, ticks);
} }
@ -36,11 +36,10 @@ public class MaxSNR extends Scheduler {
double maxSnr = 0.0; double maxSnr = 0.0;
User userMax = null; User userMax = null;
for(User u: users) { for(User u: users) {
if (!u.getPacketsToSend().isEmpty()) { if (!u.getPacketsToSend().isEmpty() && (maxSnr < u.getBandwidthTable()[ts][sp])) {
if (maxSnr < u.getBandwidthTable()[ts][sp]) {
maxSnr = u.getBandwidthTable()[ts][sp]; maxSnr = u.getBandwidthTable()[ts][sp];
userMax = u; userMax = u;
}
} }
} }
return userMax; return userMax;

42
src/main/java/fr/ntr/scheduler/ProportionalFair.java
View File

@ -3,15 +3,15 @@ package fr.ntr.scheduler;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import fr.ntr.AccessPoint;
import fr.ntr.ResourceBlock; import fr.ntr.ResourceBlock;
import fr.ntr.User; import fr.ntr.User;
public class ProportionalFair extends Scheduler { public class ProportionalFair extends Scheduler {
private final List<User> users;
private List<User> users; private final ResourceBlock[][] frame;
private ResourceBlock[][] frame;
public ProportionalFair(ResourceBlock[][] frame, List<User> users) { public ProportionalFair(ResourceBlock[][] frame, List<User> users) {
this.frame = frame; this.frame = frame;
@ -20,35 +20,29 @@ public class ProportionalFair extends Scheduler {
@Override @Override
public void scheduling(int ticks) { public void scheduling(int ticks) {
ArrayList<Double> averageBandwiths = new ArrayList<Double>(); for(int ts = 0; ts < AccessPoint.getTimeSlotNb(); ts++){
for(User u : users){ for(int sp = 0; sp < AccessPoint.getSubCarrierNb(); sp++){
double avg = 0d; User selectedUser = userSelection(ts, sp, users);
double[][] bandwidthTable = u.getBandwidthTable();
for(int i = 0; i < bandwidthTable.length; i++){
for(int j = 0; j < bandwidthTable[i].length; j++){
avg += bandwidthTable[i][j];
}
}
avg = avg / (bandwidthTable.length * bandwidthTable[0].length);
averageBandwiths.add(avg);
}
for(int ts = 0; ts < 2; ts++){
for(int sp = 0; sp < 100; sp++){
User selectedUser = userSelection(ts, sp, users, averageBandwiths);
allocateRessource(selectedUser, frame, ts, sp, ticks); allocateRessource(selectedUser, frame, ts, sp, ticks);
} }
} }
} }
private User userSelection(int ts, int sp, List<User> users, List<Double> averageBandwiths) { private User userSelection(int ts, int sp, List<User> users) {
double PF = 0.0; double PF = 0.0;
User selectedUser = null; User selectedUser = null;
for(int i = 0; i < users.size(); i++){ for (User u : users) {
User u = users.get(i); double avg = 0d;
double[][] bandwidthTable = u.getBandwidthTable();
for (double[] doubles : bandwidthTable) {
for (double aDouble : doubles) {
avg += aDouble;
}
}
avg = avg / (bandwidthTable.length * bandwidthTable[0].length);
double mkn = u.getBandwidthTable()[ts][sp]; double mkn = u.getBandwidthTable()[ts][sp];
double averageMkn = averageBandwiths.get(i); double pf = mkn / avg;
double pf = mkn / averageMkn; if (PF < pf) {
if (PF < pf){
PF = pf; PF = pf;
selectedUser = u; selectedUser = u;
} }

10
src/main/java/fr/ntr/scheduler/Scheduler.java
View File

@ -16,7 +16,6 @@ public abstract class Scheduler {
protected void allocateRessource(User userMax, ResourceBlock[][] frame, int ts, int sp, int ticks) { protected void allocateRessource(User userMax, ResourceBlock[][] frame, int ts, int sp, int ticks) {
if (userMax != null && !userMax.getPacketsToSend().isEmpty()) { if (userMax != null && !userMax.getPacketsToSend().isEmpty()) {
Packets p = userMax.getPacketsToSend().get(userMax.getPacketsToSend().size()-1); Packets p = userMax.getPacketsToSend().get(userMax.getPacketsToSend().size()-1);
if(p.getBitsNumberRemaining() >= 0){
p.decreaseBitsNumberRemaining((int) userMax.getBandwidthTable()[ts][sp]); p.decreaseBitsNumberRemaining((int) userMax.getBandwidthTable()[ts][sp]);
if(p.getBitsNumberRemaining() <= 0) { if(p.getBitsNumberRemaining() <= 0) {
if(ticks == 0){ if(ticks == 0){
@ -27,15 +26,6 @@ public abstract class Scheduler {
userMax.getPacketsSent().add(p); userMax.getPacketsSent().add(p);
userMax.getPacketsToSend().remove(p); userMax.getPacketsToSend().remove(p);
} }
} else {
if(ticks == 0){
p.setDurationSending(1);
}else {
p.setDurationSending(ticks);
}
userMax.getPacketsSent().add(p);
userMax.getPacketsToSend().remove(p);
}
frame[ts][sp].setUser(userMax); frame[ts][sp].setUser(userMax);
frame[ts][sp].setBandwidth(userMax.getBandwidthTable()[ts][sp]); frame[ts][sp].setBandwidth(userMax.getBandwidthTable()[ts][sp]);
} }