Skip to content
Snippets Groups Projects
Commit 1c9e34b3 authored by vitawrap's avatar vitawrap
Browse files

Algo: fixes cas fin_exec et machine != -1

parent 00d75bd0
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
src/algo.c
+ 2
− 2
View file @ 1c9e34b3
...@@ -361,10 +361,10 @@ struct schedule_t * create_schedule(Instance I, int num_m, int preemption, int b ...@@ -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 //Affecter Tk a Mi en t dans S
int machine = find_empty_machine(ordonnancement, get_event_time(event_key)); int machine = find_empty_machine(ordonnancement, get_event_time(event_key));
if(machine != -1){ 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 //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); tree_insert(event_tree, end_key, shortest_task);
if(get_tree_size(ready_tasks) != 0){ if(get_tree_size(ready_tasks) != 0){
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment