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

Compare commits

base: quentinlegot:431248b0a45806aff521d83ab0d1c03e00ea2b87
Branches Tags
quentinlegot:ajout_cellule
quentinlegot:master
..
compare: quentinlegot:83e4ccdd22f4960a3356279ed3db6f9a4161eced
Branches Tags
quentinlegot:ajout_cellule
quentinlegot:master

No commits in common. "431248b0a45806aff521d83ab0d1c03e00ea2b87" and "83e4ccdd22f4960a3356279ed3db6f9a4161eced" have entirely different histories.
431248b0a4 ... 83e4ccdd22

5 changed files with 61 additions and 92 deletions
Show Stats Expand all files Collapse all files

36
plot/main.py
View File

@ -45,21 +45,6 @@ def delay(arr: list[tuple[int, np.ndarray]]) -> np.ndarray:
nb += 1
return delays
def rb_allocate_distance(arr: list[tuple[int, np.ndarray]], distance) -> np.ndarray:
allocate = np.zeros((size, 2))
nb = 0
arr.sort()
for nb_users, data in arr:
n = 0
for x in data[:,6]:
if int(x) == distance:
n+=1
allocate[nb, 0] = nb_users
allocate[nb, 1] = n
print(n/data.shape[0])
nb += 1
return allocate
np_arr: list[tuple[int, np.ndarray]] = list()
for i in nb_files:
@ -67,13 +52,6 @@ for i in nb_files:
averages = mean_mkn(np_arr)
available = rb_available(np_arr)
allocate_lp1 = rb_allocate_distance(np_arr, 200)
allocate_lp2 = rb_allocate_distance(np_arr, 400)
allocate_total = allocate_lp1[:, 1] + allocate_lp2[:, 1]
print(allocate_total)
delays = delay(np_arr)
delays.sort(axis=0)
# Data for plotting
@ -92,18 +70,4 @@ ax[1, 0].scatter(delays[:, 0], delays[:, 1])
ax[1, 0].set(xlabel='number of users', ylabel='delays(ms)', title='Delay')
ax[1, 0].grid()
available.sort(axis=0)
#ax[1, 1].scatter(allocate_lp1[:, 0], (allocate_lp1[:, 1]/(allocate_lp1[:, 1])+allocate_lp2[:, 1])*100)
ax[1, 1].plot(available[:, 0], (allocate_lp1[:, 1]/(allocate_lp1[:, 1]+allocate_lp2[:, 1])*100))
#ax[1, 1].scatter(allocate_lp2[:, 0], (allocate_lp2[:, 1]/(allocate_lp1[:, 1])+allocate_lp2[:, 1])*100)
ax[1, 1].plot(available[:, 0], (allocate_lp2[:, 1]/(allocate_lp1[:, 1]+allocate_lp2[:, 1])*100))
ax[1, 1].set(xlabel='number of users', ylabel='RB utilisés proche/loin/total', title='RB utilisés distance')
ax[1, 1].grid()
plt.ylim(0, 100)
plt.show()

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

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

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

@ -1,18 +1,18 @@
package fr.ntr.scheduler;
import java.util.List;
import fr.ntr.AccessPoint;
import fr.ntr.Packets;
import fr.ntr.ResourceBlock;
import fr.ntr.User;
public class MaxSNR extends Scheduler {
private final List<User> users;
private List<User> users;
private final ResourceBlock[][] frame;
private ResourceBlock[][] frame;
public MaxSNR(ResourceBlock[][] frame, List<User> users) {
public MaxSNR( ResourceBlock[][] frame, List<User> users) {
this.frame = frame;
this.users = users;
}
@ -20,8 +20,8 @@ public class MaxSNR extends Scheduler {
@Override
public void scheduling(int ticks) {
User userMax;
for(int ts = 0; ts < AccessPoint.getTimeSlotNb(); ts++){
for(int sp = 0; sp < AccessPoint.getSubCarrierNb(); sp++){
for(int ts = 0; ts < 2; ts++){
for(int sp = 0; sp < 100; sp++){
userMax = userSelection(ts, sp);
allocateRessource(userMax, frame, ts, sp, ticks);
}
@ -36,10 +36,11 @@ public class MaxSNR extends Scheduler {
double maxSnr = 0.0;
User userMax = null;
for(User u: users) {
if (!u.getPacketsToSend().isEmpty() && (maxSnr < u.getBandwidthTable()[ts][sp])) {
maxSnr = u.getBandwidthTable()[ts][sp];
userMax = u;
if (!u.getPacketsToSend().isEmpty()) {
if (maxSnr < u.getBandwidthTable()[ts][sp]) {
maxSnr = u.getBandwidthTable()[ts][sp];
userMax = u;
}
}
}
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.List;
import fr.ntr.AccessPoint;
import fr.ntr.ResourceBlock;
import fr.ntr.User;
public class ProportionalFair extends Scheduler {
private final List<User> users;
private final ResourceBlock[][] frame;
private List<User> users;
private ResourceBlock[][] frame;
public ProportionalFair(ResourceBlock[][] frame, List<User> users) {
this.frame = frame;
@ -20,29 +20,35 @@ public class ProportionalFair extends Scheduler {
@Override
public void scheduling(int ticks) {
for(int ts = 0; ts < AccessPoint.getTimeSlotNb(); ts++){
for(int sp = 0; sp < AccessPoint.getSubCarrierNb(); sp++){
User selectedUser = userSelection(ts, sp, users);
ArrayList<Double> averageBandwiths = new ArrayList<Double>();
for(User u : users){
double avg = 0d;
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);
}
}
}
private User userSelection(int ts, int sp, List<User> users) {
private User userSelection(int ts, int sp, List<User> users, List<Double> averageBandwiths) {
double PF = 0.0;
User selectedUser = null;
for (User u : users) {
double avg = 0d;
double[][] bandwidthTable = u.getBandwidthTable();
for (double[] doubles : bandwidthTable) {
for (double aDouble : doubles) {
avg += aDouble;
}
}
avg = avg / (bandwidthTable.length * bandwidthTable[0].length);
for(int i = 0; i < users.size(); i++){
User u = users.get(i);
double mkn = u.getBandwidthTable()[ts][sp];
double pf = mkn / avg;
if (PF < pf) {
double averageMkn = averageBandwiths.get(i);
double pf = mkn / averageMkn;
if (PF < pf){
PF = pf;
selectedUser = u;
}

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

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