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

Fix integration of python with the java project

Browse Source
This commit is contained in:
Quentin Legot 2023-03-24 10:48:49 +01:00
parent 2db4e91962
commit e7b9f75035
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -11,7 +11,7 @@ plugins {
} }
run { run {
args = ["1000", "250"] args = ["10000", "50"]
} }
application { application {

12
plot/main.py
View File

@ -3,15 +3,7 @@ import matplotlib.pyplot as plt
import numpy as np import numpy as np
import pandas as pd import pandas as pd
""" nb_files = os.listdir(".." + os.sep + "export")
data = pd.read_csv("data.csv", delimiter=';').to_numpy()
tick = data[:, 0]
rb = data[:, 4]
"""
nb_files = os.listdir('export/')
size = len(nb_files) size = len(nb_files)
@ -19,7 +11,7 @@ size = len(nb_files)
averages = np.empty((size, 2)) averages = np.empty((size, 2))
nb = 0 nb = 0
for i in nb_files: for i in nb_files:
data = pd.read_csv("export" + os.sep + i, delimiter=';').to_numpy() data = pd.read_csv(".." + os.sep + "export" + os.sep + i, delimiter=';').to_numpy()
rb = data[:, 4] rb = data[:, 4]
total = 0.0 total = 0.0

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

@ -28,7 +28,7 @@ public class ProportionalFair extends Scheduler {
} }
} }
avg = avg / (bandwidthTable.length * bandwidthTable[0].length); avg = avg / (bandwidthTable.length * bandwidthTable[0].length);
averageBandwiths.add(new Double(avg)); averageBandwiths.add(avg);
} }
User selectedUser = null; User selectedUser = null;
for(int ts = 0; ts < 2; ts++){ for(int ts = 0; ts < 2; ts++){