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

fixed comparison in computeInterference

Browse Source
This commit is contained in:
Loris 2023-03-30 06:30:37 +02:00
parent 21ae722975
commit f6407b1584
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/fr/ntr/AccessPoint.java
View File

@ -12,8 +12,8 @@ import fr.ntr.scheduler.Scheduler;
public class AccessPoint { public class AccessPoint {
private Cell cell1; private final Cell cell1;
private Cell cell2; private final Cell cell2;
private List<User> users; private List<User> users;
private FileOutputStream outputDataFile; private FileOutputStream outputDataFile;
@ -75,7 +75,7 @@ public class AccessPoint {
double bandwidth1 = frameCell1[k][l].getBandwidth(); double bandwidth1 = frameCell1[k][l].getBandwidth();
double bandwidth2 = frameCell2[k][l].getBandwidth(); double bandwidth2 = frameCell2[k][l].getBandwidth();
//User proche //User proche
if (user1.getDistance() > 200d) { if (user1.getDistance() < 200d) {
frameCell1[k][l].setBandwidth(bandwidth1 / 2); frameCell1[k][l].setBandwidth(bandwidth1 / 2);
frameCell2[k][l].setBandwidth(bandwidth2 / 2); frameCell2[k][l].setBandwidth(bandwidth2 / 2);
} }

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

@ -25,7 +25,7 @@ public class Main {
} }
int timeSlotNb = 2; int timeSlotNb = 2;
int subCarrierNb = 100; int subCarrierNb = 100;
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];
//TODO : changes schedulers //TODO : changes schedulers