diff --git a/web/themes/smtcomp/layouts/_default/result.html b/web/themes/smtcomp/layouts/_default/result.html index 69486671..8e1e5a4f 100644 --- a/web/themes/smtcomp/layouts/_default/result.html +++ b/web/themes/smtcomp/layouts/_default/result.html @@ -29,15 +29,24 @@

{{ .Params.division }} ({{ $prettyTrack }})

{{ end }} +{{ $categories := slice "sequential" "parallel" "sat" "unsat" "twentyfour" }} {{ $winner_categories := slice "winner_seq" "winner_par" "winner_sat" "winner_unsat" "winner_24s" }} +{{ if eq $.Params.track "track_incremental" }} +{{ $winner_categories = slice "winner_par" "winner_sat" "winner_unsat" "winner_24s" }} +{{ $categories = slice "parallel" "sat" "unsat" "twentyfour" }} +{{ end }} + +{{ $winner_category_names := .Site.Data.pretty_names.winner_performance }} +{{ $category_names := .Site.Data.pretty_names.performance }} +

Winners

{{ range $cat := $winner_categories }} {{ if isset $.Params $cat }} - + {{ end }} {{ end }} @@ -57,16 +66,6 @@

Winners

{{$cat}}{{index $winner_category_names $cat}}
-{{ $categories := slice "sequential" "parallel" "sat" "unsat" "twentyfour" }} - -{{ $category_names := dict -"sequential" "Sequential" -"parallel" "Parallel" -"sat" "SAT" -"unsat" "UNSAT" -"twentyfour" "24 seconds" -}} - {{ range $cat := $categories }} {{ with index $.Params $cat }}

{{ index $category_names $cat }} Performance

diff --git a/web/themes/smtcomp/layouts/_default/result_comp.html b/web/themes/smtcomp/layouts/_default/result_comp.html index f32288d5..92a88678 100644 --- a/web/themes/smtcomp/layouts/_default/result_comp.html +++ b/web/themes/smtcomp/layouts/_default/result_comp.html @@ -13,8 +13,16 @@

Largest Contribution Ranking - {{ $prettyTrack }}

Page generated on {{ .Params.resultdate }}

+{{ $categories := slice "sequential" "parallel" "sat" "unsat" "twentyfour" }} {{ $winner_categories := slice "winner_seq" "winner_par" "winner_sat" "winner_unsat" "winner_24s" }} + +{{ if eq $.Params.track "track_incremental" }} +{{ $winner_categories = slice "winner_par" "winner_sat" "winner_unsat" "winner_24s" }} +{{ $categories = slice "parallel" "sat" "unsat" "twentyfour" }} +{{ end }} + {{ $winner_category_names := .Site.Data.pretty_names.winner_performance }} +{{ $category_names := .Site.Data.pretty_names.performance }}

Winners

@@ -42,9 +50,6 @@

Winners

-{{ $categories := slice "sequential" "parallel" "sat" "unsat" "twentyfour" }} - -{{ $category_names := .Site.Data.pretty_names.performance }} {{ range $cat := $categories }} {{ with index $.Params $cat }} diff --git a/web/themes/smtcomp/layouts/_default/results_summary.html b/web/themes/smtcomp/layouts/_default/results_summary.html index c3735e82..0718a9ff 100644 --- a/web/themes/smtcomp/layouts/_default/results_summary.html +++ b/web/themes/smtcomp/layouts/_default/results_summary.html @@ -8,11 +8,20 @@ {{ $categories := slice "sequential" "parallel" "sat" "unsat" "twentyfour" }} {{ $winner_categories := dict -"sequential" "winner_seq" -"parallel" "winner_par" -"sat" "winner_sat" -"unsat" "winner_unsat" -"twentyfour" "winner_24s" }} + "sequential" "winner_seq" + "parallel" "winner_par" + "sat" "winner_sat" + "unsat" "winner_unsat" + "twentyfour" "winner_24s" }} + +{{ if eq $.Params.track "track_incremental" }} +{{ $categories = slice "parallel" "sat" "unsat" "twentyfour" }} +{{ $winner_categories := dict + "parallel" "winner_par" + "sat" "winner_sat" + "unsat" "winner_unsat" + "twentyfour" "winner_24s" }} +{{ end }} {{ $categories_pretty := .Site.Data.pretty_names.performance }}