Correction des résultats du rapport.

This commit is contained in:
Francois Berube\frabe 2018-04-16 18:30:27 -04:00
parent a0275cab5a
commit d976be86ba
8 changed files with 11 additions and 11 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

After

Width:  |  Height:  |  Size: 140 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View file

@ -16,7 +16,7 @@ public class MainClass {
public static void main(String[] args) {
ParametersSchedules myScheduleParameters = new InitialSchedules.ParametersSchedules();
// for (int i = 0 ; i <= 10 ; i++) {
for (int i = 0 ; i <= 30 ; i++) {
// ParametersAbsencesSimulator.probPresence = 1 - (double) i * 0.01; // Pour de 0.90 a 1.0 par increment de 0.01
@ -31,13 +31,13 @@ public class MainClass {
List<BankRecoveredSchedules> bankRecoveredSchedulesOrderedByMeanCost = GenerateOptimalRecoveredSchedules(listBankModifiedSchedules);
SchedulesWindows.ShowSolutionResultsFrame initialSchedulesViewer = new SchedulesWindows.ShowSolutionResultsFrame(bankRecoveredSchedulesOrderedByMeanCost);
// SchedulesWindows.ShowSolutionResultsFrame initialSchedulesViewer = new SchedulesWindows.ShowSolutionResultsFrame(bankRecoveredSchedulesOrderedByMeanCost);
// int optimalFullTimeEmployee = bankRecoveredSchedulesOrderedByMeanCost.get(0).initialSchedulesArray.getNumberFullTimeEmployee();
// System.out.print(optimalFullTimeEmployee + " ");
// }
// System.out.println(" ");
// }
}
}
@SuppressWarnings("unused")
@ -46,7 +46,7 @@ public class MainClass {
// Trouver les horaires des employes a temps plein possibles pour different ratio templein/temps partiel
List<SchedulesArray> initialSchedulesArrayList = new ArrayList<>();
int minFullTimeEmployee = 2; //La solution avec 1 employes est trop lente
int minFullTimeEmployee = 9; //La solution avec 1 employes est trop lente
int maxFullTimeEmployee = 9; //9 est le max d'employes a temps plein pour la presente requiredWorkforce
@ -54,7 +54,7 @@ public class MainClass {
for (int numberFullTimeEmployees = minFullTimeEmployee ; numberFullTimeEmployees <= maxFullTimeEmployee ; numberFullTimeEmployees++) {
System.out.println("numberFullTimeEmployees: " + numberFullTimeEmployees);
// System.out.println("numberFullTimeEmployees: " + numberFullTimeEmployees);
InitialSchedules.ModelFullTimeEmployeesInitialSchedules myModelFullTimeEmployeesInitialSchedules
= new InitialSchedules.ModelFullTimeEmployeesInitialSchedules(myScheduleParameters, numberFullTimeEmployees);
@ -88,7 +88,7 @@ public class MainClass {
}
// Pour afficher les horaires initiales
SchedulesWindows.ShowSchedulesFrame initialSchedulesViewer = new SchedulesWindows.ShowSchedulesFrame(initialSchedulesArrayList, "Initial Schedules"); // to be removed
// SchedulesWindows.ShowSchedulesFrame initialSchedulesViewer = new SchedulesWindows.ShowSchedulesFrame(initialSchedulesArrayList, "Initial Schedules"); // to be removed
return initialSchedulesArrayList;
@ -123,7 +123,7 @@ public class MainClass {
}
// Pour afficher les horaires modifies
SchedulesWindows.ShowSchedulesFrame modifiedSchedulesViewer = new SchedulesWindows.ShowSchedulesFrame(listModifiedSchedules, "Modified Schedules"); // to be removed
// SchedulesWindows.ShowSchedulesFrame modifiedSchedulesViewer = new SchedulesWindows.ShowSchedulesFrame(listModifiedSchedules, "Modified Schedules"); // to be removed
return listBankModifiedSchedules;
}
@ -149,11 +149,11 @@ public class MainClass {
}
bankRecoveredSimulations.meanCostRecoveredSimulations = totalCostRecoveredSimulations / bankRecoveredSimulations.bankRecoveredSimulation.size();
// System.out.print(bankRecoveredSimulations.meanCostRecoveredSimulations + " ");
System.out.println(bankRecoveredSimulations.meanCostRecoveredSimulations);
bankRecoveredSchedulesOrderedByMeanCost.add(bankRecoveredSimulations);
}
// Pour afficher les horaires de recouvrement
SchedulesWindows.ShowSchedulesFrame recoveredSchedulesViewer = new SchedulesWindows.ShowSchedulesFrame(listRecoveredSchedules, "Recovered Schedules"); // to be removed
// SchedulesWindows.ShowSchedulesFrame recoveredSchedulesViewer = new SchedulesWindows.ShowSchedulesFrame(listRecoveredSchedules, "Recovered Schedules"); // to be removed
List<BankRecoveredSchedules> listbankRecoveredSchedulesOrderedByMeanCost = new ArrayList<>();
while(!bankRecoveredSchedulesOrderedByMeanCost.isEmpty()){

View file

@ -10,7 +10,7 @@ package ModifiedSchedules;
* @author frabe
*/
public class ParametersAbsencesSimulator {
public static double probPresence = 0.92;
public static double probPresence = 0.98;
public static final double probReturn = 0.50;
public static final int numberAbsenceSimulations = 100;
}

View file

@ -1,7 +1,7 @@
package ModifiedSchedules;
public class ParametersVariableDemandSimulator {
public static double probIncreasedDemandbyOne = 0;
public static double probIncreasedDemandbyOne = 1.00;
public static double probIncreasedDemandbyTwo = probIncreasedDemandbyOne / 5;
public static double probIncreasedDemandbyThree = probIncreasedDemandbyOne / 25;
public static final int numberVariableDemandSimulations = 10;