From 1c9e34b3dde7f3fa7eb0d2ed469384f0dcf30959 Mon Sep 17 00:00:00 2001 From: vitawrap <thevitawrap@gmail.com> Date: Sun, 9 Apr 2023 21:37:39 +0200 Subject: [PATCH] Algo: fixes cas fin_exec et machine != -1 --- src/algo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/algo.c b/src/algo.c index 91ad43f..796f126 100644 --- a/src/algo.c +++ b/src/algo.c @@ -361,10 +361,10 @@ struct schedule_t * create_schedule(Instance I, int num_m, int preemption, int b //Affecter Tk a Mi en t dans S int machine = find_empty_machine(ordonnancement, get_event_time(event_key)); if(machine != -1){ - add_task_to_schedule(ordonnancement, shortest_task, machine, get_event_time(event_key), get_event_time(event_key) + get_event_processing_time(event_key)); + add_task_to_schedule(ordonnancement, shortest_task, machine, get_event_time(event_key), get_event_time(event_key) + get_ready_task_remaining_processing_time(shortest_task_key)); //Ajouter dans E l’ ́evenement fin d’execution de la tache - struct event_key_t* end_key = new_event_key(EVT_FIN_EXEC, get_event_time(event_key) + get_event_processing_time(event_key), get_event_processing_time(event_key), get_task_id(task), machine); + struct event_key_t* end_key = new_event_key(EVT_FIN_EXEC, get_event_time(event_key) + get_event_processing_time(event_key), get_event_processing_time(event_key), get_task_id(shortest_task), machine); tree_insert(event_tree, end_key, shortest_task); if(get_tree_size(ready_tasks) != 0){ -- GitLab