pfaure/Metaheuristiques
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add method to access tasks in resource order

Browse source
This commit is contained in:
Arthur Bit-Monnot 2021-04-09 14:56:14 +02:00
parent 87acd95887
commit f6d78491ba
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/jobshop/MainTest.java
View file

@ -16,12 +16,12 @@ public class MainTest {
// load the aaa1 instance // load the aaa1 instance
Instance instance = Instance.fromFile(Paths.get("instances/aaa1")); Instance instance = Instance.fromFile(Paths.get("instances/aaa1"));
// builds a solution in the job-numbers encoding [0 1 1 0 0 1] // builds a solution in the job-numbers encoding [0 0 1 1 0 1]
JobNumbers enc = new JobNumbers(instance); JobNumbers enc = new JobNumbers(instance);
enc.addTask(0); enc.addTask(0);
enc.addTask(1);
enc.addTask(1);
enc.addTask(0); enc.addTask(0);
enc.addTask(1);
enc.addTask(1);
enc.addTask(0); enc.addTask(0);
enc.addTask(1); enc.addTask(1);

10
src/main/java/jobshop/encodings/ResourceOrder.java
View file

@ -62,6 +62,16 @@ public class ResourceOrder extends Encoding {
nextFreeSlot[machine] += 1; nextFreeSlot[machine] += 1;
} }
/** Returns the i-th task scheduled on a particular machine.
*
* @param machine Machine on which the task to retrieve is scheduled.
* @param taskIndex Index of the task in the queue for this machine.
* @return The i-th task scheduled on a machine.
*/
public Task getTaskOfMachine(int machine, int taskIndex) {
return tasksByMachine[machine][taskIndex];
}
/** Exchange the order of two tasks that are scheduled on a given machine. /** Exchange the order of two tasks that are scheduled on a given machine.
* *
* @param machine Machine on which the two tasks appear (line on which to perform the exchange) * @param machine Machine on which the two tasks appear (line on which to perform the exchange)