diff --git a/Rapport_de_session/Résultats.xlsx b/Rapport_de_session/Résultats.xlsx index a2add6c..c995bfa 100644 Binary files a/Rapport_de_session/Résultats.xlsx and b/Rapport_de_session/Résultats.xlsx differ diff --git a/Travail_de_session/AbsenceSchedules/ParametersAbsencesSimulator.java b/Travail_de_session/AbsenceSchedules/ParametersAbsencesSimulator.java index 1b0ca9c..bba4de6 100644 --- a/Travail_de_session/AbsenceSchedules/ParametersAbsencesSimulator.java +++ b/Travail_de_session/AbsenceSchedules/ParametersAbsencesSimulator.java @@ -9,8 +9,8 @@ package AbsenceSchedules; * * @author frabe */ -public interface ParametersAbsencesSimulator { - public final double probPresence = 0.99; - public final double probReturn = 0.50; - public final int numberAbsenceSimulations = 1000; +public class ParametersAbsencesSimulator { + public static double probPresence = 0.9; + public static final double probReturn = 0.50; + public static int numberAbsenceSimulations = 1000; } diff --git a/Travail_de_session/MainClass.java b/Travail_de_session/MainClass.java index 73771a5..b97b229 100644 --- a/Travail_de_session/MainClass.java +++ b/Travail_de_session/MainClass.java @@ -1,5 +1,3 @@ -//import AbsenceSchedules.AbsenceSchedulesArray; - import AbsenceSchedules.*; import InitialSchedules.*; import ScheduleUtil.*; @@ -16,14 +14,25 @@ public class MainClass { public static void main(String[] args) { - List initialSchedulesArrayList = generateInitialSchedules(); +// for (int i = 0 ; i <= 10 ; i++) { + +// ParametersAbsencesSimulator.probPresence = (double) i * 0.01 + 0.9; // Pour de 0.9 a 1.0 par increment de 0.01 + +// System.out.print("Probabilité absence = " + (1-ParametersAbsencesSimulator.probPresence)); - List listBankAbsenceSchedules = GenerateAbsencesSchedules(initialSchedulesArrayList); + // Placer une sous-boucle pour faire varier la probabilite d'augmentation de la demande. + + List initialSchedulesArrayList = generateInitialSchedules(); - List bankRecoveredSchedulesOrderedByMeanCost = GenerateOptimalRecoveredSchedules(listBankAbsenceSchedules); + List listBankAbsenceSchedules = GenerateAbsencesSchedules(initialSchedulesArrayList); - SchedulesWindows.ShowSolutionResultsFrame initialSchedulesViewer = new SchedulesWindows.ShowSolutionResultsFrame(bankRecoveredSchedulesOrderedByMeanCost); + List bankRecoveredSchedulesOrderedByMeanCost = GenerateOptimalRecoveredSchedules(listBankAbsenceSchedules); + SchedulesWindows.ShowSolutionResultsFrame initialSchedulesViewer = new SchedulesWindows.ShowSolutionResultsFrame(bankRecoveredSchedulesOrderedByMeanCost); + +// int optimalFullTimeEmployee = bankRecoveredSchedulesOrderedByMeanCost.get(0).initialSchedulesArray.getNumberFullTimeEmployee(); +// System.out.println(optimalFullTimeEmployee + " "); +// } } private static List generateInitialSchedules() { @@ -61,7 +70,7 @@ public class MainClass { SolverInitialSchedules mySolverPartTimeEmployeesInitialSchedules = new SolverInitialSchedules(myModelPartTimeEmployeesInitialSchedules); List myInitialPartTimeEmployeesSchedulesSolutions = mySolverPartTimeEmployeesInitialSchedules.findAllSolution(); - mySolverPartTimeEmployeesInitialSchedules.printStatistics(); +// mySolverPartTimeEmployeesInitialSchedules.printStatistics(); for (Solution CurrentPartTimeEmployeesSolution : myInitialPartTimeEmployeesSchedulesSolutions) { PartTimeEmployeeScheduleArray partTimeSchedulesArray = new PartTimeEmployeeScheduleArray(myModelPartTimeEmployeesInitialSchedules, CurrentPartTimeEmployeesSolution);