Changeset 1119

Timestamp:

03/24/10 22:01:03 (2 years ago)

Author:

wefgef

Message:

Adds a new difficulty column for Tasks macro.

Also made a minor change in the look of the table.

REVIEW URL: ​http://reviewboard.infoarena.ro/r/144/

Location:

trunk

Files:

• common/db/round.php (modified) (1 diff)
• common/task_rating.php (modified) (1 diff)
• scripts/recompute-task-ratings (added)
• www/macros/macro_tasks.php (modified) (5 diffs)
• www/static/css/screen.css (modified) (2 diffs)
• www/views/header.php (modified) (1 diff)

trunk/common/db/round.php

@@ -118 +118 @@
               "task.`type` AS `type`,
                task.`open_source` AS `open_source`,
-               task.`open_tests` AS `open_tests`";
+               task.`open_tests` AS `open_tests`,
+               task.`rating` AS `rating`";
     if ($user_id == null || $fetch_scores == false) {
         $query = sprintf("SELECT $fields

trunk/common/task_rating.php

@@ -2 +2 @@
 
 require_once(IA_ROOT_DIR."common/db/task_rating.php");
+require_once(IA_ROOT_DIR."common/rating.php");
 
 // Computes the rating out of the array $ratings
 // $ratings contains arrays of ratings
-// FIXME: use smarter task rating function
 function task_rating_compute($ratings) {
-    $sum = 0;
-    $nr = 0;
+    $idea = 0.0;
+    $theory = 0.0;
+    $coding = 0.0;
 
+    // Compute average ratings for each category
     foreach ($ratings as $rating) {
-        $sum += $rating['idea'] + $rating['theory'] + $rating['coding'];
-        $nr += 3;
+        $idea += $rating['idea'];
+        $theory += $rating['theory'];
+        $coding += $rating['coding'];
     }
+    $idea /= count($ratings);
+    $theory /= count($ratings);
+    $coding /= count($ratings);
 
-    $task_rating = 1.0 * $sum / $nr;
+    $best = max($idea, $theory, $coding);
 
-    return $task_rating;
+    // Compute a weighted sum of the three ratings
+    $weight_idea = sqr($idea / $best);
+    $weight_theory = sqr($theory / $best);
+    $weight_coding = sqr($coding / $best);
+
+    $final_grade = ($weight_idea * $idea +
+                    $weight_theory * $theory +
+                    $weight_coding * $coding) /
+                   ($weight_idea + $weight_theory + $weight_coding);
+
+    // Find proper difficulty number
+    $cut_offs = array(3.40, 4.00, 5.00, 6.00, 10.00);
+    for ($i = 0; $i < count($cut_offs); ++$i)
+      if ($cut_offs[$i] >= $final_grade)
+        return $i + 1;
 }
 

trunk/www/macros/macro_tasks.php

@@ -7 +7 @@
 require_once(IA_ROOT_DIR . "common/db/task.php");
 require_once(IA_ROOT_DIR . "common/round.php");
+require_once(IA_ROOT_DIR . "www/macros/macro_stars.php");
 
 function format_score_column($val) {
@@ -21 +22 @@
     } else {
         return $val;
+    }
+}
+
+function format_rating_column($val) {
+    if (is_null($val)) {
+        return 'N/A';
+    } else {
+        $stars_args = array(
+            'rating' => $val,
+            'scale' => 5,
+            'type' => 'normal'
+        );
+        return macro_stars($stars_args);
     }
 }
@@ -134 +148 @@
     $show_authors = getattr($args, 'show_authors', true);
     $show_sources = getattr($args, 'show_sources', true);
-
+    $show_ratings = getattr($args, 'show_ratings', false);
     $show_progress = getattr($args, 'show_progress', false) &&
                      identity_can("round-view-progress", $round);
@@ -148 +162 @@
     $options['row_style'] = 'task_row_style';
     $options['css_class'] = 'tasks';
+    $options['css_row_parity'] = true;
 
     $column_infos = array();
@@ -177 +192 @@
         );
     }
+    if ($show_ratings) {
+        $column_infos[] = array(
+                'html_title' => 'Dificultate<span style="color: red; font-weight:bold;"><sup>nou!</sup></span>',
+                'css_class' => 'rating',
+                'key' => 'rating',
+                'valform' => 'format_rating_column',
+        );
+    }
     if (!is_null($user_id)) {
         $column_infos[] = array (
                 'title' => 'Scorul tău',
-                'css_class' => 'number score',
+                'css_class' => 'score',
                 'key' => 'score',
                 'valform' => 'format_score_column',

trunk/www/static/css/screen.css

@@ -1053 +1053 @@
 
 tr.odd td {
-    background: #fff;
 }
 
 tr.even td {
+    background-color: #f0f0f0;
 }
 
@@ -1213 +1213 @@
 .tasks td.number {
     Width: 5%;
+}
+.tasks td.rating {
+    padding-left: 4px;
+    width: 10%;
+    font-size: .7em;
+    color: gray;
 }
 .tasks tr.solved td.task {

trunk/www/views/header.php

@@ -101 +101 @@
         <li><a href="<?= html_escape(url_textblock('arhiva-educationala')) ?>">Arhiva educatională</a></li>
         <li><a href="<?= html_escape(url_textblock('concursuri')) ?>">Concursuri</a></li>
-        <li><a href="<?= html_escape(url_textblock('concursuri-virtuale')) ?>">Concursuri virtuale<span style="color: red; font-weight:bold;"><sup>nou!</sup></span></a></li> 
+        <li><a href="<?= html_escape(url_textblock('concursuri-virtuale')) ?>">Concursuri virtuale</a></li> 
         <li><a href="<?= html_escape(url_textblock('clasament-rating')) ?>">Clasament</a></li>
         <li><a href="<?= html_escape(url_textblock('articole')) ?>">Articole</a></li>