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: 222 inserted, 121 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 ¶ +21 -3

                 def stat
                   @problem = Problem.find(params[:id])
-            -     if !@problem.available
+            +     unless @problem.available or session[:admin]
                     redirect_to :controller => 'main', :action => 'list'
-            -     else
-            -       @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
+            +       return
                   end
+            +     @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
+            +
+            +     #stat summary
+            +     range =65
+            +     @histogram = { data: Array.new(range,0), summary: {} }
+            +     @histogram[:data] = Array.new(range,0)
+            +     user = Hash.new(0)
+            +     @submissions.find_each do |sub|
+            +       d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
+            +       @histogram[:data][d.to_i] += 1 if d < range
+            +       user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
+            +     end
+            +     @histogram[:summary][:max] = [@histogram[:data].max,1].max
+            +
+            +     @summary = { attempt: user.count, solve: 0 }
+            +     user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def manage
                   problems
                 end
+            +   def get_problems_stat
+            +   end
+            +
               end

app/controllers/report_controller.rb ¶ +73 -76

		@@ -105,91 +105,88
105	105	end
106	106	end
107	107
108		- if @problem
109		- #aggregrate by language
110		- @by_lang = {}
111		- Submission.where(problem_id: @problem.id).find_each do \|sub\|
112		- lang = Language.find_by_id(sub.language_id)
113		- next unless lang
114		- next unless sub.points >= @problem.full_score
	108	+ return unless @problem
	109	+
	110	+ @by_lang = {} #aggregrate by language
115	111
116		- #initialize
117		- unless @by_lang.has_key?(lang.pretty_name)
118		- @by_lang[lang.pretty_name] = {
119		- runtime: { avail: false, value: 2**30-1 },
120		- memory: { avail: false, value: 2**30-1 },
121		- length: { avail: false, value: 2**30-1 },
122		- first: { avail: false, value: DateTime.new(3000,1,1) }
123		- }
124		- end
	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)
	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
125	121
126		- if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
127		- @by_lang[lang.pretty_name][:runtime] = {
128		- avail: true,
129		- user_id: sub.user_id,
130		- value: sub.max_runtime,
131		- sub_id: sub.id
132		- }
133		- end
	122	+ @summary[:count] += 1
	123	+ user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
134	124
135		- if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
136		- @by_lang[lang.pretty_name][:memory] = {
137		- avail: true,
138		- user_id: sub.user_id,
139		- value: sub.peak_memory,
140		- sub_id: sub.id
141		- }
142		- end
	125	+ lang = Language.find_by_id(sub.language_id)
	126	+ next unless lang
	127	+ next unless sub.points >= @problem.full_score
143	128
144		- if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
145		- !sub.user.admin?
146		- @by_lang[lang.pretty_name][~~:first~~] = {
147		- avail: true,
148		- user_id: sub.user_id,
149		- value: sub.submitted_at,
150		- sub_id: sub.id
151		- }
152		- end
	129	+ #initialize
	130	+ unless @by_lang.has_key?(lang.pretty_name)
	131	+ @by_lang[lang.pretty_name] = {
	132	+ runtime: { avail: false, value: 2**30-1 },
	133	+ memory: { avail: false, value: 2**30-1 },
	134	+ length: { avail: false, value: 2**30-1 },
	135	+ first: { avail: false, value: DateTime.new(3000,1,1) }
	136	+ }
	137	+ end
153	138
154		- if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
155		- @by_lang[lang.pretty_name][:length] = {
156		- avail: true,
157		- user_id: sub.user_id,
158		- value: sub.effective_code_length,
159		- sub_id: sub.id
160		- }
161		- end
162		- end
163		-
164		- #process user_id
165		- @by_lang.each do \|lang,prop\|
166		- prop.each do \|k,v\|
167		- v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
168		- end
	139	+ if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
	140	+ @by_lang[lang.pretty_name][:runtime] = { avail: true, user_id: sub.user_id, value: sub.max_runtime, sub_id: sub.id }
169	141	end
170	142
171		- #sum into best
172		- if @by_lang and @by_lang.first
173		- @best = @by_lang.first[1].clone
174		- @by_lang.each do \|lang,prop\|
175		- if @best[:runtime][:value] >= prop[:runtime][:value]
176		- @best[:runtime] = prop[:runtime]
177		- @best[:runtime][:lang] = lang
178		- end
179		- if @best[:memory][:value] >= prop[:memory][:value]
180		- @best[:memory] = prop[:memory]
181		- @best[:memory][:lang] = lang
182		- end
183		- if @best[:length][:value] >= prop[:length][:value]
184		- @best[:length] = prop[:length]
185		- @best[:length][:lang] = lang
186		- end
187		- if @best[:first][:value] >= prop[:first][:value]
188		- @best[:first] = prop[:first]
189		- @best[:first][:lang] = lang
190		- end
	143	+ if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
	144	+ @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
	145	+ end
	146	+
	147	+ if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
	148	+ !sub.user.admin?
	149	+ @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
	150	+ end
	151	+
	152	+ if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
	153	+ @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
	154	+ end
	155	+ end
	156	+
	157	+ #process user_id
	158	+ @by_lang.each do \|lang,prop\|
	159	+ prop.each do \|k,v\|
	160	+ v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
	161	+ end
	162	+ end
	163	+
	164	+ #sum into best
	165	+ if @by_lang and @by_lang.first
	166	+ @best = @by_lang.first[1].clone
	167	+ @by_lang.each do \|lang,prop\|
	168	+ if @best[:runtime][:value] >= prop[:runtime][:value]
	169	+ @best[:runtime] = prop[:runtime]
	170	+ @best[:runtime][:lang] = lang
	171	+ end
	172	+ if @best[:memory][:value] >= prop[:memory][:value]
	173	+ @best[:memory] = prop[:memory]
	174	+ @best[:memory][:lang] = lang
	175	+ end
	176	+ if @best[:length][:value] >= prop[:length][:value]
	177	+ @best[:length] = prop[:length]
	178	+ @best[:length][:lang] = lang
	179	+ end
	180	+ if @best[:first][:value] >= prop[:first][:value]
	181	+ @best[:first] = prop[:first]
	182	+ @best[:first][:lang] = lang
191	183	end
192	184	end
193	185	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	190	end
	191	+
195	192	end

app/models/problem.rb ¶ +7

                 def self.download_file_basedir
                   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

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

               %h1 Problem stat: #{@problem.name}
               %h2 Overview
+            +
+            + %table.info
+            +   %thead
+            +     %tr.info-head
+            +       %th Stat
+            +       %th Value
+            +   %tbody
+            +     %tr{class: cycle('info-even','info-odd')}
+            +       %td Submissions
+            +       %td= @submissions.count
+            +     %tr{class: cycle('info-even','info-odd')}
+            +       %td Solved/Attempted User
+            +       %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
+            +
+            + %h2 Submissions Count
+            + = render partial: 'application/bar_graph', locals: { histogram: @histogram }
+            +
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table.info#main_table

app/views/report/_task_hof.html.haml ¶ +57 -40

		@@ -2,47 +2,66
2	2	.hof_user { color: orangered; font-style: italic; }
3	3	.hof_language { color: green; font-style: italic; }
4	4	.hof_value { color: deeppink;font-style: italic; }
	5	+ .info_param { font-weight: bold;text-align: right; }
5	6
6		- %h2 ~~Overall of~~ #{Problem.find(params[:id]).full_name}
	7	+ %h1 (#{Problem.find(params[:id]).name}) #{Problem.find(params[:id]).full_name}
	8	+
	9	+ %h2 Problem Stat
	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.info_param Submissions
	18	+ %td= @summary[:count]
	19	+ %tr{class: cycle('info-even','info-odd')}
	20	+ %td.info_param Solved/Attempted User
	21	+ %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
	22	+ - if @best
	23	+ %tr{class: cycle('info-even','info-odd')}
	24	+ %td.info_param Best Runtime
	25	+ %td
	26	+ by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
	27	+ using <span class="hof_language">#{@best[:runtime][:lang]}</span>
	28	+ with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
	29	+ at submission
	30	+ = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
	31	+
	32	+ %tr{class: cycle('info-even','info-odd')}
	33	+ %td.info_param Best Memory Usage
	34	+ %td
	35	+ by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
	36	+ using <span class="hof_language">#{@best[:memory][:lang]}</span>
	37	+ with <span class="hof_value">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
	38	+ at submission
	39	+ = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
	40	+
	41	+ %tr{class: cycle('info-even','info-odd')}
	42	+ %td.info_param Shortest Code
	43	+ %td
	44	+ by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
	45	+ using <span class="hof_language">#{@best[:length][:lang]}</span>
	46	+ with <span class="hof_value">#{@best[:length][:value]} bytes</span>
	47	+ at submission
	48	+ = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
	49	+
	50	+ %tr{class: cycle('info-even','info-odd')}
	51	+ %td.info_param First solver
	52	+ %td
	53	+ #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
	54	+ using <span class="hof_language">#{@best[:first][:lang]}</span>
	55	+ on <span class="hof_value">#{@best[:first][:value]}</span>
	56	+ at submission
	57	+ = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
	58	+
	59	+
	60	+ %p
	61	+ This counts only for submission with 100% score <br/>
	62	+ Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
7	63
8	64	- if @best
9		- %b Best Runtime:
10		- by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
11		- using <span class="hof_language">#{@best[:runtime][:lang]}</span>
12		- with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
13		- at submission
14		- = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
15		- %br/
16		-
17		- %b Best Memory Usage:
18		- by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
19		- using <span class="hof_language">#{@best[:memory][:lang]}</span>
20		- with <span class="hof_value">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
21		- at submission
22		- = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
23		- %br/
24		-
25		- %b Shortest Code:
26		- by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
27		- using <span class="hof_language">#{@best[:length][:lang]}</span>
28		- with <span class="hof_value">#{@best[:length][:value]} bytes</span>
29		- at submission
30		- = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
31		- %br/
32		-
33		- %b First solver:
34		- #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
35		- using <span class="hof_language">#{@best[:first][:lang]}</span>
36		- on <span class="hof_value">#{@best[:first][:value]}</span>
37		- at submission
38		- = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
39		- %br/
40		-
41		-
42		- %p
43		- This counts only for submission with 100% score <br/>
44		- Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
45		-
46	65	%h2 By language
47	66
48	67	%table.info
		@@ -75,5 +94,3
75	94	= "(#{value[:first][:value]} @"
76	95	= "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
77	96
78		- - else
79		- %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: 222 inserted, 121 deleted

Sign in to your account

Commit r457:c81651eecbbd public

Author

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

Commit `r457:c81651eecbbd` public