Преглед изворни кода

saco mfq de lsa pruebsa; arreglo algunos errores

David пре 10 година
родитељ
комит
925971c6e8

+ 4 - 4
casos/cpu.tsk

@@ -1,7 +1,7 @@
-*3 TaskCPU 10
+*3 TaskCPU 15
 @5:
-*3 TaskCPU 3
+*3 TaskCPU 8
 @6:
-*5 TaskCPU 10
+*5 TaskCPU 15
 @8:
-TaskCPU 10
+TaskCPU 15

+ 0 - 1
casos/cpu_1c_1.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedFCFS" },
 	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedRR 1 5" },
-	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedSJF  1 5" }
   ]

+ 0 - 1
casos/cpu_1c_2.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedFCFS" },
 	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedRR 1 5" },
-	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedSJF  1 5" }
   ]

+ 1 - 2
casos/cpu_4c_1.json

@@ -2,8 +2,7 @@
   "filename": "informe/imagenes/caso_cpu_4_1.png",
   "list" : [
 	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedFCFS" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedRR 4 5" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedMFQ  10 5" },
+	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedRR 4 5 5 5 5" },
 	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedSJF  1 5" }
   ]

+ 1 - 2
casos/cpu_4c_2.json

@@ -2,8 +2,7 @@
   "filename": "informe/imagenes/caso_cpu_4_2.png",
   "list" : [
 	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedFCFS" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedRR 4 5" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedMFQ  10 5" },
+	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedRR 4 50 50 50 50" },
 	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedSJF  1 5" }
   ]

+ 0 - 1
casos/cpuheavy_1c_1.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedFCFS" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedRR 1 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedSJF  1 5" }
   ]

+ 0 - 1
casos/cpuheavy_1c_2.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedFCFS" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedRR 1 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedSJF  1 5" }
   ]

+ 0 - 1
casos/cpuheavy_4c_1.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedFCFS" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedRR 4 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedSJF  1 5" }
   ]

+ 1 - 2
casos/cpuheavy_4c_2.json

@@ -2,8 +2,7 @@
   "filename": "informe/imagenes/caso_cpuh_4_2.png",
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedFCFS" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRR 4 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedMFQ  10 5" },
+	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRR 4 50 50 50 50" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedSJF  1 5" }
   ]

+ 0 - 1
casos/ioheavy_1c_1.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedFCFS" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedRR 1 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedSJF  1 5" }
   ]

+ 0 - 1
casos/ioheavy_1c_2.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedFCFS" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedRR 1 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedSJF  1 5" }
   ]

+ 0 - 1
casos/ioheavy_4c_1.json

@@ -3,7 +3,6 @@
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedFCFS" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedRR 4 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedMFQ  10 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 2 9 SchedSJF  1 5" }
   ]

+ 1 - 2
casos/ioheavy_4c_2.json

@@ -2,8 +2,7 @@
   "filename": "informe/imagenes/caso_cpuh_4_2.png",
   "list" : [
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedFCFS" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRR 4 5" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedMFQ  10 5" },
+	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRR 4 50 50 50 50" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRSJF 1 5" },
 	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedSJF  1 5" }
   ]