From 0b75c398c7cd04ae3efa76723ccfdabc2a71dc5a Mon Sep 17 00:00:00 2001
From: Martin Polanka <PolankaMartin@gmail.com>
Date: Fri, 18 Dec 2015 22:20:41 +0100
Subject: [PATCH] Updated Assignments overview (markdown)

---
 Assignments-overview.md | 61 ++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/Assignments-overview.md b/Assignments-overview.md
index e3f2d42..0106248 100644
--- a/Assignments-overview.md
+++ b/Assignments-overview.md
@@ -67,36 +67,12 @@ files:  # or can be in tasks, sha1 hashing function
 	"recodex.cpp": 94549d889ae96210ff2a73bd0a5bbe3185f05ff6
 	"01.in": 94549d889ae96210ff2a73bd0a5bbe3185f05ff6
 tasks:
-	- task-id: "compile_test01"
-	  priority: 1
-	  fatal-failure: true
-	  cmd: "g++"
-	  stdin: "recodex.cpp"
-	  stdout: "compile01.out"
-	  stderr: "compile01.err"
-	  log: "compile.log"
-	  sandbox:  # if defined task is external and will be run in sandbox
-		name: "isolate"
-		limits:
-			time: 5  # seconds
-			wall-time: 6  # seconds
-			extra-time: 2  # seconds
-			stack-size: 50000  # KB
-			memory: 50000  # in KB
-			parallel: false  # time and memory limits are merged from all potential processes/threads
-			disk-usage: 5  # MB
-			directory-bindings:
-				- "/tmp/prepared": "/box"
-				- "/tmp/skeleton": "/"
-			environ-variable:
-				ISOLATE_BOX: "/box"
-				ISOLATE_TMP: "/tmp"
 	- task-id: "move_test01"
 	  priority: 2
 	  dependencies:
 		- compile_test01
-	  source: "recodex"
-	  destination: "/codex/boxes/tmp/recodex"
+	  source: "recodex.cpp"
+	  destination: "/codex/boxes/tmp/recodex.cpp"
 	  cmd: "mv"
 	  log: "move.log"
 	- task-id: "eval_test01"
@@ -112,17 +88,32 @@ tasks:
 	  sandbox:  # if defined task is external and will be run in sandbox
 		name: "isolate"
 		limits:
-			time: 5  # seconds
-			wall-time: 6  # seconds
-			extra-time: 2  # seconds
-			stack-size: 50000  # KB
-			memory: 50000  # in KB
-			parallel: false  # time and memory limits are merged from all potential processes/threads
-			disk-usage: 5  # MB
-			directory-bindings:
+			- hw-group-id: group1  # determines specific limits for specific machines
+			  time: 5  # seconds
+			  wall-time: 6  # seconds
+			  extra-time: 2  # seconds
+			  stack-size: 50000  # KB
+			  memory: 50000  # in KB
+			  parallel: false  # time and memory limits are merged from all potential processes/threads
+			  disk-usage: 5  # MB
+			  directory-bindings:
+				- "/tmp/prepared": "/box"
+				- "/tmp/skeleton": "/"
+			  environ-variable:
+				ISOLATE_BOX: "/box"
+				ISOLATE_TMP: "/tmp"
+			- hw-group-id: group2  # determines specific limits for specific machines
+			  time: 6  # seconds
+			  wall-time: 7  # seconds
+			  extra-time: 3  # seconds
+			  stack-size: 60000  # KB
+			  memory: 60000  # in KB
+			  parallel: false  # time and memory limits are merged from all potential processes/threads
+			  disk-usage: 50  # MB
+			  directory-bindings:
 				- "/tmp/prepared": "/box"
 				- "/tmp/skeleton": "/"
-			environ-variable:
+			  environ-variable:
 				ISOLATE_BOX: "/box"
 				ISOLATE_TMP: "/tmp"
 ...