partage/tpIFT7020
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ajout de sections et figures dans le rapport.

Browse source
This commit is contained in:
Francois Berube\frabe 2018-04-19 20:51:21 -04:00
parent 74d645c236
commit b19056f41e
19 changed files with 159 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Travail_de_session/SchedulesRecovery/RecoveredSchedulesArray.java
View file

@ -47,7 +47,7 @@ public class RecoveredSchedulesArray extends SchedulesArray{
int numberBackTrack = 1;
// Fouilles en profondeur en privilegiant les actions avec cout minimum. On marque les noeuds dejà visites pour avoir des fouilles differentes
while ( !isSolutionFound && isModificationFound ) {
while ( !isSolutionFound && isModificationFound && numberBackTrack < 100000) {
PriorityQueue<RecoveringAction> recoveringActionsOrderedByCost =
getPossibleRecoveringActions(currentRecoveredScheduleOfPartTimeEmployees, currentRecoveredScheduleOfFullTimeEmployees,
alreadyRecoveredWorkPeriodByPartTimeEmployees, alreadyRecoveredWorkPeriodByFullTimeEmployees, currentRemainingRecoveringAction, recoveringActionCostComparator);
@ -80,14 +80,11 @@ public class RecoveredSchedulesArray extends SchedulesArray{
if (currentRemainingRecoveringAction == 0){
isSolutionFound = true;
} else if (numberBackTrack % (this.getNumberFullTimeEmployee() + this.getNumberPartTimeEmployee()) == 0) {
}
if (numberBackTrack % (this.getNumberFullTimeEmployee() + this.getNumberPartTimeEmployee()) == 0) {
//Si le nombre de retour au sommet atteint le nombre total d'employes, on reinitialize les matrices de noeuds visites.
initializeRecoveredWorkPeriodMatrix (alreadyRecoveredWorkPeriodByPartTimeEmployees, alreadyRecoveredWorkPeriodByFullTimeEmployees);
} else if (numberBackTrack > 100000) {
isSolutionFound = false;
System.out.println("No solution Found");
break;
}
}
}
@ -97,6 +94,7 @@ public class RecoveredSchedulesArray extends SchedulesArray{
this.totalScheduleCost = EmployeeCostCalculator.getFullRecoveredScheduleCost(this, myScheduleParameters);
} else {
System.out.println("No solution Found");
this.totalScheduleCost = Integer.MAX_VALUE;
}