From 526c1172178bab3d4fe01fb691e927d66c6b41e6 Mon Sep 17 00:00:00 2001 From: iboyeau Date: Fri, 3 Mar 2023 11:10:37 +0100 Subject: [PATCH 1/3] MaxSnr / roundRobin --- src/main/java/fr/ntr/scheduler/MaxSNR.java | 21 +++++++++++++++++++ .../java/fr/ntr/scheduler/RoundRobin.java | 19 ++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/ntr/scheduler/MaxSNR.java b/src/main/java/fr/ntr/scheduler/MaxSNR.java index d619ed2..df23422 100644 --- a/src/main/java/fr/ntr/scheduler/MaxSNR.java +++ b/src/main/java/fr/ntr/scheduler/MaxSNR.java @@ -1,8 +1,29 @@ package fr.ntr.scheduler; +import java.util.List; +import fr.ntr.User; public class MaxSNR extends Scheduler { + private String name; + + @Override public void scheduling() { } + + @Override + protected void TraitementDonnées() { + // TODO Auto-generated method stub + + } + + private void selectionUtilisateur(int Ts, int Sp, List Users) { + + } + + public MaxSNR(String name) { + this.name = name; + } + + } diff --git a/src/main/java/fr/ntr/scheduler/RoundRobin.java b/src/main/java/fr/ntr/scheduler/RoundRobin.java index 963c021..8682616 100644 --- a/src/main/java/fr/ntr/scheduler/RoundRobin.java +++ b/src/main/java/fr/ntr/scheduler/RoundRobin.java @@ -1,12 +1,16 @@ package fr.ntr.scheduler; +import java.util.List; + +import fr.ntr.User; + public class RoundRobin extends Scheduler { - private String nom; + private String name; private int index; - public RoundRobin(String nom, int index) { - this.nom = nom; + public RoundRobin(String name, int index) { + this.name = name; this.index = index; } @@ -14,6 +18,15 @@ public class RoundRobin extends Scheduler { public void scheduling() { } + private void selectionUtilisateur(int Ts, int Sp, List Users) { + + } + + @Override + protected void TraitementDonnées() { + // TODO Auto-generated method stub + + } From 36c5d7ca2043b7fc5e1953e62413230f1c064cc9 Mon Sep 17 00:00:00 2001 From: iboyeau Date: Fri, 3 Mar 2023 11:11:30 +0100 Subject: [PATCH 2/3] maxSnr + RoundRobin --- src/main/java/fr/ntr/scheduler/MaxSNR.java | 2 +- src/main/java/fr/ntr/scheduler/RoundRobin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/ntr/scheduler/MaxSNR.java b/src/main/java/fr/ntr/scheduler/MaxSNR.java index df23422..86c72a1 100644 --- a/src/main/java/fr/ntr/scheduler/MaxSNR.java +++ b/src/main/java/fr/ntr/scheduler/MaxSNR.java @@ -9,7 +9,7 @@ public class MaxSNR extends Scheduler { @Override public void scheduling() { - } + } @Override protected void TraitementDonnées() { diff --git a/src/main/java/fr/ntr/scheduler/RoundRobin.java b/src/main/java/fr/ntr/scheduler/RoundRobin.java index 8682616..7fe0db0 100644 --- a/src/main/java/fr/ntr/scheduler/RoundRobin.java +++ b/src/main/java/fr/ntr/scheduler/RoundRobin.java @@ -12,7 +12,7 @@ public class RoundRobin extends Scheduler { public RoundRobin(String name, int index) { this.name = name; this.index = index; - } + } @Override public void scheduling() { From f75303b25429a7cbac45698f2f47e78159b2e84a Mon Sep 17 00:00:00 2001 From: iboyeau Date: Fri, 3 Mar 2023 11:13:21 +0100 Subject: [PATCH 3/3] correct error --- src/main/java/fr/ntr/RessourceUnit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/ntr/RessourceUnit.java b/src/main/java/fr/ntr/RessourceUnit.java index bdd8b0c..453c971 100644 --- a/src/main/java/fr/ntr/RessourceUnit.java +++ b/src/main/java/fr/ntr/RessourceUnit.java @@ -1,10 +1,10 @@ package fr.ntr; -public class ResourceBlock { +public class RessourceUnit { private User user; private double bandwith; - private ResourceBlock (User user, double bandwith) { + private RessourceUnit (User user, double bandwith) { this.user = user; this.bandwith = bandwith; }