cafe-grader-judge-scripts Commit

cafe-grader-judge-scripts

Commit `r51:3618759afb50` public

parent | child

Description:

[grader] added fractional timelimit git-svn-id: http://theory.cpe.ku.ac.th/grader/judge/trunk/scripts@191 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r51:3618759afb50 - Thu, 24 Apr 2008 01:23:28 - 6 files changed: 66 inserted, 57 deleted

test/data/test2_05sec.c created 644 ¶ +38

			@@ -0,0 +1,38
		1	+ #include <stdio.h>
		2	+ #include <stdlib.h>
		3	+ #include <unistd.h>
		4	+ #include <sys/time.h>
		5	+ #include <time.h>
		6	+ #include <sys/resource.h>
		7	+
		8	+ // run it for 1.5 s
		9	+
		10	+ int main()
		11	+ {
		12	+ int a,b;
		13	+
		14	+ int c=0;
		15	+
		16	+ scanf("%d %d",&a,&b);
		17	+ printf("%d\n",a+b);
		18	+
		19	+ struct rusage ru;
		20	+
		21	+ while(1) {
		22	+ c++;
		23	+ b+=c;
		24	+ while(c<100000) {
		25	+ c++;
		26	+ b+=c;
		27	+ }
		28	+ getrusage(RUSAGE_SELF,&ru);
		29	+ double rtime = ru.ru_utime.tv_sec + ru.ru_stime.tv_sec;
		30	+ rtime += (double)ru.ru_utime.tv_usec / 1000000.0;
		31	+ rtime += (double)ru.ru_stime.tv_usec / 1000000.0;
		32	+ if(rtime > 0.5)
		33	+ break;
		34	+ }
		35	+ printf("%d\n",b);
		36	+ exit(0);
		37	+ }
		38	+

grader ¶ +10 -5

               when "prob"
                 engine = Grader::Engine.new
                 runner = Grader::Runner.new(engine, grader_proc)
                 grader_proc.report_active if grader_proc!=nil
-            -   prob = Problem.find_by_name(ARGV[2])
-            -   if prob==nil
-            -     puts "cannot find problem: #{ARGV[2]}"
-            -   else
-            -     runner.grade_problem(prob)
+            +   ARGV.shift
+            +   ARGV.shift
+            +
+            +   ARGV.each do |prob_name|
+            +     prob = Problem.find_by_name(prob_name)
+            +     if prob==nil
+            +       puts "cannot find problem: #{prob_name}"
+            +     else
+            +       runner.grade_problem(prob)
+            +     end
                 end
               else
                 display_manual
                 exit(0)
               end

std-script/box.cc ¶ +10 -7

               #include <sys/resource.h>
               #define NONRET __attribute__((noreturn))
               #define UNUSED __attribute__((unused))
               static int filter_syscalls;		/* 0=off, 1=liberal, 2=totalitarian */
-            - static int timeout;
+            + static double timeout;
               static int pass_environ;
               static int use_wall_clock;
               static int file_access;
               static int verbose;
               static int memory_limit;
               static int allow_times;
                 die("Interrupted.");
               }
               static void
               check_timeout(void)
               {
-            -   int sec;
+            +   double sec;
                 if (use_wall_clock)
-            -     sec = time(NULL) - start_time;
+            +     sec = (double)(time(NULL) - start_time);
                 else
                   {
                     char buf[4096], *x;
                     int c, utime, stime;
                     static int proc_status_fd;
                     if (!proc_status_fd)
               	x++;
                     while (*x == ')' || *x == ' ')
               	x++;
                     if (sscanf(x, "%*c %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %d %d", &utime, &stime) != 2)
               	die("proc syntax error 2");
                     //printf("%s - %d\n",x,ticks_per_sec);
-            -       sec = (utime + stime + ticks_per_sec-1)/ticks_per_sec;
+            +       sec = ((double)(utime + stime))/(double)ticks_per_sec;
                   }
                 if (verbose > 1)
                   fprintf(stderr, "[timecheck: %d seconds]\n", sec);
                 if (sec > timeout) {
-            -     die("Time limit exceeded.");
+            +     die("Time limit exceeded.",sec,timeout);
                 }
               }
               static void
               check_memory_usage()
               {
               	  wall = time(NULL) - start_time;
               	  timeradd(&rus.ru_utime, &rus.ru_stime, &total);
               	  box_pid = 0;
               	  if (WEXITSTATUS(stat))
               	    fprintf(stderr,"Exited with error status %d.\n", WEXITSTATUS(stat));
-            - 	  else if ((use_wall_clock ? wall : total.tv_sec) > timeout)
+            + 	  else if ((use_wall_clock ?
+            + 		    wall :
+            + 		    (double) total.tv_sec +
+            + 		    ((double) total.tv_usec/1000000.0)) > timeout)
               	    fprintf(stderr,"Time limit exceeded.\n");
               	  else
               	    // report OK and statistics
               	    fprintf(stderr,"OK\n");
               	  print_running_stat((double) wall,
               	memory_limit = atol(optarg);
               	break;
                     case 'o':
               	redir_stdout = optarg;
               	break;
                     case 't':
-            - 	timeout = atol(optarg);
+            + 	timeout = atof(optarg);
               	break;
                     case 'T':
               	allow_times++;
               	break;
                     case 'v':
               	verbose++;

test/data/ev/test_timeout/test_cases/all_tests.cfg ¶ +5 -1

                 num_tests 2
                 full_score 20
                 time_limit_each 1
                 mem_limit_each 16
                 score_each 10
+            +   test 1 do
+            +     time_limit 0.5
+            +   end
+            +
                 run 1 do
                   tests 1
                 end
                 test 2 do
-            -     time_limit 2
+            +     time_limit 0.6
                 end
                 run 2 do
                   tests 2
                 end

test/engine_spec.rb ¶ +3 -3

                                 :on => @problem_test_timeout,
                                 :and_report => {
                                   :score => 0,
                                   :comment => 'FAILED: TT'})
                 end
-            -   it "should produce timeout error correctly when submission runs slower than expected in less than a second" do
-            -     @problem_test_timeout = stub(Problem,
+            +   it "should produce timeout error correctly with fractional running time and fractional time limits" do
+            +      @problem_test_timeout = stub(Problem,
                                                :id => 1, :name => 'test_timeout',
                                                :full_score => 20)
-            -     grader_should(:grade => "test2_1-5sec.c",
+            +     grader_should(:grade => "test2_05sec.c",
                                 :on => @problem_test_timeout,
                                 :and_report => {
                                   :score => 10,
                                   :comment => 'FAILED: TP'})
                 end

test/data/test2_1-5sec.c removed ¶ -41

deleted file

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r51:3618759afb50 - Thu, 24 Apr 2008 01:23:28 - 6 files changed: 66 inserted, 57 deleted

Sign in to your account

Commit r51:3618759afb50 public

Author

r51:3618759afb50 - Thu, 24 Apr 2008 01:23:28 - 6 files changed: 66 inserted, 57 deleted

Commit `r51:3618759afb50` public