Browse Source

args invalidos rsjf sjf

David 10 years ago
parent
commit
28667118fe

+ 2 - 2
casos/cpu_1c_1.json

@@ -3,7 +3,7 @@
   "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 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedRSJF 1 5 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu.tsk", "args": "1 02 9 SchedSJF 1 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/cpu_1c_2.json

@@ -3,7 +3,7 @@
   "list" : [
 	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedFCFS" },
 	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedRR 1 30" },
-	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedRSJF 1 30 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu.tsk", "args": "1 12 90 SchedSJF 1 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/cpu_4c_1.json

@@ -3,7 +3,7 @@
   "list" : [
 	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedFCFS" },
 	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedRR 4 5 5 5 5" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedRSJF 4 5 5 5 5 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu.tsk", "args": "4 2 9 SchedSJF 4 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/cpu_4c_2.json

@@ -3,7 +3,7 @@
   "list" : [
 	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedFCFS" },
 	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedRR 4 30 30 30 30" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedRSJF 4 30 30 30 30 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu.tsk", "args": "4 12 90 SchedSJF 4 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/cpuheavy_1c_1.json

@@ -3,7 +3,7 @@
   "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 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedRSJF 1 5 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpuh_io.tsk", "args": "1 02 9 SchedSJF 1 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/cpuheavy_1c_2.json

@@ -3,7 +3,7 @@
   "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 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedRSJF 1 5 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpuh_io.tsk", "args": "1 12 90 SchedSJF 1 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/cpuheavy_4c_1.json

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

+ 3 - 3
casos/cpuheavy_4c_2.json

@@ -2,8 +2,8 @@
   "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 50 50 50 50" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRR 4 30 30 30 30" },
+	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedRSJF 4 30 30 30 30 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpuh_io.tsk", "args": "4 12 90 SchedSJF 4 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/ioheavy_1c_1.json

@@ -3,7 +3,7 @@
   "list" : [
 	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 02 9 SchedFCFS" },
 	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 02 9 SchedRR 1 5" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 02 9 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 02 9 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 02 9 SchedRSJF 1 5 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 02 9 SchedSJF 1 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/ioheavy_1c_2.json

@@ -3,7 +3,7 @@
   "list" : [
 	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 12 90 SchedFCFS" },
 	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 12 90 SchedRR 1 5" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 12 90 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 12 90 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 12 90 SchedRSJF 1 5 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "1 12 90 SchedSJF 1 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 2 - 2
casos/ioheavy_4c_1.json

@@ -3,7 +3,7 @@
   "list" : [
 	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 2 9 SchedFCFS" },
 	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 2 9 SchedRR 4 5 5 5 5" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 2 9 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 2 9 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 2 9 SchedRSJF 4 5 5 5 5 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 2 9 SchedSJF 4 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }

+ 3 - 3
casos/ioheavy_4c_2.json

@@ -2,8 +2,8 @@
   "filename": "informe/imagenes/caso_ioh_4_2.png",
   "list" : [
 	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 12 90 SchedFCFS" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 12 90 SchedRR 4 50 50 50 50" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 12 90 SchedRSJF 15 15 15 8 8 8 15 15 15 15 15 15" },
-	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 12 90 SchedSJF 15 15 15 8 8 8 15 15 15 15 15 15" }
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 12 90 SchedRR 4 30 30 30 30" },
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 12 90 SchedRSJF 4 30 30 30 30 15 15 15 8 8 8 15 15 15 15 15 15" },
+	{ "tasks": "casos/cpu_ioh.tsk", "args": "4 12 90 SchedSJF 4 15 15 15 8 8 8 15 15 15 15 15 15" }
   ]
 }