Merge branch 'master' of ssh://gogs.davidventura.com.ar:443/david/so-tp1

Makefile

@@ -69,35 +69,35 @@ ejercicio7: all makedir
 	./simusched ejer7-rsjf.tsk 2 2 4 SchedRSJF 2 4 4 20 4 5 | ./graphsched.py > informe/imagenes/ejercicio7_RSJF_2core.png
 
 ejercicio8: all makedir
-	./simusched ejer8-A.tsk 1 2 0 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8A_RR_1core.png
-	./simusched ejer8-A.tsk 1 2 0 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8A_FIFO_1core.png
-	./simusched ejer8-A.tsk 1 2 0 SchedSJF 1 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_1core.png
-	./simusched ejer8-A.tsk 1 2 0 SchedRSJF 1 4 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_1core.png
+	./simusched ejer8-A.tsk 1 2 8 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8A_RR_1core.png
+	./simusched ejer8-A.tsk 1 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8A_FIFO_1core.png
+	./simusched ejer8-A.tsk 1 2 8 SchedSJF 1 2 4 6 2 4 6 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_1core.png
+	./simusched ejer8-A.tsk 1 2 8 SchedRSJF 1 4 2 4 6 2 4 6 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_1core.png
 
 	./simusched ejer8-A.tsk 2 2 8 SchedRR 2 4 4 | ./graphsched.py > informe/imagenes/ejercicio8A_RR_2core.png
 	./simusched ejer8-A.tsk 2 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8A_FIFO_2core.png
-	./simusched ejer8-A.tsk 2 2 8 SchedSJF 2 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_2core.png
-	./simusched ejer8-A.tsk 2 2 8 SchedRSJF 2 4 4 13 8 3 13 8 3 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_2core.png
+	./simusched ejer8-A.tsk 2 2 8 SchedSJF 2 2 4 6 2 4 6 | ./graphsched.py > informe/imagenes/ejercicio8A_SJF_2core.png
+	./simusched ejer8-A.tsk 2 2 8 SchedRSJF 2 4 4 2 4 6 2 4 6 | ./graphsched.py > informe/imagenes/ejercicio8A_RSJF_2core.png
 
-	./simusched ejer8-B.tsk 1 2 0 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8B_RR_1core.png
-	./simusched ejer8-B.tsk 1 2 0 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8B_FIFO_1core.png
-	./simusched ejer8-B.tsk 1 2 0 SchedSJF 1 30 20 10 30 20 10  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_1core.png
-	./simusched ejer8-B.tsk 1 2 0 SchedRSJF 1 4 30 20 10 30 20 10 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_1core.png
+	./simusched ejer8-B.tsk 1 2 8 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8B_RR_1core.png
+	./simusched ejer8-B.tsk 1 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8B_FIFO_1core.png
+	./simusched ejer8-B.tsk 1 2 8 SchedSJF 1 16 20 24 16 20 24  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_1core.png
+	./simusched ejer8-B.tsk 1 2 8 SchedRSJF 1 4 16 20 24 16 20 24 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_1core.png
 
 	./simusched ejer8-B.tsk 2 2 8 SchedRR 2 4 4 | ./graphsched.py > informe/imagenes/ejercicio8B_RR_2core.png
 	./simusched ejer8-B.tsk 2 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8B_FIFO_2core.png
-	./simusched ejer8-B.tsk 2 2 8 SchedSJF 2 30 20 10 30 20 10  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_2core.png
-	./simusched ejer8-B.tsk 2 2 8 SchedRSJF 2 4 4 30 20 10 30 20 10 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_2core.png
+	./simusched ejer8-B.tsk 2 2 8 SchedSJF 2 16 20 24 16 20 24  | ./graphsched.py > informe/imagenes/ejercicio8B_SJF_2core.png
+	./simusched ejer8-B.tsk 2 2 8 SchedRSJF 2 4 4 16 20 24 16 20 24 | ./graphsched.py > informe/imagenes/ejercicio8B_RSJF_2core.png
 
-	./simusched ejer8-C.tsk 1 2 0 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8C_RR_1core.png
-	./simusched ejer8-C.tsk 1 2 0 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8C_FIFO_1core.png
-	./simusched ejer8-C.tsk 1 2 0 SchedSJF 1    25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_1core.png
-	./simusched ejer8-C.tsk 1 2 0 SchedRSJF 1 4 25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_1core.png
+	./simusched ejer8-C.tsk 1 2 8 SchedRR 1 4 | ./graphsched.py > informe/imagenes/ejercicio8C_RR_1core.png
+	./simusched ejer8-C.tsk 1 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8C_FIFO_1core.png
+	./simusched ejer8-C.tsk 1 2 8 SchedSJF 1 2 4 16 20 2 4 16 20 | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_1core.png
+	./simusched ejer8-C.tsk 1 2 8 SchedRSJF 1 4 2 4 16 20 2 4 16 20 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_1core.png
 
 	./simusched ejer8-C.tsk 2 2 8 SchedRR 2 4 4 | ./graphsched.py > informe/imagenes/ejercicio8C_RR_2core.png
 	./simusched ejer8-C.tsk 2 2 8 SchedFCFS | ./graphsched.py > informe/imagenes/ejercicio8C_FIFO_2core.png
-	./simusched ejer8-C.tsk 2 2 8 SchedSJF 2      25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_2core.png
-	./simusched ejer8-C.tsk 2 2 8 SchedRSJF 2 4 4 25 14 3 25 14 3 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_2core.png
+	./simusched ejer8-C.tsk 2 2 8 SchedSJF 2 2 4 16 20 2 4 16 20 | ./graphsched.py > informe/imagenes/ejercicio8C_SJF_2core.png
+	./simusched ejer8-C.tsk 2 2 8 SchedRSJF 2 4 4 2 4 16 20 2 4 16 20 | ./graphsched.py > informe/imagenes/ejercicio8C_RSJF_2core.png
 
 
 ejercicio9: all makedir

ejer8-A.tsk

@@ -1,8 +1,9 @@
-TaskCPU 13
-TaskCPU 8
+TaskCPU 2
+TaskCPU 4
+TaskCPU 6
 @4:
-TaskCPU 3
-TaskCPU 13
-@8:
-TaskCPU 8
-TaskCPU 3
+TaskCPU 2
+@4:
+TaskCPU 4
+@4:
+TaskCPU 6

ejer8-B.tsk

@@ -1,8 +1,9 @@
-TaskCPU 30
+TaskCPU 16
 TaskCPU 20
-@4:
-TaskCPU 10
-TaskCPU 30
-@8:
+TaskCPU 24
+@20:
+TaskCPU 16
+@20:
 TaskCPU 20
-TaskCPU 10
+@20:
+TaskCPU 24

ejer8-C.tsk

@@ -1,8 +1,12 @@
-TaskCPU 25
-TaskCPU 14
-@4:
-TaskCPU 3
-TaskCPU 25
-@8:
-TaskCPU 14
-TaskCPU 3
+TaskCPU 2
+TaskCPU 4
+TaskCPU 16
+TaskCPU 20
+@12:
+TaskCPU 2
+@12:
+TaskCPU 4
+@12:
+TaskCPU 16
+@12:
+TaskCPU 20

informe/8-informe.md

@@ -42,12 +42,12 @@ Utilizamos el siguiente lote:
 
 | Task | Tipo        | Release time | n  |
 |------|-------------|--------------|----|
-| 0    | TaskCPU     | 0            | 13  |
-| 1    | TaskCPU     | 0            | 8  |
-| 2    | TaskCPU     | 4            | 3  |
-| 3    | TaskCPU     | 4            | 13  |
-| 4    | TaskCPU     | 8            | 8  |
-| 5    | TaskCPU     | 8            | 3  |
+| 0    | TaskCPU     | 0            | 2  |
+| 1    | TaskCPU     | 0            | 4  |
+| 2    | TaskCPU     | 0            | 6  |
+| 3    | TaskCPU     | 4            | 2  |
+| 4    | TaskCPU     | 4            | 4  |
+| 5    | TaskCPU     | 4            | 6  |
 
 **latencia**
 **waiting time**
@@ -61,12 +61,12 @@ Utilizamos el siguiente lote:
 
 | Task | Tipo        | Release time | n  |
 |------|-------------|--------------|----|
-| 0    | TaskCPU     | 0            | 30 |
+| 0    | TaskCPU     | 0            | 16 |
 | 1    | TaskCPU     | 0            | 20 |
-| 2    | TaskCPU     | 4            | 10 |
-| 3    | TaskCPU     | 4            | 30 |
-| 4    | TaskCPU     | 8            | 20 |
-| 5    | TaskCPU     | 8            | 10 |
+| 2    | TaskCPU     | 0            | 24 |
+| 3    | TaskCPU     | 20           | 16 |
+| 4    | TaskCPU     | 20           | 20 |
+| 5    | TaskCPU     | 20           | 24 |
 
 **latencia**
 **waiting time**
@@ -80,12 +80,14 @@ Utilizamos el siguiente lote:
 
 | Task | Tipo        | Release time | n  |
 |------|-------------|--------------|----|
-| 0    | TaskCPU     | 0            | 25 |
-| 1    | TaskCPU     | 0            | 14 |
-| 2    | TaskCPU     | 4            | 3  |
-| 3    | TaskCPU     | 4            | 25 |
-| 4    | TaskCPU     | 8            | 14 |
-| 5    | TaskCPU     | 8            | 13 |
+| 0    | TaskCPU     | 0            | 2  |
+| 1    | TaskCPU     | 0            | 4  |
+| 2    | TaskCPU     | 0            | 16 |
+| 3    | TaskCPU     | 0            | 20 |
+| 4    | TaskCPU     | 12           | 2  |
+| 5    | TaskCPU     | 12           | 4  |
+| 6    | TaskCPU     | 12           | 16 |
+| 7    | TaskCPU     | 12           | 20 |
 
 
 **latencia**