From 94369ddcee147748921fb130fdc9c5b19b7e3ba2 Mon Sep 17 00:00:00 2001 From: "Francois Berube\\frabe" Date: Wed, 21 Mar 2018 17:56:53 -0400 Subject: [PATCH] Correction mineure indentation --- .../ModelInitialSchedules.java | 243 +++++++------ .../ParametersInitialSchedules.java | 324 ++++++++---------- .../UtilInitialSchedules.java | 183 +++++----- tp/code/Travail_de_session/MainClass.java | 40 +-- 4 files changed, 374 insertions(+), 416 deletions(-) diff --git a/tp/code/Travail_de_session/InitialSchedules/ModelInitialSchedules.java b/tp/code/Travail_de_session/InitialSchedules/ModelInitialSchedules.java index 90eefce..e596bbd 100644 --- a/tp/code/Travail_de_session/InitialSchedules/ModelInitialSchedules.java +++ b/tp/code/Travail_de_session/InitialSchedules/ModelInitialSchedules.java @@ -5,7 +5,7 @@ import org.chocosolver.solver.variables.BoolVar; import org.chocosolver.solver.variables.IntVar; public class ModelInitialSchedules { - + // private final int HEURISTIQUE_DEFAUT = 0; // private final int HEURISTIQUE_DOMOVERWDEG = 1; // private final int HEURISTIQUE_IMPACT_BASED_SEARCH = 2; @@ -15,149 +15,138 @@ public class ModelInitialSchedules { // private final int RESTART_AUCUN = 0; // private final int RESTART_LUBY = 1; // private final int RESTART_GEOMETRIQUE = 2; - - private ParametersInitialSchedules myScheduleParameters; - - public int maxPartTimeEmployee; - public int maxFullTimeEmployee; - - public IntVar workPeriodsSchedulesOfPartTimeEmployees[][]; - private IntVar transposeWorkPeriodsSchedulesOfPartTimeEmployees[][]; - public IntVar workPeriodsSchedulesOfFullTimeEmployees[][]; - private IntVar transposeWorkPeriodsSchedulesOfFullTimeEmployees[][]; - - public IntVar workingPeriodsPerPartTimeEmployees[]; - public IntVar partTimeEmployeesPerWorkPeriods[]; - public IntVar workingPeriodsPerFullTimeEmployees[]; - public IntVar fullTimeEmployeesPerWorkPeriods[]; - public IntVar employeesPerWorkPeriods[]; - + private ParametersInitialSchedules myScheduleParameters; + + public int maxPartTimeEmployee; + public int maxFullTimeEmployee; + + public IntVar workPeriodsSchedulesOfPartTimeEmployees[][]; + private IntVar transposeWorkPeriodsSchedulesOfPartTimeEmployees[][]; + public IntVar workPeriodsSchedulesOfFullTimeEmployees[][]; + private IntVar transposeWorkPeriodsSchedulesOfFullTimeEmployees[][]; + + public IntVar workingPeriodsPerPartTimeEmployees[]; + public IntVar partTimeEmployeesPerWorkPeriods[]; + public IntVar workingPeriodsPerFullTimeEmployees[]; + public IntVar fullTimeEmployeesPerWorkPeriods[]; + public IntVar employeesPerWorkPeriods[]; + public Model chocoModelInitialSchedules; public IntVar scheduleProfit; - public ModelInitialSchedules(ParametersInitialSchedules myScheduleParameters){ - - this.myScheduleParameters = myScheduleParameters; - - this.chocoModelInitialSchedules = new Model("Model Initial Schedules"); - - this.createEmployeesVariables (); - this.createScheduleVariables (); - - this.createModelConstraints(); - - this.createModelObjectiveFunction(); - - } - - private void createEmployeesVariables () { - - this.maxPartTimeEmployee = (int) Math.ceil((double)myScheduleParameters.totalWorkedPeriodsInSchedule / - myScheduleParameters.minWorkingPeriodsOfPartTimeEmployeesPerSchedule); - this.maxFullTimeEmployee = (int) Math.ceil((double)myScheduleParameters.totalWorkedPeriodsInSchedule / - myScheduleParameters.workingPeriodsOfFullTimeEmployeesPerSchedule); - - } - - private void createScheduleVariables () { - - // Variable pour l'horaire des employes - this.workPeriodsSchedulesOfPartTimeEmployees = chocoModelInitialSchedules.intVarMatrix - (this.maxPartTimeEmployee, this.myScheduleParameters.workPeriodsPerSchedule, 0, 1); - this.workPeriodsSchedulesOfFullTimeEmployees = chocoModelInitialSchedules.intVarMatrix - (this.maxFullTimeEmployee, this.myScheduleParameters.workPeriodsPerSchedule, 0, 1); - + public ModelInitialSchedules(ParametersInitialSchedules myScheduleParameters) { + + this.myScheduleParameters = myScheduleParameters; + + this.chocoModelInitialSchedules = new Model("Model Initial Schedules"); + + this.createEmployeesVariables(); + this.createScheduleVariables(); + + this.createModelConstraints(); + + this.createModelObjectiveFunction(); + + } + + private void createEmployeesVariables() { + + this.maxPartTimeEmployee = (int) Math.ceil((double) myScheduleParameters.totalWorkedPeriodsInSchedule + / myScheduleParameters.minWorkingPeriodsOfPartTimeEmployeesPerSchedule); + this.maxFullTimeEmployee = (int) Math.ceil((double) myScheduleParameters.totalWorkedPeriodsInSchedule + / myScheduleParameters.workingPeriodsOfFullTimeEmployeesPerSchedule); + + } + + private void createScheduleVariables() { + + // Variable pour l'horaire des employes + this.workPeriodsSchedulesOfPartTimeEmployees = chocoModelInitialSchedules.intVarMatrix(this.maxPartTimeEmployee, this.myScheduleParameters.workPeriodsPerSchedule, 0, 1); + this.workPeriodsSchedulesOfFullTimeEmployees = chocoModelInitialSchedules.intVarMatrix(this.maxFullTimeEmployee, this.myScheduleParameters.workPeriodsPerSchedule, 0, 1); + // Variable pour faire le compte du nombre d'heures des employes - this.workingPeriodsPerPartTimeEmployees = chocoModelInitialSchedules.intVarArray - (this.maxPartTimeEmployee, 0, this.myScheduleParameters.workPeriodsPerSchedule, true); - this.workingPeriodsPerFullTimeEmployees = chocoModelInitialSchedules.intVarArray - (this.maxFullTimeEmployee, 0, this.myScheduleParameters.workPeriodsPerSchedule, true); - + this.workingPeriodsPerPartTimeEmployees = chocoModelInitialSchedules.intVarArray(this.maxPartTimeEmployee, 0, this.myScheduleParameters.workPeriodsPerSchedule, true); + this.workingPeriodsPerFullTimeEmployees = chocoModelInitialSchedules.intVarArray(this.maxFullTimeEmployee, 0, this.myScheduleParameters.workPeriodsPerSchedule, true); + // Creer la transpose des horaires pour compter les elements des colonnes - this.transposeWorkPeriodsSchedulesOfPartTimeEmployees = chocoModelInitialSchedules.intVarMatrix - (this.myScheduleParameters.workPeriodsPerSchedule, this.maxPartTimeEmployee, 0, 1); + this.transposeWorkPeriodsSchedulesOfPartTimeEmployees = chocoModelInitialSchedules.intVarMatrix(this.myScheduleParameters.workPeriodsPerSchedule, this.maxPartTimeEmployee, 0, 1); for (int workPeriod = 0; workPeriod < this.myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { - for (int employee = 0 ; employee < this.maxPartTimeEmployee ; employee++) { - this.transposeWorkPeriodsSchedulesOfPartTimeEmployees[workPeriod][employee] = - this.workPeriodsSchedulesOfPartTimeEmployees[employee][workPeriod]; - } + for (int employee = 0; employee < this.maxPartTimeEmployee; employee++) { + this.transposeWorkPeriodsSchedulesOfPartTimeEmployees[workPeriod][employee] + = this.workPeriodsSchedulesOfPartTimeEmployees[employee][workPeriod]; + } } - this.transposeWorkPeriodsSchedulesOfFullTimeEmployees = chocoModelInitialSchedules.intVarMatrix - (this.myScheduleParameters.workPeriodsPerSchedule, this.maxFullTimeEmployee, 0, 1); + this.transposeWorkPeriodsSchedulesOfFullTimeEmployees = chocoModelInitialSchedules.intVarMatrix(this.myScheduleParameters.workPeriodsPerSchedule, this.maxFullTimeEmployee, 0, 1); for (int workPeriod = 0; workPeriod < this.myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { - for (int employee = 0 ; employee < this.maxFullTimeEmployee ; employee++) { - this.transposeWorkPeriodsSchedulesOfFullTimeEmployees[workPeriod][employee] = - this.workPeriodsSchedulesOfFullTimeEmployees[employee][workPeriod]; - } + for (int employee = 0; employee < this.maxFullTimeEmployee; employee++) { + this.transposeWorkPeriodsSchedulesOfFullTimeEmployees[workPeriod][employee] + = this.workPeriodsSchedulesOfFullTimeEmployees[employee][workPeriod]; + } } - + // Variable pour faire le compte du nombre d'employes par periode de travail - this.partTimeEmployeesPerWorkPeriods = chocoModelInitialSchedules.intVarArray - (this.myScheduleParameters.workPeriodsPerSchedule, 0, this.maxPartTimeEmployee, true); - this.fullTimeEmployeesPerWorkPeriods = chocoModelInitialSchedules.intVarArray - (this.myScheduleParameters.workPeriodsPerSchedule, 0, this.maxFullTimeEmployee, true); - this.employeesPerWorkPeriods = chocoModelInitialSchedules.intVarArray - (this.myScheduleParameters.workPeriodsPerSchedule, - 0, this.maxPartTimeEmployee + this.maxFullTimeEmployee, true); - - } - - private void createModelConstraints () { - - // Constrainte tableau pour choisir un type d'horaire dans les horaires possibles - for (int employee = 0 ; employee < this.maxFullTimeEmployee ; employee++) { - chocoModelInitialSchedules.table(this.workPeriodsSchedulesOfFullTimeEmployees[employee], - this.myScheduleParameters.enumerationWorkPeriodsSchedulesOfFullTimeEmployees).post(); - } - - // Constraintes pour compter le nombre d'heures travaillees par les differents employes - for (int employee = 0 ; employee < this.maxPartTimeEmployee ; employee++) { - chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), - this.workPeriodsSchedulesOfPartTimeEmployees[employee], - this.workingPeriodsPerPartTimeEmployees[employee]).post(); + this.partTimeEmployeesPerWorkPeriods = chocoModelInitialSchedules.intVarArray(this.myScheduleParameters.workPeriodsPerSchedule, 0, this.maxPartTimeEmployee, true); + this.fullTimeEmployeesPerWorkPeriods = chocoModelInitialSchedules.intVarArray(this.myScheduleParameters.workPeriodsPerSchedule, 0, this.maxFullTimeEmployee, true); + this.employeesPerWorkPeriods = chocoModelInitialSchedules.intVarArray(this.myScheduleParameters.workPeriodsPerSchedule, + 0, this.maxPartTimeEmployee + this.maxFullTimeEmployee, true); + + } + + private void createModelConstraints() { + + // Constrainte tableau pour choisir un type d'horaire dans les horaires possibles + for (int employee = 0; employee < this.maxFullTimeEmployee; employee++) { + chocoModelInitialSchedules.table(this.workPeriodsSchedulesOfFullTimeEmployees[employee], + this.myScheduleParameters.enumerationWorkPeriodsSchedulesOfFullTimeEmployees).post(); } - for (int employee = 0 ; employee < this.maxFullTimeEmployee ; employee++) { - chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), - this.workPeriodsSchedulesOfFullTimeEmployees[employee], - this.workingPeriodsPerFullTimeEmployees[employee]).post(); + + // Constraintes pour compter le nombre d'heures travaillees par les differents employes + for (int employee = 0; employee < this.maxPartTimeEmployee; employee++) { + chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), + this.workPeriodsSchedulesOfPartTimeEmployees[employee], + this.workingPeriodsPerPartTimeEmployees[employee]).post(); } - - // Constraintes pour borner le nombre d'heures travaillees par les employes a temps partiel - for (int employee = 0 ; employee < this.maxPartTimeEmployee ; employee++) { - BoolVar isWorkingEmployee = chocoModelInitialSchedules.arithm( - this.workingPeriodsPerPartTimeEmployees[employee], ">", 0).reify(); - chocoModelInitialSchedules.ifThen(isWorkingEmployee, - chocoModelInitialSchedules.arithm( - this.workingPeriodsPerPartTimeEmployees[employee], ">=", - this.myScheduleParameters.minWorkingPeriodsOfPartTimeEmployeesPerSchedule)); - chocoModelInitialSchedules.arithm(this.workingPeriodsPerPartTimeEmployees[employee], "<=", - this.myScheduleParameters.maxWorkingPeriodsOfPartTimeEmployeesPerSchedule).post(); + for (int employee = 0; employee < this.maxFullTimeEmployee; employee++) { + chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), + this.workPeriodsSchedulesOfFullTimeEmployees[employee], + this.workingPeriodsPerFullTimeEmployees[employee]).post(); } - - // Constraintes pour compter le nombre d'employes par periode de travail et s'assurer qu'il - // satisfait la demande en employes + + // Constraintes pour borner le nombre d'heures travaillees par les employes a temps partiel + for (int employee = 0; employee < this.maxPartTimeEmployee; employee++) { + BoolVar isWorkingEmployee = chocoModelInitialSchedules.arithm( + this.workingPeriodsPerPartTimeEmployees[employee], ">", 0).reify(); + chocoModelInitialSchedules.ifThen(isWorkingEmployee, + chocoModelInitialSchedules.arithm( + this.workingPeriodsPerPartTimeEmployees[employee], ">=", + this.myScheduleParameters.minWorkingPeriodsOfPartTimeEmployeesPerSchedule)); + chocoModelInitialSchedules.arithm(this.workingPeriodsPerPartTimeEmployees[employee], "<=", + this.myScheduleParameters.maxWorkingPeriodsOfPartTimeEmployeesPerSchedule).post(); + } + + // Constraintes pour compter le nombre d'employes par periode de travail et s'assurer qu'il + // satisfait la demande en employes for (int workPeriod = 0; workPeriod < this.myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { - chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), - transposeWorkPeriodsSchedulesOfPartTimeEmployees[workPeriod], - this.partTimeEmployeesPerWorkPeriods[workPeriod]).post(); - chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), - transposeWorkPeriodsSchedulesOfFullTimeEmployees[workPeriod], - this.fullTimeEmployeesPerWorkPeriods[workPeriod]).post(); + chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), + transposeWorkPeriodsSchedulesOfPartTimeEmployees[workPeriod], + this.partTimeEmployeesPerWorkPeriods[workPeriod]).post(); + chocoModelInitialSchedules.count(chocoModelInitialSchedules.intVar(1), + transposeWorkPeriodsSchedulesOfFullTimeEmployees[workPeriod], + this.fullTimeEmployeesPerWorkPeriods[workPeriod]).post(); chocoModelInitialSchedules.arithm(this.partTimeEmployeesPerWorkPeriods[workPeriod], "+", - this.fullTimeEmployeesPerWorkPeriods[workPeriod], "=", - this.myScheduleParameters.requiredWorkforce[workPeriod]).post(); + this.fullTimeEmployeesPerWorkPeriods[workPeriod], "=", + this.myScheduleParameters.requiredWorkforce[workPeriod]).post(); chocoModelInitialSchedules.arithm(this.partTimeEmployeesPerWorkPeriods[workPeriod], "+", - this.fullTimeEmployeesPerWorkPeriods[workPeriod], "=", - this.employeesPerWorkPeriods[workPeriod]).post(); + this.fullTimeEmployeesPerWorkPeriods[workPeriod], "=", + this.employeesPerWorkPeriods[workPeriod]).post(); } - - } - - private void createModelObjectiveFunction () { - + + } + + private void createModelObjectiveFunction() { + // this.scheduleProfit = chocoModelInitialSchedules.intVar("TOTAL_COST", 0, 20 * N * p, true); // chocoModelInitialSchedules.scalar(perte , coeffs , "=", this.scheduleProfit).post(); - - } - + } + } diff --git a/tp/code/Travail_de_session/InitialSchedules/ParametersInitialSchedules.java b/tp/code/Travail_de_session/InitialSchedules/ParametersInitialSchedules.java index 24ce3e6..07251a4 100644 --- a/tp/code/Travail_de_session/InitialSchedules/ParametersInitialSchedules.java +++ b/tp/code/Travail_de_session/InitialSchedules/ParametersInitialSchedules.java @@ -3,195 +3,170 @@ package InitialSchedules; import org.chocosolver.solver.constraints.extension.Tuples; public class ParametersInitialSchedules { - - int workPeriodsPerDay; - int shiftWorkPerDay; - int daysPerSchedule; - int workPeriodsPerSchedule; - int totalWorkedPeriodsInSchedule; - double hoursPerWorkPeriod; - - double fixedCostOfPartTimeEmployeesPerSchedule; - double hourlyRateOfPartTimeEmployees; - double minWorkingHoursOfPartTimeEmployeesPerSchedule; - double maxWorkingHoursOfPartTimeEmployeesPerSchedule; - int minWorkingPeriodsOfPartTimeEmployeesPerSchedule; - int maxWorkingPeriodsOfPartTimeEmployeesPerSchedule; - - double fixedCostOfFullTimeEmployeesPerSchedule; - double regularHourlyRateOfFullTimeEmployees; - double overtimeHourlyRateOfFullTimeEmployees; - double workingHoursOfFullTimeEmployeesPerSchedule; - double maxWorkingHoursOfFullTimeEmployeesPerSchedule; - int workingPeriodsOfFullTimeEmployeesPerSchedule; - int maxWorkingPeriodsOfFullTimeEmployeesPerSchedule; - - double workingHoursPaidAtRegularHourlyRatePerSchedule; - - public int[] requiredWorkforce; - Tuples enumerationWorkPeriodsSchedulesOfFullTimeEmployees; - - public ParametersInitialSchedules() { - this.setGeneralParameters (); - this.setPartTimeEmployeesParameters (); - this.setFullTimeEmployeesParameters (); - this.setRequiredWorkforce (); - this.setWorkPeriodsSchedulesOfFullTimeEmployees (); - + int workPeriodsPerDay; + int shiftWorkPerDay; + int daysPerSchedule; + int workPeriodsPerSchedule; + int totalWorkedPeriodsInSchedule; + double hoursPerWorkPeriod; + + double fixedCostOfPartTimeEmployeesPerSchedule; + double hourlyRateOfPartTimeEmployees; + double minWorkingHoursOfPartTimeEmployeesPerSchedule; + double maxWorkingHoursOfPartTimeEmployeesPerSchedule; + int minWorkingPeriodsOfPartTimeEmployeesPerSchedule; + int maxWorkingPeriodsOfPartTimeEmployeesPerSchedule; + + double fixedCostOfFullTimeEmployeesPerSchedule; + double regularHourlyRateOfFullTimeEmployees; + double overtimeHourlyRateOfFullTimeEmployees; + double workingHoursOfFullTimeEmployeesPerSchedule; + double maxWorkingHoursOfFullTimeEmployeesPerSchedule; + int workingPeriodsOfFullTimeEmployeesPerSchedule; + int maxWorkingPeriodsOfFullTimeEmployeesPerSchedule; + + double workingHoursPaidAtRegularHourlyRatePerSchedule; + + public int[] requiredWorkforce; + Tuples enumerationWorkPeriodsSchedulesOfFullTimeEmployees; + + public ParametersInitialSchedules() { + + this.setGeneralParameters(); + this.setPartTimeEmployeesParameters(); + this.setFullTimeEmployeesParameters(); + this.setRequiredWorkforce(); + this.setWorkPeriodsSchedulesOfFullTimeEmployees(); + } - - private void setGeneralParameters () { - this.workPeriodsPerDay = 6; - this.shiftWorkPerDay = 3; - this.daysPerSchedule = 14; + + private void setGeneralParameters() { + this.workPeriodsPerDay = 6; + this.shiftWorkPerDay = 3; + this.daysPerSchedule = 14; this.hoursPerWorkPeriod = 4; this.workPeriodsPerSchedule = this.workPeriodsPerDay * this.daysPerSchedule; - } - - private void setPartTimeEmployeesParameters () { - this.fixedCostOfPartTimeEmployeesPerSchedule = 50; + } + + private void setPartTimeEmployeesParameters() { + this.fixedCostOfPartTimeEmployeesPerSchedule = 50; this.hourlyRateOfPartTimeEmployees = 12; // To simulate lower productivity this.minWorkingHoursOfPartTimeEmployeesPerSchedule = 32; this.maxWorkingHoursOfPartTimeEmployeesPerSchedule = 64; - this.minWorkingPeriodsOfPartTimeEmployeesPerSchedule = - (int) (this.minWorkingHoursOfPartTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); - this.maxWorkingPeriodsOfPartTimeEmployeesPerSchedule = - (int) (this.maxWorkingHoursOfPartTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); - } - - private void setFullTimeEmployeesParameters () { - this.fixedCostOfFullTimeEmployeesPerSchedule = 50; + this.minWorkingPeriodsOfPartTimeEmployeesPerSchedule + = (int) (this.minWorkingHoursOfPartTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); + this.maxWorkingPeriodsOfPartTimeEmployeesPerSchedule + = (int) (this.maxWorkingHoursOfPartTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); + } + + private void setFullTimeEmployeesParameters() { + this.fixedCostOfFullTimeEmployeesPerSchedule = 50; this.regularHourlyRateOfFullTimeEmployees = 10; this.overtimeHourlyRateOfFullTimeEmployees = 15; - + this.workingHoursOfFullTimeEmployeesPerSchedule = 80; this.maxWorkingHoursOfFullTimeEmployeesPerSchedule = 120; - this.workingPeriodsOfFullTimeEmployeesPerSchedule = - (int) (this.workingHoursOfFullTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); - this.maxWorkingPeriodsOfFullTimeEmployeesPerSchedule = - (int) (this.maxWorkingHoursOfFullTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); + this.workingPeriodsOfFullTimeEmployeesPerSchedule + = (int) (this.workingHoursOfFullTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); + this.maxWorkingPeriodsOfFullTimeEmployeesPerSchedule + = (int) (this.maxWorkingHoursOfFullTimeEmployeesPerSchedule / this.hoursPerWorkPeriod); this.workingHoursPaidAtRegularHourlyRatePerSchedule = 80; - } - - private void setRequiredWorkforce () { - - this.requiredWorkforce = new int[this.daysPerSchedule*this.workPeriodsPerDay]; + } + + private void setRequiredWorkforce() { + + this.requiredWorkforce = new int[this.daysPerSchedule * this.workPeriodsPerDay]; this.totalWorkedPeriodsInSchedule = 0; for (int day = 0; day < this.daysPerSchedule; day++) { - // A ameliorer - this.requiredWorkforce[day*this.workPeriodsPerDay+0] = 2; - this.requiredWorkforce[day*this.workPeriodsPerDay+1] = 2; - this.requiredWorkforce[day*this.workPeriodsPerDay+2] = 4; - this.requiredWorkforce[day*this.workPeriodsPerDay+3] = 4; - this.requiredWorkforce[day*this.workPeriodsPerDay+4] = 3; - this.requiredWorkforce[day*this.workPeriodsPerDay+5] = 3; - this.totalWorkedPeriodsInSchedule += (2*2 + 2*4 + 2*3); + // A ameliorer + this.requiredWorkforce[day * this.workPeriodsPerDay + 0] = 2; + this.requiredWorkforce[day * this.workPeriodsPerDay + 1] = 2; + this.requiredWorkforce[day * this.workPeriodsPerDay + 2] = 4; + this.requiredWorkforce[day * this.workPeriodsPerDay + 3] = 4; + this.requiredWorkforce[day * this.workPeriodsPerDay + 4] = 3; + this.requiredWorkforce[day * this.workPeriodsPerDay + 5] = 3; + this.totalWorkedPeriodsInSchedule += (2 * 2 + 2 * 4 + 2 * 3); } - - } - - private void setWorkPeriodsSchedulesOfFullTimeEmployees () { - - int[][] dailySchedulesOfFullTimeEmployees = new int[][]{ - {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - {0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1}, - {0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1}, - {0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1}, - {0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, - {1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1}, - {1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1}, - {1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, - {1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1}, - {1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, - {1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, - {1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0}, - {1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0}, - {1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0}, - {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0}, - {1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0}, - {1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0}, - {1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0}, - {1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0}, - {1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0}, - {1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0}, - }; - - int possibleDailyScheduleOfFullTimeEmployees = dailySchedulesOfFullTimeEmployees.length; - - int[][] workPeriodsSchedulesOfFullTimeEmployees = - new int[possibleDailyScheduleOfFullTimeEmployees*this.shiftWorkPerDay][this.workPeriodsPerSchedule]; - - // Cette fonction sera a ameliorer avec des sous-fonctions, car elle n'est pas tres explicite. + + } + + private void setWorkPeriodsSchedulesOfFullTimeEmployees() { + + int[][] dailySchedulesOfFullTimeEmployees = new int[][]{ + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + {0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1}, + {0, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1}, + {0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1}, + {0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, + {1, 0, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1}, + {1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1}, + {1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, + {1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1}, + {1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, + {1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1}, + {1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0}, + {1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0}, + {1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0}, + {1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0}, + {1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0}, + {1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0}, + {1, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0}, + {1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0}, + {1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0}, + {1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 0},}; + + int possibleDailyScheduleOfFullTimeEmployees = dailySchedulesOfFullTimeEmployees.length; + + int[][] workPeriodsSchedulesOfFullTimeEmployees + = new int[possibleDailyScheduleOfFullTimeEmployees * this.shiftWorkPerDay][this.workPeriodsPerSchedule]; + + // Cette fonction sera a ameliorer avec des sous-fonctions, car elle n'est pas tres explicite. for (int scheduleNumber = 0; scheduleNumber < possibleDailyScheduleOfFullTimeEmployees; scheduleNumber++) { - for (int day = 0; day < this.daysPerSchedule ; day++) { - for (int shiftNumber = 0; shiftNumber < this.shiftWorkPerDay; shiftNumber++) { - if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 1 && shiftNumber == 0){ - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+0] = 1; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+1] = 1; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+2] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+3] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+4] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+5] = 0; - } else if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 1 && shiftNumber == 1){ - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+0] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+1] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+2] = 1; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+3] = 1; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+4] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+5] = 0; - } else if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 1 && shiftNumber == 2){ - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+0] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+1] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+2] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+3] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+4] = 1; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+5] = 1; - } else if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 0) { - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+0] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+1] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+2] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+3] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+4] = 0; - workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber*this.shiftWorkPerDay+shiftNumber] - [day*this.workPeriodsPerDay+5] = 0; - } - } - } - } - - // Creation des tuples à partir du tableau pour creer les 3 types de quart de travail (nuit, jour soir). - this.enumerationWorkPeriodsSchedulesOfFullTimeEmployees = - new Tuples(workPeriodsSchedulesOfFullTimeEmployees, true); - } - - // A implementer plus tard si l'on veut travailler avec des fichiers texte - public ParametersInitialSchedules(String fileName) { - + for (int day = 0; day < this.daysPerSchedule; day++) { + for (int shiftNumber = 0; shiftNumber < this.shiftWorkPerDay; shiftNumber++) { + if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 1 && shiftNumber == 0) { + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 0] = 1; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 1] = 1; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 2] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 3] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 4] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 5] = 0; + } else if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 1 && shiftNumber == 1) { + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 0] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 1] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 2] = 1; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 3] = 1; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 4] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 5] = 0; + } else if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 1 && shiftNumber == 2) { + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 0] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 1] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 2] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 3] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 4] = 1; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 5] = 1; + } else if (dailySchedulesOfFullTimeEmployees[scheduleNumber][day] == 0) { + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 0] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 1] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 2] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 3] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 4] = 0; + workPeriodsSchedulesOfFullTimeEmployees[scheduleNumber * this.shiftWorkPerDay + shiftNumber][day * this.workPeriodsPerDay + 5] = 0; + } + } + } + } + + // Creation des tuples a partir du tableau pour creer les 3 types de quart de travail (nuit, jour soir). + this.enumerationWorkPeriodsSchedulesOfFullTimeEmployees + = new Tuples(workPeriodsSchedulesOfFullTimeEmployees, true); + } + + // A implementer plus tard si l'on veut travailler avec des fichiers texte + public ParametersInitialSchedules(String fileName) { + // String line = null; // try { // FileReader fileReader = @@ -231,7 +206,6 @@ public class ParametersInitialSchedules { // "Error reading file '" // + fileName + "'"); // } - - } - + } + } diff --git a/tp/code/Travail_de_session/InitialSchedules/UtilInitialSchedules.java b/tp/code/Travail_de_session/InitialSchedules/UtilInitialSchedules.java index fe1ec0f..4705b5c 100644 --- a/tp/code/Travail_de_session/InitialSchedules/UtilInitialSchedules.java +++ b/tp/code/Travail_de_session/InitialSchedules/UtilInitialSchedules.java @@ -1,96 +1,97 @@ package InitialSchedules; // classe statique pour mettre fonction utilitaire -public class UtilInitialSchedules { - - private UtilInitialSchedules () {} - - public static void refineInitialSchedules() { - // A implementer si on veut rafiner la banque d'horaires initiales - } - - public static void printSolutionResults(ModelInitialSchedules myModelInitialSchedules, ParametersInitialSchedules myScheduleParameters) { - // Cette fonction sera a ameliorer avec des sous-fonctions, car elle n'est pas tres explicite. - System.out.print("Schedule Day "); - for (int day = 1; day <= myScheduleParameters.daysPerSchedule; day++) { - System.out.print(day); - System.out.print(" "); - if (day < 10){ - System.out.print(" "); - } - System.out.print("|"); - } - System.out.print("Worked Periods"); - System.out.println(""); - System.out.println("Part-Time Employees"); - int partTimeemployeeNo = 1; - for (int employee = 0; employee < myModelInitialSchedules.maxPartTimeEmployee; employee++) { - if (myModelInitialSchedules.workingPeriodsPerPartTimeEmployees[employee].getValue() != 0){ - System.out.print("Employee "); - System.out.print(partTimeemployeeNo); - System.out.print(" "); - if (partTimeemployeeNo < 10){ - System.out.print(" "); - } - for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { - if (myModelInitialSchedules.workPeriodsSchedulesOfPartTimeEmployees[employee][workPeriod].getValue() == 1){ - System.out.print("1"); - } else { - System.out.print("0"); - - } - if (workPeriod%6 == 5 && workPeriod != 0) { - System.out.print("|"); - } - } - System.out.print(myModelInitialSchedules.workingPeriodsPerPartTimeEmployees[employee].getValue()); - System.out.println(""); - partTimeemployeeNo++; - } - } - int fullTimeemployeeNo = 1; - System.out.println("Full-Time Employees"); - for (int employee = 0; employee < myModelInitialSchedules.maxFullTimeEmployee; employee++) { - if (myModelInitialSchedules.workingPeriodsPerFullTimeEmployees[employee].getValue() != 0){ - System.out.print("Employee "); - System.out.print(fullTimeemployeeNo); - System.out.print(" "); - if (fullTimeemployeeNo < 10){ - System.out.print(" "); - } - for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { - if (myModelInitialSchedules.workPeriodsSchedulesOfFullTimeEmployees[employee][workPeriod].getValue() == 1){ - System.out.print("1"); - } else { - System.out.print("0"); - - } - if (workPeriod%6 == 5 && workPeriod != 0) { - System.out.print("|"); - } - } - System.out.print(myModelInitialSchedules.workingPeriodsPerFullTimeEmployees[employee].getValue()); - System.out.println(""); - fullTimeemployeeNo++; - } - } - System.out.print("Working Employees "); - for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { - System.out.print(myModelInitialSchedules.employeesPerWorkPeriods[workPeriod].getValue()); - if (workPeriod%6 == 5 && workPeriod != 0) { - System.out.print("|"); - } - } - System.out.println(""); - System.out.print("Required Workforce "); - for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { - System.out.print(myScheduleParameters.requiredWorkforce[workPeriod]); - if (workPeriod%6 == 5 && workPeriod != 0) { - System.out.print("|"); - } - } - System.out.println(""); +public class UtilInitialSchedules { + + private UtilInitialSchedules() { + } + + public static void refineInitialSchedules() { + // A implementer si on veut rafiner la banque d'horaires initiales + } + + public static void printSolutionResults(ModelInitialSchedules myModelInitialSchedules, ParametersInitialSchedules myScheduleParameters) { + // Cette fonction sera a ameliorer avec des sous-fonctions, car elle n'est pas tres explicite. + System.out.print("Schedule Day "); + for (int day = 1; day <= myScheduleParameters.daysPerSchedule; day++) { + System.out.print(day); + System.out.print(" "); + if (day < 10) { + System.out.print(" "); + } + System.out.print("|"); + } + System.out.print("Worked Periods"); + System.out.println(""); + System.out.println("Part-Time Employees"); + int partTimeemployeeNo = 1; + for (int employee = 0; employee < myModelInitialSchedules.maxPartTimeEmployee; employee++) { + if (myModelInitialSchedules.workingPeriodsPerPartTimeEmployees[employee].getValue() != 0) { + System.out.print("Employee "); + System.out.print(partTimeemployeeNo); + System.out.print(" "); + if (partTimeemployeeNo < 10) { + System.out.print(" "); + } + for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { + if (myModelInitialSchedules.workPeriodsSchedulesOfPartTimeEmployees[employee][workPeriod].getValue() == 1) { + System.out.print("1"); + } else { + System.out.print("0"); + + } + if (workPeriod % 6 == 5 && workPeriod != 0) { + System.out.print("|"); + } + } + System.out.print(myModelInitialSchedules.workingPeriodsPerPartTimeEmployees[employee].getValue()); + System.out.println(""); + partTimeemployeeNo++; + } + } + int fullTimeemployeeNo = 1; + System.out.println("Full-Time Employees"); + for (int employee = 0; employee < myModelInitialSchedules.maxFullTimeEmployee; employee++) { + if (myModelInitialSchedules.workingPeriodsPerFullTimeEmployees[employee].getValue() != 0) { + System.out.print("Employee "); + System.out.print(fullTimeemployeeNo); + System.out.print(" "); + if (fullTimeemployeeNo < 10) { + System.out.print(" "); + } + for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { + if (myModelInitialSchedules.workPeriodsSchedulesOfFullTimeEmployees[employee][workPeriod].getValue() == 1) { + System.out.print("1"); + } else { + System.out.print("0"); + + } + if (workPeriod % 6 == 5 && workPeriod != 0) { + System.out.print("|"); + } + } + System.out.print(myModelInitialSchedules.workingPeriodsPerFullTimeEmployees[employee].getValue()); + System.out.println(""); + fullTimeemployeeNo++; + } + } + System.out.print("Working Employees "); + for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { + System.out.print(myModelInitialSchedules.employeesPerWorkPeriods[workPeriod].getValue()); + if (workPeriod % 6 == 5 && workPeriod != 0) { + System.out.print("|"); + } + } + System.out.println(""); + System.out.print("Required Workforce "); + for (int workPeriod = 0; workPeriod < myScheduleParameters.workPeriodsPerSchedule; workPeriod++) { + System.out.print(myScheduleParameters.requiredWorkforce[workPeriod]); + if (workPeriod % 6 == 5 && workPeriod != 0) { + System.out.print("|"); + } + } + System.out.println(""); + + } - } - } diff --git a/tp/code/Travail_de_session/MainClass.java b/tp/code/Travail_de_session/MainClass.java index d03f1f6..e87a43e 100644 --- a/tp/code/Travail_de_session/MainClass.java +++ b/tp/code/Travail_de_session/MainClass.java @@ -2,42 +2,36 @@ import org.chocosolver.solver.Solver; public class MainClass { - + public static void main(String[] args) { - - // Le main ne devrait contenir que les 5 fonctions correspondantes aux etapes du pipeline - - generateInitialSchedule (); - + + // Le main ne devrait contenir que les 5 fonctions correspondantes aux etapes du pipeline + generateInitialSchedule(); + // Creer les simulation avec une autre classe. Faire un nouveau package de fonctions. - - // Algo de recouvrement d'absences. Faire un nouveau package de fonctions. - - // Trouver meilleure solution et l'afficher. - } - - private static void generateInitialSchedule () { - - InitialSchedules.ParametersInitialSchedules myScheduleParameters = - new InitialSchedules.ParametersInitialSchedules (); - - InitialSchedules.ModelInitialSchedules myModelInitialSchedules = - new InitialSchedules.ModelInitialSchedules (myScheduleParameters); - + + private static void generateInitialSchedule() { + + InitialSchedules.ParametersInitialSchedules myScheduleParameters + = new InitialSchedules.ParametersInitialSchedules(); + + InitialSchedules.ModelInitialSchedules myModelInitialSchedules + = new InitialSchedules.ModelInitialSchedules(myScheduleParameters); + Solver solverInitialSchedules = myModelInitialSchedules.chocoModelInitialSchedules.getSolver(); solverInitialSchedules.findSolution(); // Solution bestInitialSchedules = solverInitialSchedules.findOptimalSolution // (myModelInitialSchedules.scheduleProfit, Model.MINIMIZE); - + // fonction pour reduire le nombre d'horaire dans la banque d'horaire. // InitialSchedules.UtilInitialSchedules.refineInitialSchedules(bestInitialSchedules); - // On pourrait creer un petit interface pour afficher les horaires optimales et les statistiques. InitialSchedules.UtilInitialSchedules.printSolutionResults(myModelInitialSchedules, myScheduleParameters); solverInitialSchedules.printStatistics(); - + + //TODO Creer objet banque horaire } }