Changeset 884

Timestamp:

01/23/08 17:37:32 (4 years ago)

Author:

bogdanpasoi@…

Message:

Better rating graph.

Location:

trunk

Files:

• common/rating.php (modified) (1 diff)
• junk/attach-fix-case (deleted)
• scripts/attach-fix-case (added)
• scripts/check-attachments (modified) (1 diff)
• scripts/send-newsletter (modified) (1 diff)
• www/static/css/screen.css (modified) (1 diff)
• www/views/plot_distribution.php (modified) (5 diffs)
• www/views/plot_rating.php (modified) (5 diffs)

trunk/common/rating.php

@@ -42 +42 @@
 define("IA_RATING_TWEAK_PERIOD", 3);
 define("IA_MIN_SCALED_RATING", 0);
-define("IA_MAX_SCALED_RATING", 1000);
+define("IA_MAX_SCALED_RATING", 1500);
 
 // number square

trunk/scripts/check-attachments

@@ -10 +10 @@
 
 $res = db_query("SELECT `id`, `name`, `page` FROM ia_file");
-
-if (read_bool("Lower case all attachments files?", true)) {
-    $extra_files = glob(IA_ROOT_DIR . "attach/*");
-    foreach ($extra_files as $fname) {
-        if (preg_match('/[A-Z]/', $fname)) {
-            rename($fname, strtolower($fname));
-        }
-    }
-    unset($extra_files);
-}
 
 $extra_files = array_flip(glob(IA_ROOT_DIR . "attach/*"));

trunk/scripts/send-newsletter

@@ -55 +55 @@
         case 'test':
             // a small set of users. meant for testing
-            $usernames = array('wickedman', 'fluffy', 'domino', 'silviug');
+            $usernames = array('wickedman', 'fluffy', 'domino', 'silviug',
+                               'Cosmin');
             $query = "SELECT * FROM ia_user
                       WHERE username IN ('".join("', '", $usernames)."')

trunk/www/static/css/screen.css

@@ -995 +995 @@
     padding: 5px;
     margin: 0;
+    -moz-border-radius: 10px;
 }
 

trunk/www/views/plot_distribution.php

@@ -15 +15 @@
 // gnuplot script
 $script = "
+set terminal postscript noenhanced
 set grid
 
 set rmargin 2
 set lmargin 5
-set tmargin 12
+set tmargin 15
 set bmargin 2
 set xtics nomirror
@@ -27 +28 @@
 
 set style line 1 lt 1 lw 4 pt 3 ps 0.5
-set style line 2 lt 7 lw 6 pt 7 ps 1.0
-set style line 3 lt 11 lw 3
-set xrange [350:960]
+set style line 2 lt 3 lw 6 pt 7 ps 1.0
+set style line 3 lt 11 lw 6
+set xrange [350:1130]
+set yrange [0:250]
 
-set xtics 50
-set xtic rotate by -35
+set xtics 100
+set xtic rotate by -20
 
 ";
@@ -38 +40 @@
 // legend
 $script .= "
-set key left top box 3
+set key right top box 3
 set key width -1.5
 ";
@@ -47 +49 @@
 set parametric
 const={$user_rating}
-set trange [0:100]
+set trange [0:250]
 ";
 }
@@ -54 +56 @@
 $script .= "
 plot \\
-    \"%data%\" using 1:2 title \"Concurenti\" with histeps ls 3, \\
-    \"%data%\" using 1:2 smooth bezier title \"Aproximare\" with lines ls 1";
+    \"%data%\" using 1:2 title \"Concurenti\" with impulses ls 3, \\
+    \"%data%\" using 1:2 smooth csplines title \"Aproximare\" with lines ls 1";
 
 // plot user

trunk/www/views/plot_rating.php

@@ -6 +6 @@
 if (2 <= count($history)) {
     $keys = array_keys($history);
-    $range_start = $history[$keys[0]]['timestamp'] - 30*24*3600;
-    $range_end = $history[$keys[count($history)-1]]['timestamp'] + 30*24*3600;
+    $range_start = $history[$keys[0]]['timestamp'];
+    $range_end = $history[$keys[count($history)-1]]['timestamp'];
+    $rating_start = $history[$keys[0]]['rating'];
+    $rating_end = $rating_start;
+    foreach ($history as $round_id => $round) {
+        $rating_start = min($rating_start, $round['rating']);
+        $rating_end = max($rating_end, $round['rating']);
+    }
+    $rating_start = rating_scale($rating_start)-50;
+    $rating_end = rating_scale($rating_end)+50;
 }
 else {
@@ -13 +21 @@
     $range_start = mktime(1, 0, 0, 1, 1, 2004);
     $range_end = time();
+    $rating_start = 0; $rating_end = 1000;
 }
 // compute months between date range to show as xtics
-list($dy, $dm, $dd) = split('-', date('Y-m-d', $range_start));
+list($dy, $dm, $dd) = split('-', date('Y-m-d', $range_end));
 $i = 0;
 $xtics = array();
+$scale = ceil(($range_end-$range_start)/(30*24*3600)/12);
 while (true) {
-    $dx = mktime(1, 0, 0, $dm + $i, $dd, $dy); 
+    $dx = mktime(1, 0, 0, $dm - $i, $dd, $dy); 
     $xtics[] = date('Y-m-d', $dx);
-    if ($dx > $range_end) {
+    if ($dx < $range_start) {
         break;
     }
-    $i += 2;
+    $i += $scale;
 }
+$xtics = array_reverse($xtics);
 
 // format date ranges for gnuplot
-$range_start = date('Y-m-d', $range_start);
-$range_end = date('Y-m-d', $range_end);
+$range_start = date('Y-m-d', $range_start - 15*24*3600);
+$range_end = date('Y-m-d', $range_end + 15*24*3600);
 
 // gnuplot script
 $script = "
+set terminal postscript noenhanced
+set locale \"ro_RO.UTF-8\"
 set xdata time
 set timefmt \"%Y-%m-%d\"
 set format x \"%b %y\"
-
-
 set grid
 
-set rmargin 2
+set rmargin 5
 set lmargin 5
 set tmargin 12
@@ -50 +61 @@
 
 set style line 1 lt 1 lw 4 pt 3 ps 0.5
-set style line 2 lt 3 lw 4 pt 7 ps 1.
+set style line 2 lt 3 lw 3 pt 7 ps 1.0
 set style line 3 lt 11 lw 3
 set xrange [\"{$range_start}\":\"{$range_end}\"]
+set yrange [{$rating_start}:{$rating_end}]
 
 set xtics ('".join("', '", $xtics)."')
 set xtic rotate by -20
-
 
 set clip
@@ -63 +74 @@
 // display round_id labels
 $i = 1;
+$scale = ceil(($rating_end-$rating_start)/20);
 foreach ($history as $round_id => $round) {
     $date = date("Y-m-d", $round['timestamp']);
-    $rating = rating_scale($round['rating']) + ($i % 2 ? 100 : -100);
+    $rating = rating_scale($round['rating']) + ($i % 2 ? $scale : -$scale);
     $align = ($i % 2 ? "left" : "right");
     $align = "left";
-    $script .= "set label {$i} \"{$i}\" at \"{$date}\",{$rating} {$align} font \"Helvetica,17\" back tc lt 9\n";
+    $script .= "set label {$i} \"{$i}\" at \"{$date}\",{$rating} {$align} font \"Helvetica,19\" back tc lt 9\n";
     $i++;
 }
@@ -83 +95 @@
 plot \\
     \"%data%\" using 1:2 title \"Rating\" with lines ls 1, \\
-    \"%data%\" using 1:2 smooth bezier title \"Medie\" with lines ls 3, \\
-    \"%data%\" using 1:2:3 title \"Deviatie\" with errorbars ls 2
+    \"%data%\" using 1:2 notitle with points ls 2
 ";
 }