conflit 2

src/main/java/fr/ntr/AccessPoint.java

@@ -7,7 +7,7 @@ import java.util.Random;
 import fr.ntr.scheduler.Scheduler;
 
 public class AccessPoint {
-    private List<UserGroup> users;
+    private List<User> users;
     private Scheduler scheduler;
     /**
      * nombre de slots
@@ -58,14 +58,16 @@ public class AccessPoint {
      * Génération du débit et des paquets
      */
     private void init(int nbUsers) {
-        double[] distance = { 200d, 500d };
-        for (int i = 0; i < nbUsers; i++) {
-            UserGroup user = new UserGroup(distance[i], timeSlotNb, subCarrierNb);
+        double[] distance = { 200d, 1000d };
+        for (int i = 0; i < distance.length; i++) {
+            for(int j = 0; j < nbUsers; j++){
+                User user = new User(distance[i], timeSlotNb, subCarrierNb);
                 user.generateBandwidth();
                 user.createPackets();
                 this.users.add(user);
             }
         }
+    }
 
     private void schedule() {
 

src/main/java/fr/ntr/Packets.java

@@ -5,9 +5,9 @@ public class Packets {
     private int creationTime;
     private int endTimeSending;
     private double bitsNumberRemaining;
-    private UserGroup user;
+    private User user;
 
-    public Packets(int creationTime, int endTimeSending, double bitsNumberRemaining, UserGroup user){
+    public Packets(int creationTime, int endTimeSending, double bitsNumberRemaining, User user){
         this.creationTime = creationTime;
         this.endTimeSending = endTimeSending;
         this.bitsNumberRemaining = bitsNumberRemaining;

src/main/java/fr/ntr/ResourceBlock.java

@@ -1,10 +1,10 @@
 package fr.ntr;
 
 public class ResourceBlock {
-    private UserGroup user;
+    private User user;
     private double bandwith;
 
-    public ResourceBlock (UserGroup user, double bandwith) {
+    public ResourceBlock (User user, double bandwith) {
         this.user = user;
         this.bandwith = bandwith;
     }

src/main/java/fr/ntr/User.java

@@ -3,14 +3,14 @@ package fr.ntr;
 import java.util.ArrayList;
 import java.util.List;
 
-public class UserGroup {
+public class User {
 
     private final double distance;
     private final double[][] bandwidthTable;
     private final List<Packets> packetsToSend;
     private final List<Packets> packetsSent;
 
-    public UserGroup(double distance, int timeSlotNb,  int subCarrierNb) {
+    public User(double distance, int timeSlotNb,  int subCarrierNb) {
         this.distance = distance;
         this.bandwidthTable = new double[timeSlotNb][subCarrierNb];
         this.packetsToSend = new ArrayList<>();

src/main/java/fr/ntr/scheduler/MaxSNR.java

@@ -1,6 +1,6 @@
 package fr.ntr.scheduler;
 import java.util.List;
-import fr.ntr.User;
+import fr.ntr.UserGroup;
 
 public class MaxSNR extends Scheduler {
 
@@ -11,8 +11,8 @@ public class MaxSNR extends Scheduler {
 	public void scheduling() {
 	} 
 	
-	private void selectionUtilisateur(List<User> Users) {
-		for(User u: Users)
+	private void selectionUtilisateur(int Ts, int Sp, List<User> Users) {
+		
 	}
 
 	public MaxSNR(String name) {

src/main/java/fr/ntr/scheduler/ProportionalFair.java

@@ -2,7 +2,7 @@ package fr.ntr.scheduler;
 
 import java.util.List;
 
-import fr.ntr.UserGroup;
+import fr.ntr.User;
 
 public class ProportionalFair extends Scheduler {
 
@@ -18,7 +18,7 @@ public class ProportionalFair extends Scheduler {
 		public void scheduling() {
 		}
 			
-		private void selectionUtilisateur(int Ts, int Sp, List<UserGroup> Users) {
+		private void selectionUtilisateur(int Ts, int Sp, List<User> Users) {
 			
 		}