Changeset 1152 for trunk/eval

Timestamp:

09/24/11 15:43:22 (8 months ago)

Author:

bogdan2412

Message:

Fixes from eval.

File:

• trunk/eval/classic_grader.php (modified) (2 diffs)

trunk/eval/classic_grader.php

@@ -66 +66 @@
     $capture_std = ('py' == $job['compiler_id']);
 
+    // Adjust time and memory limit for Python jobs.
+    if ('py' == $job['compiler_id']) {
+        $factor_memlimit = 2.0;
+        $factor_timelimit = 12.0;
+    } else {
+        $factor_memlimit = 1.0;
+        $factor_timelimit = 1.0;
+    }
+
     // Running tests.
     $test_score = array();
@@ -111 +120 @@
 
             // Run user program.
-            $jrunres = jail_run($userfile, $jaildir, $tparams['timelimit'] * 1000,
-                        $tparams['memlimit'], $capture_std);
-            log_assert($jrunres['result'] != 'ERROR', "Error in jrun.");
+            $jrunres = jail_run($userfile, $jaildir,
+                        (int)($tparams['timelimit'] * 1000 * $factor_timelimit),
+                        (int)($tparams['memlimit'] * $factor_memlimit),
+                        $capture_std);
+            log_assert($jrunres['result'] != 'ERROR',
+                        "Error in jrun: ".$jrunres['message']);
             if ($jrunres['result'] == 'FAIL') {
                 log_print("Test $testno: User program failed: {$jrunres['message']} ".