cafe-grader-web Commit - r457:c81651eecbbd

cafe-grader-web

Commit `r457:c81651eecbbd` public

parent | child

Description:

add more problem stat

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r457:c81651eecbbd - Thu, 25 Sep 2014 18:30:21 - 7 files changed: 144 inserted, 43 deleted

app/views/application/_bar_graph.html.haml created 644 ¶ +44

@@ -0,0 +1,44
	1	+ - param = {} unless param
	2	+ - graph_height = param[:graph_height] \|\| 100
	3	+ - bar_width = param[:bar_width] \|\| 14
	4	+ - graph_width = (bar_width * histogram[:data].count) + 20
	5	+ :css
	6	+ .hist_bar {
	7	+ width: #{bar_width-1}px;
	8	+ position: absolute;
	9	+ background-color: lightblue;
	10	+ }
	11	+ .hist_fill {
	12	+ width: #{bar_width-1}px;
	13	+ position: absolute;
	14	+ background-color: #eee;
	15	+ }
	16	+ .hist_text {
	17	+ position: absolute;
	18	+ font-size:5px;
	19	+ }
	20	+
	21	+ %div{style: "position: relative; width: #{graph_width}px; height: 150px; background-color:#fff;" }
	22	+ //draw background
	23	+ - histogram[:data].each_index do \|i\|
	24	+ - height = histogram[:data][i] * graph_height / histogram[:summary][:max]
	25	+ - top = graph_height - height
	26	+ - left = graph_width - (i+1)*bar_width
	27	+ %div.hist_fill{style: "top: 0px; height: #{graph_height - height}px; left: #{left}px;" }
	28	+ // draw horizontal line
	29	+ - line = 3
	30	+ - line.times do \|i\|
	31	+ - top = graph_height - graph_height * (i+0.5)/ line
	32	+ %div{style: "position:absolute;width: #{graph_width-21}px;height: 1px;left: 20px;top:#{top}px;background-color: #333;"}
	33	+ %div.hist_text{style: "position:absolute;left: 0px;top:#{top-6}px"}
	34	+ =((i+0.5) * histogram[:summary][:max] / line).to_i
	35	+ // draw the actual bar and text
	36	+ - @histogram[:data].each_index do \|i\|
	37	+ - height = histogram[:data][i] * graph_height / histogram[:summary][:max]
	38	+ - top = graph_height - height
	39	+ - left = graph_width - (i+1)*bar_width
	40	+ %div.hist_bar{style: "top: #{top}px; height: #{height}px; left: #{left}px; dae: #{histogram[:data][i]}" }
	41	+ - if i % 7 == 1
	42	+ %div.hist_text{style: "top:#{graph_height + 5}px;left: #{left}px;"} #{(Time.zone.today - i.day).strftime('%-d')}
	43	+ - if (Time.now.in_time_zone - i.day).day == 15
	44	+ %div.hist_text{style: "top:#{graph_height + 15}px;left: #{left}px;"} #{(Time.zone.today - i.day).strftime('%b')}

app/controllers/problems_controller.rb ¶ +20 -2

@@ -150,11 +150,26
150		150
151	def stat	151	def stat
152	@problem = Problem.find(params[:id])	152	@problem = Problem.find(params[:id])
153	- if !@problem.available	153	+ unless @problem.available or session[:admin]
154	redirect_to :controller => 'main', :action => 'list'	154	redirect_to :controller => 'main', :action => 'list'
155	- else	155	+ return
		156	+ end
156	@submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)	157	@submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
		158	+
		159	+ #stat summary
		160	+ range =65
		161	+ @histogram = { data: Array.new(range,0), summary: {} }
		162	+ @histogram[:data] = Array.new(range,0)
		163	+ user = Hash.new(0)
		164	+ @submissions.find_each do \|sub\|
		165	+ d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
		166	+ @histogram[:data][d.to_i] += 1 if d < range
		167	+ user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
157	end	168	end
		169	+ @histogram[:summary][:max] = [@histogram[:data].max,1].max
		170	+
		171	+ @summary = { attempt: user.count, solve: 0 }
		172	+ user.each_value { \|v\| @summary[:solve] += 1 if v == 1 }
158	end	173	end
159		174
160	def manage	175	def manage
@@ -257,4 +272,7
257	problems	272	problems
258	end	273	end
259		274
		275	+ def get_problems_stat
260	end	276	end
		277	+
		278	+ end

app/controllers/report_controller.rb ¶ +25 -28

@@ -105,10 +105,23
105	end	105	end
106	end	106	end
107		107
108	- if @problem	108	+ return unless @problem
109	- #aggregrate by language	109	+
110	- @by_lang = {}	110	+ @by_lang = {} #aggregrate by language
		111	+
		112	+ range =65
		113	+ @histogram = { data: Array.new(range,0), summary: {} }
		114	+ @histogram[:data] = Array.new(range,0)
		115	+ @summary = {count: 0, solve: 0, attempt: 0}
		116	+ user = Hash.new(0)
111	Submission.where(problem_id: @problem.id).find_each do \|sub\|	117	Submission.where(problem_id: @problem.id).find_each do \|sub\|
		118	+ #histogram
		119	+ d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
		120	+ @histogram[:data][d.to_i] += 1 if d < range
		121	+
		122	+ @summary[:count] += 1
		123	+ user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
		124	+
112	lang = Language.find_by_id(sub.language_id)	125	lang = Language.find_by_id(sub.language_id)
113	next unless lang	126	next unless lang
114	next unless sub.points >= @problem.full_score	127	next unless sub.points >= @problem.full_score
@@ -124,40 +137,20
124	end	137	end
125		138
126	if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]	139	if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
127	- @by_lang[lang.pretty_name][:runtime] = {	140	+ @by_lang[lang.pretty_name][:runtime] = { avail: true, user_id: sub.user_id, value: sub.max_runtime, sub_id: sub.id }
128	- avail: true,
129	- user_id: sub.user_id,
130	- value: sub.max_runtime,
131	- sub_id: sub.id
132	- }
133	end	141	end
134		142
135	if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]	143	if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
136	- @by_lang[lang.pretty_name][:memory] = {	144	+ @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
137	- avail: true,
138	- user_id: sub.user_id,
139	- value: sub.peak_memory,
140	- sub_id: sub.id
141	- }
142	end	145	end
143		146
144	if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and	147	if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
145	!sub.user.admin?	148	!sub.user.admin?
146	- @by_lang[lang.pretty_name][:first] = {	149	+ @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
147	- avail: true,
148	- user_id: sub.user_id,
149	- value: sub.submitted_at,
150	- sub_id: sub.id
151	- }
152	end	150	end
153		151
154	if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length	152	if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
155	- @by_lang[lang.pretty_name][:length] = {	153	+ @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
156	- avail: true,
157	- user_id: sub.user_id,
158	- value: sub.effective_code_length,
159	- sub_id: sub.id
160	- }
161	end	154	end
162	end	155	end
163		156
@@ -190,6 +183,10
190	end	183	end
191	end	184	end
192	end	185	end
193	- end	186	+
		187	+ @histogram[:summary][:max] = [@histogram[:data].max,1].max
		188	+ @summary[:attempt] = user.count
		189	+ user.each_value { \|v\| @summary[:solve] += 1 if v == 1 }
194	end	190	end
		191	+
195	end	192	end

app/models/problem.rb ¶ +7

                   return "#{Rails.root}/data/tasks"
                 end
+            +   def get_submission_stat
+            +     result = Hash.new
+            +     #total number of submission
+            +     result[:total_sub] = Submission.where(problem_id: self.id).count
+            +     result[:attempted_user] = Submission.where(problem_id: self.id).group_by(:user_id)
+            +   end
+            +
                 protected
                 def self.to_i_or_default(st, default)

app/views/problems/stat.html.haml ¶ +17

@@ -6,6 +6,23
6	%h1 Problem stat: #{@problem.name}	6	%h1 Problem stat: #{@problem.name}
7	%h2 Overview	7	%h2 Overview
8		8
		9	+
		10	+ %table.info
		11	+ %thead
		12	+ %tr.info-head
		13	+ %th Stat
		14	+ %th Value
		15	+ %tbody
		16	+ %tr{class: cycle('info-even','info-odd')}
		17	+ %td Submissions
		18	+ %td= @submissions.count
		19	+ %tr{class: cycle('info-even','info-odd')}
		20	+ %td Solved/Attempted User
		21	+ %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
		22	+
		23	+ %h2 Submissions Count
		24	+ = render partial: 'application/bar_graph', locals: { histogram: @histogram }
		25	+
9	%h2 Submissions	26	%h2 Submissions
10	- if @submissions and @submissions.count > 0	27	- if @submissions and @submissions.count > 0
11	%table.info#main_table	28	%table.info#main_table

app/views/report/_task_hof.html.haml ¶ +28 -11

                 .hof_user { color: orangered; font-style: italic; }
                 .hof_language { color: green; font-style: italic; }
                 .hof_value { color: deeppink;font-style: italic; }
+            +   .info_param { font-weight: bold;text-align: right; }
-            - %h2 Overall of #{Problem.find(params[:id]).full_name}
+            + %h1 (#{Problem.find(params[:id]).name}) #{Problem.find(params[:id]).full_name}
+            + %h2 Problem Stat
+            + %table.info
+            +   %thead
+            +     %tr.info-head
+            +       %th Stat
+            +       %th Value
+            +   %tbody
+            +     %tr{class: cycle('info-even','info-odd')}
+            +       %td.info_param Submissions
+            +       %td= @summary[:count]
+            +     %tr{class: cycle('info-even','info-odd')}
+            +       %td.info_param Solved/Attempted User
+            +       %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
                   - if @best
-            -   %b Best Runtime:
+            +       %tr{class: cycle('info-even','info-odd')}
+            +         %td.info_param Best Runtime
+            +         %td
                         by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
                         using <span class="hof_language">#{@best[:runtime][:lang]}</span>
                         with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
                         at submission
                         = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
-            -   %br/
-            -   %b Best Memory Usage:
+            +       %tr{class: cycle('info-even','info-odd')}
+            +         %td.info_param Best Memory Usage
+            +         %td
                         by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
                         using <span class="hof_language">#{@best[:memory][:lang]}</span>
                         with <span class="hof_value">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
                         at submission
                         = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
-            -   %br/
-            -   %b Shortest Code:
+            +       %tr{class: cycle('info-even','info-odd')}
+            +         %td.info_param Shortest Code
+            +         %td
                         by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
                         using <span class="hof_language">#{@best[:length][:lang]}</span>
                         with  <span class="hof_value">#{@best[:length][:value]} bytes</span>
                         at submission
                         = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
-            -   %br/
-            -   %b First solver:
+            +       %tr{class: cycle('info-even','info-odd')}
+            +         %td.info_param First solver
+            +         %td
                         #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
                         using <span class="hof_language">#{@best[:first][:lang]}</span>
                         on <span class="hof_value">#{@best[:first][:value]}</span>
                         at submission
                         = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
-            -   %br/
               %p
                 This counts only for submission with 100% score <br/>
                 Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
+            + - if @best
                 %h2 By language
                 %table.info
                             = "(#{value[:first][:value]} @"
                             = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
-            - - else
-            -   %h3 No submissions

app/views/report/problem_hof.html.haml ¶ +3 -2

               /  %h1 All-Time Hall of Fame
-            - %h1 Tasks Hall of Fame
+            + %h1 Hall of Fame
               .task-menu
                 Tasks
                 %br/
                 Please select a problem.
               - else
                 =render partial: 'task_hof'
+            +   %h2 Submission History
+            +   =render partial: 'application/bar_graph', locals: { histogram: @histogram }

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

r457:c81651eecbbd - Thu, 25 Sep 2014 18:30:21 - 7 files changed: 144 inserted, 43 deleted

Sign in to your account

Commit r457:c81651eecbbd public

Author

r457:c81651eecbbd - Thu, 25 Sep 2014 18:30:21 - 7 files changed: 144 inserted, 43 deleted

Commit `r457:c81651eecbbd` public