Projects November 2005

projects@lrde.epita.fr

6 participants
85 discussions

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add an output selector. * web/ranch/test/functional/graph_form_controller_test.rb: Test the draw request with a non default output arg_num number. * web/ranch/test/fixtures/outputs.yml: Add output with different name/unit to test the feature. * web/ranch/app/helpers/graph_helper.rb: Accept arg_num as argument. * web/ranch/app/helpers/graph_form_helper.rb: An helper to build a output selector. * web/ranch/app/controllers/graph_controller.rb: Accept a variable output arg_num. * web/ranch/app/controllers/graph_form_controller.rb: Set the proper output arg_num. * web/ranch/app/views/graph_form/index.rhtml: Add a output selector in the form. app/controllers/graph_controller.rb | 3 +-- app/controllers/graph_form_controller.rb | 5 ++++- app/helpers/graph_form_helper.rb | 21 +++++++++++++++++++++ app/helpers/graph_helper.rb | 10 ++++++++-- app/views/graph_form/index.rhtml | 3 ++- test/fixtures/outputs.yml | 23 +++++++++++++++++------ test/functional/graph_form_controller_test.rb | 15 +++++++++++++++ 7 files changed, 68 insertions(+), 12 deletions(-) Index: web/ranch/test/functional/graph_form_controller_test.rb --- web/ranch/test/functional/graph_form_controller_test.rb (revision 18) +++ web/ranch/test/functional/graph_form_controller_test.rb (working copy) @@ -74,4 +74,19 @@ assert flash.has_key? :error end + def test_draw_output_arg_num + post :draw, { + :project_id => 1, + :bench_name => 'determinize', + :revision => { :start => 1, :stop => 10 }, + :output_arg_num => 0, + } + assert_response :success + assert_template 'index' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench_name) + assert_equal 0, assigns(:output_arg_num) + end + end Index: web/ranch/test/fixtures/outputs.yml --- web/ranch/test/fixtures/outputs.yml (revision 18) +++ web/ranch/test/fixtures/outputs.yml (working copy) @@ -1,12 +1,23 @@ <% id = 0 %> -<% val = 5; (1..10).each do |rev| %> -<%= "determinize_r#{rev}_utime:" %> +<% arg_num = 0 + { + 'utime' => 'sec', + 'memory' => 'KB', + 'nb_states' => '' + }.each do |name, unit| %> + +<% val = 5 + arg_num += 1 + (1..10).each do |rev| %> + +<%= "determinize_r#{rev}_#{name}:" %> id: <%= id += 1 %> - name: utime - value: <%= val += rev %> - unit: sec + name: <%= name %> + value: <%= val += rev + name.size %> + unit: <%= unit.inspect %> bench_id: <%= rev %> - arg_num: 1 + arg_num: <%= arg_num %> +<% end %> <% end %> Index: web/ranch/app/helpers/graph_helper.rb --- web/ranch/app/helpers/graph_helper.rb (revision 18) +++ web/ranch/app/helpers/graph_helper.rb (working copy) @@ -1,13 +1,19 @@ module GraphHelper - def graph_reg_tag(project_id, bench_name, rev_start, rev_stop, options={}) + def graph_reg_tag(project_id, + bench_name, + rev_start, + rev_stop, + arg_num, + options={}) url = { :controller => 'graph', :action => 'regression', :project_id => project_id, :bench_name => bench_name, :rev_start => rev_start, - :rev_stop => rev_stop + :rev_stop => rev_stop, + :arg_num => arg_num } options = url.merge(options) "<img src=\"#{url_for options}\" " + Index: web/ranch/app/helpers/graph_form_helper.rb --- web/ranch/app/helpers/graph_form_helper.rb (revision 18) +++ web/ranch/app/helpers/graph_form_helper.rb (working copy) @@ -1,2 +1,23 @@ module GraphFormHelper + + def outputs_tag(name, bench_name, arg_num=0, nb_arg=1, options={}) + bench = Bench.find_by_name bench_name + outputs = Output.find_by_sql "SELECT name, unit, arg_num " + + "FROM outputs " + + "WHERE bench_id = #{bench.id} " + + "GROUP BY arg_num " + + "ORDER BY arg_num" + + str = %(<select id="#{name}" name="#{name}">\n) + str += %(<option value="0" #{arg_num.zero? ? 'selected="selected"' : ''}>) + str += "**ALL**</option>\n" + outputs.each do |output| + str += %(<option value="#{output.arg_num}") + str += %( selected="selected") if output.arg_num == arg_num + str += %(>#{output.name}(#{output.unit})</option>\n) + end + str += %(</select>\n) + end + + end Index: web/ranch/app/controllers/graph_controller.rb --- web/ranch/app/controllers/graph_controller.rb (revision 18) +++ web/ranch/app/controllers/graph_controller.rb (working copy) @@ -5,7 +5,6 @@ def regression @project = Project.find params[:project_id] @bench_name = params[:bench_name] - @output_num = 1 #FIXME: manage several outputs results = Bench.find_by_sql "SELECT outputs.value, outputs.name, " + "outputs.unit, benches.revision " + @@ -13,7 +12,7 @@ "WHERE benches.project_id = #{(a)project.id} " + "AND benches.name = '#@bench_name' " + "AND outputs.bench_id = benches.id " + - "AND outputs.arg_num = #@output_num " + + "AND outputs.arg_num = #{params[:arg_num]} " + "AND #{params[:rev_start]} <= benches.revision " + "AND benches.revision <= #{params[:rev_stop]} " + "ORDER BY benches.revision" Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 18) +++ web/ranch/app/controllers/graph_form_controller.rb (working copy) @@ -1,5 +1,6 @@ class GraphFormController < ApplicationController - helper :graph + helper :graph, :graph_form + layout 'ranch' DEFAULT_REVISION_RANGE = 100 @@ -7,6 +8,7 @@ def index @bench_name = params[:bench_name] @project = Project.find params[:project_id] + @output_arg_num = 0 @draw_on = false @revision = {} @revision[:stop] = @project.head_revision @@ -17,6 +19,7 @@ def draw @bench_name = params[:bench_name] @project = Project.find params[:project_id] + @output_arg_num = params[:output_arg_num].to_i @draw_on = true @revision = params[:revision] head_rev = @project.head_revision Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 18) +++ web/ranch/app/views/graph_form/index.rhtml (working copy) @@ -19,6 +19,7 @@ "value" => @revision[:start] %></td> <td><%= text_field "revision", "stop", "size" => 8, "value" => @revision[:stop] %></td> + <td><%= outputs_tag "output_arg_num", @bench_name, @output_arg_num %></td> </tr> </table> </p> @@ -29,7 +30,7 @@ <% if @draw_on %> <%= graph_reg_tag @project.id, @bench_name, - @revision[:start], @revision[:stop] %> + @revision[:start], @revision[:stop], @output_arg_num %> <% else %> <%= content_tag "p", "No chart to display - click on Draw" %> <% end %>

19 years, 1 month

[ranch] 18: Check that Start rev > Stop rev.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Check that Start rev > Stop rev. * web/ranch/app/views/graph_form/index.rhtml: Display an error message if the the revision range is invalid. * web/ranch/app/controllers/graph_form_controller.rb: Check for revision range validity and raise an error message. * web/ranch/test/functional/graph_form_controller_test.rb: Test that the error handling works fine. app/controllers/graph_form_controller.rb | 16 ++++++++++------ app/views/graph_form/index.rhtml | 9 +++++---- test/functional/graph_form_controller_test.rb | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 10 deletions(-) Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 17) +++ web/ranch/app/views/graph_form/index.rhtml (working copy) @@ -21,16 +21,17 @@ "value" => @revision[:stop] %></td> </tr> </table> -</p><p> -<%= submit_tag "Draw" %> -</p><p> +</p> +<p style="color: red;"><%= flash[:error] %></p> +<p><%= submit_tag "Draw" %></p> +<p> <%= end_form_tag %> <% if @draw_on %> <%= graph_reg_tag @project.id, @bench_name, @revision[:start], @revision[:stop] %> <% else %> - <%= content_tag "p", "No chart to display - click Draw" %> + <%= content_tag "p", "No chart to display - click on Draw" %> <% end %> </p></center></p> <p><%= link_to "Back", :controller => "benches", Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 17) +++ web/ranch/app/controllers/graph_form_controller.rb (working copy) @@ -8,9 +8,7 @@ @bench_name = params[:bench_name] @project = Project.find params[:project_id] @draw_on = false - @revision ||= {} - - # Ensure revision number correctness + @revision = {} @revision[:stop] = @project.head_revision @revision[:start] = @revision[:stop] - DEFAULT_REVISION_RANGE @revision[:start] = 1 if @revision[:start] < 1 @@ -21,14 +19,20 @@ @project = Project.find params[:project_id] @draw_on = true @revision = params[:revision] - - # Ensure revision number correctness head_rev = @project.head_revision @revision[:stop] = @revision[:stop].to_i @revision[:stop] = head_rev if @revision[:stop] > head_rev @revision[:start] = @revision[:start].to_i @revision[:start] = 1 if @revision[:start] < 1 + if @revision[:start] < @revision[:stop] + @draw_on = true render :action => 'index' + else + flash[:error] = 'The start revision must be lesser than ' + + 'the stop revision.' + redirect_to(:action => 'index', + :project_id => @project.id, + :bench_name => @bench_name) + end end - end Index: web/ranch/test/functional/graph_form_controller_test.rb --- web/ranch/test/functional/graph_form_controller_test.rb (revision 17) +++ web/ranch/test/functional/graph_form_controller_test.rb (working copy) @@ -60,4 +60,18 @@ assert assigns(:draw_on) end + def test_draw_start_sup_stop + post :draw, { + :project_id => 1, + :bench_name => 'determinize', + :revision => { :start => 42, :stop => 10 } + } + assert_response :redirect + assert_redirected_to :action => 'index' + + assert_equal 1, assigns(:project).id + assert_equal 'determinize', assigns(:bench_name) + assert flash.has_key? :error + end + end

19 years, 1 month

[VCS] bug ??

by Nicolas Desprès

Bonjour, Je ne sais pas si c'est un bug ou si c'est "prévu" mais je poste la trace quand meme: ---trace--- zugarramundi:..h/trunk/web/ranch>svn up A test/unit/output_test.rb svn: Failed to add file 'test/functional/graph_controller_test.rb': object of the same name already exists /usr/lib/ruby/gems/1.8/gems/vcs-0.4.1/lib/vcs/vcs.rb:297: warning: multiple values for a block parameter (2 for 1) from (eval):3 [vcs] error: undefined method `output' for #<Array:0xb7b01844> zugarramundi:..trunk/web/ranch:1>svn st ! . ! test ? test/functional/graph_controller_test.rb ! test/functional ? app/helpers/graph_helper.rb ? app/controllers/graph_controller.rb ? app/views/graph ? log/test.log ? log/development.log ? db/development_structure.sql zugarramundi:..h/trunk/web/ranch>../.. zugarramundi:../lrde/ranch/trunk>svn up U web/ranch/test/functional/graph_form_controller_test.rb U web/ranch/test/functional/benches_controller_test.rb svn: Failed to add file 'web/ranch/test/functional/graph_controller_test.rb': object of the same name already exists /usr/lib/ruby/gems/1.8/gems/vcs-0.4.1/lib/vcs/vcs.rb:297: warning: multiple values for a block parameter (2 for 1) from (eval):3 [vcs] error: undefined method `output' for #<Array:0xb7a4dcd0> zugarramundi:..rde/ranch/trunk:1>svn up U ChangeLog svn: Failed to add file 'web/ranch/test/functional/graph_controller_test.rb': object of the same name already exists /usr/lib/ruby/gems/1.8/gems/vcs-0.4.1/lib/vcs/vcs.rb:297: warning: multiple values for a block parameter (2 for 1) from (eval):3 [vcs] error: undefined method `output' for #<Array:0xb7b0ecd0> zugarramundi:..rde/ranch/trunk:1>svn up svn: Failed to add file 'web/ranch/test/functional/graph_controller_test.rb': object of the same name already exists /usr/lib/ruby/gems/1.8/gems/vcs-0.4.1/lib/vcs/vcs.rb:297: warning: multiple values for a block parameter (2 for 1) from (eval):3 [vcs] error: undefined method `output' for #<Array:0xb7aa6cd0> zugarramundi:..rde/ranch/trunk:1>\svn up svn: Failed to add file 'web/ranch/test/functional/graph_controller_test.rb': object of the same name already exists zugarramundi:..rde/ranch/trunk:1> ---trace--- En gros, le scenario est le suivant: - j'ai travailler chez moi sur ranch et j'ai laissé du travail non terminé dans ma WC. - je vais au labo et poursuit ce travail qui finalement différe légèrement de la premiere implementation et je fais plusieurs commit. - je rentre chez moi et tente de mettre a jour avec les erreurs ci-dessus. La question est: est-ce normal que vcs se plante quand svn renvoie des erreurs ? zugarramundi:..rde/ranch/trunk:1>vcs --version Vcs version: 0.4.0 zugarramundi:../lrde/ranch/trunk>svn --version help (?, h): Describe the usage of this program or its subcommands. usage: help [SUBCOMMAND...] Valid options: --version : print client version info -q [--quiet] : print as little as possible --config-dir arg : read user configuration files from directory ARG zugarramundi:../lrde/ranch/trunk>uname -a Linux zugarramundi 2.6.12.2 #8 Fri Jul 8 02:08:21 CEST 2005 i686 GNU/Linux -- Nicolas Desprès

19 years, 1 month

[ranch] 17: Check revision range correctness.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Check revision range correctness. * web/ranch/test/functional/graph_form_controller_test.rb: Test it. * web/ranch/app/controllers/graph_form_controller.rb: Ensure it. * web/ranch/app/views/graph_form/index.rhtml: Keep the range displayed when it drawn the graph. app/controllers/graph_form_controller.rb | 17 ++++++++++++++- app/views/graph_form/index.rhtml | 4 +-- test/functional/graph_form_controller_test.rb | 28 +++++++++++++++++++++++--- 3 files changed, 43 insertions(+), 6 deletions(-) Index: web/ranch/test/functional/graph_form_controller_test.rb --- web/ranch/test/functional/graph_form_controller_test.rb (revision 16) +++ web/ranch/test/functional/graph_form_controller_test.rb (working copy) @@ -21,20 +21,42 @@ assert_not_nil assigns(:project) assert_not_nil assigns(:bench_name) assert !assigns(:draw_on) + assert_kind_of Hash, assigns(:revision) + assert assigns(:revision)[:start] < assigns(:revision)[:stop] + assert assigns(:revision)[:start] >= 1 end - def test_draw + def test_draw_regular_revision_range post :draw, { :project_id => 1, :bench_name => 'determinize', - :revision => { :start => 0, :stop => 10 } + :revision => { :start => 2, :stop => 8 } } assert_response :success assert_template 'index' assert_not_nil assigns(:project) assert_not_nil assigns(:bench_name) - assert_not_nil assigns(:revision) + assert_kind_of Hash, assigns(:revision) + assert_equal 2, assigns(:revision)[:start] + assert_equal 8, assigns(:revision)[:stop] + assert assigns(:draw_on) + end + + def test_draw_bad_revision_range + post :draw, { + :project_id => 1, + :bench_name => 'determinize', + :revision => { :start => -42, :stop => 500 } + } + assert_response :success + assert_template 'index' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench_name) + assert_kind_of Hash, assigns(:revision) + assert_equal 1, assigns(:revision)[:start] + assert_equal assigns(:project).head_revision, assigns(:revision)[:stop] assert assigns(:draw_on) end Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 16) +++ web/ranch/app/controllers/graph_form_controller.rb (working copy) @@ -2,17 +2,32 @@ helper :graph layout 'ranch' + DEFAULT_REVISION_RANGE = 100 + def index @bench_name = params[:bench_name] @project = Project.find params[:project_id] @draw_on = false + @revision ||= {} + + # Ensure revision number correctness + @revision[:stop] = @project.head_revision + @revision[:start] = @revision[:stop] - DEFAULT_REVISION_RANGE + @revision[:start] = 1 if @revision[:start] < 1 end def draw @bench_name = params[:bench_name] @project = Project.find params[:project_id] - @revision = params[:revision] @draw_on = true + @revision = params[:revision] + + # Ensure revision number correctness + head_rev = @project.head_revision + @revision[:stop] = @revision[:stop].to_i + @revision[:stop] = head_rev if @revision[:stop] > head_rev + @revision[:start] = @revision[:start].to_i + @revision[:start] = 1 if @revision[:start] < 1 render :action => 'index' end Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 16) +++ web/ranch/app/views/graph_form/index.rhtml (working copy) @@ -16,9 +16,9 @@ </tr> <tr> <td><%= text_field "revision", "start", "size" => 8, - "value" => 0 %></td> + "value" => @revision[:start] %></td> <td><%= text_field "revision", "stop", "size" => 8, - "value" => @project.head_revision %></td> + "value" => @revision[:stop] %></td> </tr> </table> </p><p>

19 years, 1 month

[ranch] 16: Add a back link.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Despr�s <nicolas.despres(a)gmail.com> Add a back link. * web/ranch/app/views/graph_form/index.rhtml, * web/ranch/app/views/benches/list.rhtml: Add a back link. * web/ranch/app/views/projects/list.rhtml: Reshape center div tags. benches/list.rhtml | 3 ++- graph_form/index.rhtml | 11 ++++++++--- projects/list.rhtml | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 15) +++ web/ranch/app/views/graph_form/index.rhtml (working copy) @@ -5,8 +5,10 @@ :project_id => @project.id, :bench_name => @bench_name %> <%= content_tag "p", "Choose a range of revision:" %> +</div> <p> <center> +<p> <table> <tr> <td>Start</td> @@ -19,9 +21,9 @@ "value" => @project.head_revision %></td> </tr> </table> -</center> -</p> +</p><p> <%= submit_tag "Draw" %> +</p><p> <%= end_form_tag %> <% if @draw_on %> @@ -30,4 +32,7 @@ <% else %> <%= content_tag "p", "No chart to display - click Draw" %> <% end %> -</div> +</p></center></p> +<p><%= link_to "Back", :controller => "benches", + :action => "list", + :project_id => @project.id %></p> Index: web/ranch/app/views/benches/list.rhtml --- web/ranch/app/views/benches/list.rhtml (revision 15) +++ web/ranch/app/views/benches/list.rhtml (working copy) @@ -4,6 +4,7 @@ <p> Select a benchmark: </p> +</div> <p> <center> <table> @@ -20,4 +21,4 @@ </table> </center> </p> -</div> +<p><%= link_to "Back", :controller => "projects", :action => "list" %></p> Index: web/ranch/app/views/projects/list.rhtml --- web/ranch/app/views/projects/list.rhtml (revision 15) +++ web/ranch/app/views/projects/list.rhtml (working copy) @@ -7,6 +7,7 @@ <p> Select a project: </p> +</div> <p> <center> <table> @@ -22,4 +23,3 @@ </table> </center> </p> -</div>

19 years, 1 month

[ranch] 15: No more hard code the unit name.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Desprès <nicolas.despres(a)lrde.epita.fr> No more hard code the unit name. * web/ranch/app/controllers/graph_controller.rb: Extract the output name and unit from the DB. * web/ranch/test/functional/benches_controller_test.rb, * web/ranch/app/controllers/benches_controller.rb, * web/ranch/app/views/benches/list.rhtml: Do not give the bench id as a parameter since it doesn't make sense to send if to the regression graph controller. app/controllers/benches_controller.rb | 2 +- app/controllers/graph_controller.rb | 9 +++++---- app/views/benches/list.rhtml | 1 - test/functional/benches_controller_test.rb | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) Index: web/ranch/test/functional/benches_controller_test.rb --- web/ranch/test/functional/benches_controller_test.rb (revision 14) +++ web/ranch/test/functional/benches_controller_test.rb (working copy) @@ -22,7 +22,6 @@ assert_not_nil assigns(:project) assert_not_nil assigns(:benches) - assert_not_nil assigns(:benches).id assert_equal(1, (assigns(:benches).find_all{|x| x.name == 'determinize'}).size, Index: web/ranch/app/controllers/graph_controller.rb --- web/ranch/app/controllers/graph_controller.rb (revision 14) +++ web/ranch/app/controllers/graph_controller.rb (working copy) @@ -7,7 +7,8 @@ @bench_name = params[:bench_name] @output_num = 1 #FIXME: manage several outputs - values = Bench.find_by_sql "SELECT outputs.value, benches.revision " + + results = Bench.find_by_sql "SELECT outputs.value, outputs.name, " + + "outputs.unit, benches.revision " + "FROM outputs, benches " + "WHERE benches.project_id = #{(a)project.id} " + "AND benches.name = '#@bench_name' " + @@ -17,15 +18,15 @@ "AND benches.revision <= #{params[:rev_stop]} " + "ORDER BY benches.revision" - data = values.collect { |v| v.value.to_f } - labels = values.collect { |v| "r#{v.revision}" } + data = results.collect { |v| v.value.to_f } + labels = results.collect { |v| "r#{v.revision}" } filename = "regression_#{@project.name}_#@bench_name" Tempfile.open(filename) do |f| File.open(f.path, 'w') do |io| Grapher.regression(io, "#{(a)project.name}: #@bench_name", - "utime(sec)", #FIXME: gather this info from the DB + "#{results.first.name}(#{results.first.unit})", data, labels) end Index: web/ranch/app/controllers/benches_controller.rb --- web/ranch/app/controllers/benches_controller.rb (revision 14) +++ web/ranch/app/controllers/benches_controller.rb (working copy) @@ -4,7 +4,7 @@ def list @project = Project.find_by_id(@params[:project_id]) - @benches = Bench.find_by_sql "SELECT id, name " + + @benches = Bench.find_by_sql "SELECT name " + "FROM benches " + "WHERE project_id = #{(a)project.id} " + "GROUP BY name " + Index: web/ranch/app/views/benches/list.rhtml --- web/ranch/app/views/benches/list.rhtml (revision 14) +++ web/ranch/app/views/benches/list.rhtml (working copy) @@ -13,7 +13,6 @@ <%= link_to bench.name, :controller => "graph_form", :action => "index", :project_id => @project.id, - :bench_id => bench.id, :bench_name => bench.name %> </td> </tr>

19 years, 1 month

[ranch] 14: Improve benchmark list request.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Desprès <nicolas.despres(a)lrde.epita.fr> Improve benchmark list request. * web/ranch/test/functional/benches_controller_test.rb: Test that the bench id is provided. * web/ranch/app/controllers/benches_controller.rb: Use SQL request rather than Ruby code in order to improve request efficiency. Provide the bench id to the view. * web/ranch/app/views/benches/list.rhtml: Adapt to the change in the controller. app/controllers/benches_controller.rb | 10 +++++----- app/views/benches/list.rhtml | 7 ++++--- test/functional/benches_controller_test.rb | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-) Index: web/ranch/test/functional/benches_controller_test.rb --- web/ranch/test/functional/benches_controller_test.rb (revision 13) +++ web/ranch/test/functional/benches_controller_test.rb (working copy) @@ -21,10 +21,11 @@ assert_template 'list' assert_not_nil assigns(:project) - assert_not_nil assigns(:benches_name) + assert_not_nil assigns(:benches) + assert_not_nil assigns(:benches).id assert_equal(1, - (assigns(:benches_name).find_all{|x| x == 'determinize'}).size, + (assigns(:benches).find_all{|x| x.name == 'determinize'}).size, 'there is duplicated benches name') end end Index: web/ranch/app/controllers/benches_controller.rb --- web/ranch/app/controllers/benches_controller.rb (revision 13) +++ web/ranch/app/controllers/benches_controller.rb (working copy) @@ -4,11 +4,11 @@ def list @project = Project.find_by_id(@params[:project_id]) - @benches_name = Bench.find_all_by_project_id((a)project.id).collect do |x| - x.name - end - @benches_name.uniq! - @benches_name.sort! + @benches = Bench.find_by_sql "SELECT id, name " + + "FROM benches " + + "WHERE project_id = #{(a)project.id} " + + "GROUP BY name " + + "ORDER BY name" end end Index: web/ranch/app/views/benches/list.rhtml --- web/ranch/app/views/benches/list.rhtml (revision 13) +++ web/ranch/app/views/benches/list.rhtml (working copy) @@ -7,13 +7,14 @@ <p> <center> <table> - <% for bench_name in @benches_name %> + <% for bench in @benches %> <tr> <td> - <%= link_to bench_name, :controller => "graph_form", + <%= link_to bench.name, :controller => "graph_form", :action => "index", :project_id => @project.id, - :bench_name => bench_name %> + :bench_id => bench.id, + :bench_name => bench.name %> </td> </tr> <% end %>

19 years, 1 month

[ranch] 13: Draw regression graph.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Desprès <nicolas.despres(a)lrde.epita.fr> Draw regression graph. * web/ranch/app/controllers/graph_controller.rb: New. Collect data and send them to the grapher. * web/ranch/test/functional/graph_controller_test.rb: New. Test the graph controller. * web/ranch/app/helpers/graph_helper.rb: New. Add a tag that helps to draw a regression graph in a view. * web/ranch/lib/grapher.rb: New. Generate a graph using `ruby-gdchart'. * web/ranch/app/controllers/graph_form_controller.rb: Add the draw request. * web/ranch/test/functional/graph_form_controller_test.rb: . * web/ranch/app/views/graph_form/index.rhtml: Draw the graph. * web/ranch/app/models/output.rb: New. The model for the outputs table. * web/ranch/test/unit/output_test.rb: New. Test the model. * web/ranch/test/fixtures/outputs.yml: New. Add some fixtures. * web/ranch/test/fixtures/benches.yml, * web/ranch/test/fixtures/projects.yml: Update to the new DB schema. * web/ranch/app/models/bench.rb: Add the relationship with the outputs table. * web/ranch/config/environment.rb: Require some libs. * web/ranch/db/schema.rb: Add the outputs table. app/controllers/graph_controller.rb | 39 ++++++++++++++++++++++++++ app/controllers/graph_form_controller.rb | 11 ++++++- app/helpers/graph_helper.rb | 18 ++++++++++++ app/models/bench.rb | 1 app/models/output.rb | 5 +++ app/views/graph_form/index.rhtml | 13 +++++++- config/environment.rb | 3 ++ db/schema.rb | 11 +++++++ lib/grapher.rb | 27 ++++++++++++++++++ test/fixtures/benches.yml | 19 ++++++------ test/fixtures/outputs.yml | 12 ++++++++ test/fixtures/projects.yml | 3 ++ test/functional/graph_controller_test.rb | 19 ++++++++++++ test/functional/graph_form_controller_test.rb | 20 ++++++++++++- test/unit/output_test.rb | 10 ++++++ 15 files changed, 196 insertions(+), 15 deletions(-) Index: web/ranch/test/unit/output_test.rb --- web/ranch/test/unit/output_test.rb (revision 0) +++ web/ranch/test/unit/output_test.rb (revision 0) @@ -0,0 +1,10 @@ +require File.dirname(__FILE__) + '/../test_helper' + +class OutputTest < Test::Unit::TestCase + fixtures :outputs + + # Replace this with your real tests. + def test_truth + assert_kind_of Output, outputs(:first) + end +end Index: web/ranch/test/functional/graph_controller_test.rb --- web/ranch/test/functional/graph_controller_test.rb (revision 0) +++ web/ranch/test/functional/graph_controller_test.rb (revision 0) @@ -0,0 +1,19 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'graph_controller' + +# Re-raise errors caught by the controller. +class GraphController; def rescue_action(e) raise e end; end + +class GraphControllerTest < Test::Unit::TestCase + def setup + @controller = GraphController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + #FIXME: test me + assert true + end +end Index: web/ranch/test/functional/graph_form_controller_test.rb --- web/ranch/test/functional/graph_form_controller_test.rb (revision 12) +++ web/ranch/test/functional/graph_form_controller_test.rb (working copy) @@ -13,13 +13,29 @@ @response = ActionController::TestResponse.new end - # Replace this with your real tests. - def test_truth + def test_index get :index, { :project_id => 1, :bench_name => 'determinize' } assert_response :success assert_template 'index' assert_not_nil assigns(:project) assert_not_nil assigns(:bench_name) + assert !assigns(:draw_on) end + + def test_draw + post :draw, { + :project_id => 1, + :bench_name => 'determinize', + :revision => { :start => 0, :stop => 10 } + } + assert_response :success + assert_template 'index' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench_name) + assert_not_nil assigns(:revision) + assert assigns(:draw_on) + end + end Index: web/ranch/test/fixtures/outputs.yml --- web/ranch/test/fixtures/outputs.yml (revision 0) +++ web/ranch/test/fixtures/outputs.yml (revision 0) @@ -0,0 +1,12 @@ +<% id = 0 %> + +<% val = 5; (1..10).each do |rev| %> +<%= "determinize_r#{rev}_utime:" %> + id: <%= id += 1 %> + name: utime + value: <%= val += rev %> + unit: sec + bench_id: <%= rev %> + arg_num: 1 +<% end %> + Index: web/ranch/test/fixtures/benches.yml --- web/ranch/test/fixtures/benches.yml (revision 12) +++ web/ranch/test/fixtures/benches.yml (working copy) @@ -1,26 +1,25 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -<% id = 1 %> +<% id = 0 %> -determinize_r1: - id: <% id += 1 %> - project_id: 1 - name: determinize -determinize_r2: - id: <% id += 1 %> +<% (1..10).each do |rev| %> +<%= "determinize_r#{rev}:" %> + id: <%= id += 1 %> project_id: 1 name: determinize + revision: <%= rev %> +<% end %> quotient: - id: <% id += 1 %> + id: <%= id += 1 %> project_id: 1 name: quotient open: - id: <% id += 1 %> + id: <%= id += 1 %> project_id: 2 name: open close: - id: <% id += 1 %> + id: <%= id += 1 %> project_id: 2 name: close Index: web/ranch/test/fixtures/projects.yml --- web/ranch/test/fixtures/projects.yml (revision 12) +++ web/ranch/test/fixtures/projects.yml (working copy) @@ -2,7 +2,10 @@ vaucanson: id: 1 name: Vaucanson + head_revision: 10 + olena: id: 2 name: Olena + head_revision: 100 Index: web/ranch/app/helpers/graph_helper.rb --- web/ranch/app/helpers/graph_helper.rb (revision 0) +++ web/ranch/app/helpers/graph_helper.rb (revision 0) @@ -0,0 +1,18 @@ +module GraphHelper + + def graph_reg_tag(project_id, bench_name, rev_start, rev_stop, options={}) + url = { + :controller => 'graph', + :action => 'regression', + :project_id => project_id, + :bench_name => bench_name, + :rev_start => rev_start, + :rev_stop => rev_stop + } + options = url.merge(options) + "<img src=\"#{url_for options}\" " + + "class=\"#{options[:class] || 'regression_graph'}\" "+ + "alt=\"Regression graph\" />" + end + +end Index: web/ranch/app/models/bench.rb --- web/ranch/app/models/bench.rb (revision 12) +++ web/ranch/app/models/bench.rb (working copy) @@ -1,5 +1,6 @@ class Bench < ActiveRecord::Base belongs_to :project + has_many :output end Index: web/ranch/app/models/output.rb --- web/ranch/app/models/output.rb (revision 0) +++ web/ranch/app/models/output.rb (revision 0) @@ -0,0 +1,5 @@ +class Output < ActiveRecord::Base + + belongs_to :bench + +end Index: web/ranch/app/controllers/graph_controller.rb --- web/ranch/app/controllers/graph_controller.rb (revision 0) +++ web/ranch/app/controllers/graph_controller.rb (revision 0) @@ -0,0 +1,39 @@ +class GraphController < ApplicationController + + load 'grapher.rb' + + def regression + @project = Project.find params[:project_id] + @bench_name = params[:bench_name] + @output_num = 1 #FIXME: manage several outputs + + values = Bench.find_by_sql "SELECT outputs.value, benches.revision " + + "FROM outputs, benches " + + "WHERE benches.project_id = #{(a)project.id} " + + "AND benches.name = '#@bench_name' " + + "AND outputs.bench_id = benches.id " + + "AND outputs.arg_num = #@output_num " + + "AND #{params[:rev_start]} <=benches.revision " + + "AND benches.revision <= #{params[:rev_stop]} " + + "ORDER BY benches.revision" + + data = values.collect { |v| v.value.to_f } + labels = values.collect { |v| "r#{v.revision}" } + + filename = "regression_#{@project.name}_#@bench_name" + Tempfile.open(filename) do |f| + File.open(f.path, 'w') do |io| + Grapher.regression(io, + "#{(a)project.name}: #@bench_name", + "utime(sec)", #FIXME: gather this info from the DB + data, + labels) + end + send_file(f.path, + :disposition => 'inline', + :type => 'image/jpeg', + :filename => "#{filename}.jpg") + end + end + +end Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 12) +++ web/ranch/app/controllers/graph_form_controller.rb (working copy) @@ -1,10 +1,19 @@ class GraphFormController < ApplicationController - + helper :graph layout 'ranch' def index @bench_name = params[:bench_name] @project = Project.find params[:project_id] + @draw_on = false + end + + def draw + @bench_name = params[:bench_name] + @project = Project.find params[:project_id] + @revision = params[:revision] + @draw_on = true + render :action => 'index' end end Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 12) +++ web/ranch/app/views/graph_form/index.rhtml (working copy) @@ -13,12 +13,21 @@ <td>Stop</td> </tr> <tr> - <td><%= text_field "revision", "start", "size" => 8, "value" => 0 %></td> - <td><%= text_field "revision", "stop", "size" => 8, "value" => 10 %></td> + <td><%= text_field "revision", "start", "size" => 8, + "value" => 0 %></td> + <td><%= text_field "revision", "stop", "size" => 8, + "value" => @project.head_revision %></td> </tr> </table> </center> </p> <%= submit_tag "Draw" %> <%= end_form_tag %> + +<% if @draw_on %> + <%= graph_reg_tag @project.id, @bench_name, + @revision[:start], @revision[:stop] %> +<% else %> + <%= content_tag "p", "No chart to display - click Draw" %> +<% end %> </div> Index: web/ranch/config/environment.rb --- web/ranch/config/environment.rb (revision 12) +++ web/ranch/config/environment.rb (working copy) @@ -49,3 +49,6 @@ # end # Include your application configuration below \ No newline at end of file +require 'grapher' +require 'tempfile' + Index: web/ranch/db/schema.rb --- web/ranch/db/schema.rb (revision 12) +++ web/ranch/db/schema.rb (working copy) @@ -12,8 +12,19 @@ add_index "benches", ["project_id"], :name => "project_id" + create_table "outputs", :force => true do |t| + t.column "name", :string, :limit => 128, :default => "noname", :null => false + t.column "value", :float, :default => 0.0, :null => false + t.column "unit", :string, :limit => 128, :default => "nounit", :null => false + t.column "bench_id", :integer, :limit => 10, :default => 0, :null => false + t.column "arg_num", :integer, :limit => 8, :default => 1, :null => false + end + + add_index "outputs", ["bench_id"], :name => "bench_id" + create_table "projects", :force => true do |t| t.column "name", :string, :default => "noname", :null => false + t.column "head_revision", :integer, :limit => 10, :default => 0, :null => false end end Index: web/ranch/lib/grapher.rb --- web/ranch/lib/grapher.rb (revision 0) +++ web/ranch/lib/grapher.rb (revision 0) @@ -0,0 +1,27 @@ +require_gem 'ruby-gdchart' + +module Grapher + + def self.regression(io, title, ytitle, data, labels) + gdc = GDChart.new + gdc.title = title + gdc.title_size = GDChart::GIANT + gdc.set_color = [ 0x00FF00 ] + gdc.bg_color = 0xFFFFFF + gdc.xtitle = "Revision" + gdc.ytitle = ytitle + xsize = 600 + ysize = 300 + numsets = 1 + gdc.image_type = GDChart::JPEG + gdc.out_graph(xsize, + ysize, + io, + GDChart::LINE, + labels.size, + labels, + numsets, + data) + end + +end

19 years, 1 month

[ranch] 12: First draft of the graph form.

by Nicolas Despr�s

https://svn.lrde.epita.fr/svn/ranch/trunk Index: ChangeLog from Nicolas Desprès <nicolas.despres(a)gmail.com> First draft of the graph form. * web/ranch/test/functional/graph_form_controller_test.rb: New. Test the controller. * web/ranch/app/helpers/graph_form_helper.rb: New. * web/ranch/app/controllers/graph_form_controller.rb: New. Control the form. * web/ranch/app/views/graph_form: New. * web/ranch/app/views/graph_form/index.rhtml: New. View of the form. * web/ranch/app/views/benches/list.rhtml: Link to graph_form instead of graph. * web/ranch/db/schema.rb: Add the revision field. app/controllers/graph_form_controller.rb | 10 ++++++++++ app/helpers/graph_form_helper.rb | 2 ++ app/views/benches/list.rhtml | 2 +- app/views/graph_form/index.rhtml | 24 ++++++++++++++++++++++++ db/schema.rb | 1 + test/functional/graph_form_controller_test.rb | 25 +++++++++++++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) Index: web/ranch/test/functional/graph_form_controller_test.rb --- web/ranch/test/functional/graph_form_controller_test.rb (revision 0) +++ web/ranch/test/functional/graph_form_controller_test.rb (revision 0) @@ -0,0 +1,25 @@ +require File.dirname(__FILE__) + '/../test_helper' +require 'graph_form_controller' + +# Re-raise errors caught by the controller. +class GraphFormController; def rescue_action(e) raise e end; end + +class GraphFormControllerTest < Test::Unit::TestCase + fixtures :projects, :benches + + def setup + @controller = GraphFormController.new + @request = ActionController::TestRequest.new + @response = ActionController::TestResponse.new + end + + # Replace this with your real tests. + def test_truth + get :index, { :project_id => 1, :bench_name => 'determinize' } + assert_response :success + assert_template 'index' + + assert_not_nil assigns(:project) + assert_not_nil assigns(:bench_name) + end +end Index: web/ranch/app/helpers/graph_form_helper.rb --- web/ranch/app/helpers/graph_form_helper.rb (revision 0) +++ web/ranch/app/helpers/graph_form_helper.rb (revision 0) @@ -0,0 +1,2 @@ +module GraphFormHelper +end Index: web/ranch/app/controllers/graph_form_controller.rb --- web/ranch/app/controllers/graph_form_controller.rb (revision 0) +++ web/ranch/app/controllers/graph_form_controller.rb (revision 0) @@ -0,0 +1,10 @@ +class GraphFormController < ApplicationController + + layout 'ranch' + + def index + @bench_name = params[:bench_name] + @project = Project.find params[:project_id] + end + +end Index: web/ranch/app/views/graph_form/index.rhtml --- web/ranch/app/views/graph_form/index.rhtml (revision 0) +++ web/ranch/app/views/graph_form/index.rhtml (revision 0) @@ -0,0 +1,24 @@ +  +<div style="text-align: center;"> +<%= content_tag "h2", "#{(a)project.name}: #{@bench_name}" %> +<%= start_form_tag :action => "draw", + :project_id => @project.id, + :bench_name => @bench_name %> +<%= content_tag "p", "Choose a range of revision:" %> +<p> +<center> +<table> + <tr> + <td>Start</td> + <td>Stop</td> + </tr> + <tr> + <td><%= text_field "revision", "start", "size" => 8, "value" => 0 %></td> + <td><%= text_field "revision", "stop", "size" => 8, "value" => 10 %></td> + </tr> +</table> +</center> +</p> +<%= submit_tag "Draw" %> +<%= end_form_tag %> +</div> Index: web/ranch/app/views/benches/list.rhtml --- web/ranch/app/views/benches/list.rhtml (revision 11) +++ web/ranch/app/views/benches/list.rhtml (working copy) @@ -10,7 +10,7 @@ <% for bench_name in @benches_name %> <tr> <td> - <%= link_to bench_name, :controller => "graph", + <%= link_to bench_name, :controller => "graph_form", :action => "index", :project_id => @project.id, :bench_name => bench_name %> Index: web/ranch/db/schema.rb --- web/ranch/db/schema.rb (revision 11) +++ web/ranch/db/schema.rb (working copy) @@ -7,6 +7,7 @@ create_table "benches", :force => true do |t| t.column "name", :string, :limit => 128, :default => "noname", :null => false t.column "project_id", :integer, :limit => 10, :default => 0, :null => false + t.column "revision", :integer, :limit => 10, :default => 0, :null => false end add_index "benches", ["project_id"], :name => "project_id"

19 years, 1 month

vcs: cvs revert/cvs up -C doesn't work

by Akim Demaille

~/src/bison-2 % cvs up -C data/glr.c [vcs] error: invalid option: -C ~/src/bison-2 % cvs up data/glr.c M data/glr.c ~/src/bison-2 % cvs revert data/glr.c [vcs] warn: unknown method revert! Unknown command: `revert'

19 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects November 2005