Some fixes

Author: myaaghubi

libs/build_table.php

@@ -22,17 +22,17 @@ function build_table($res1, $res2 = null, $header = true)
         $comp['rps'] = '(-)';
         $comp['memory'] = '(-)';
         if (!empty($res2[$fw])) {
-            $comp['rps'] = '(' . culc_percentage($result['rps'], $res2[$fw]['rps']) . '%)';
-            $comp['memory'] = '(' . culc_percentage($result['memory'], $res2[$fw]['memory']) . '%)';
+            $comp['rps'] = '(' . culc_percentage($result['rps'], $res2[$fw]['rps']) . ')';
+            $comp['memory'] = '(' . culc_percentage($result['memory'], $res2[$fw]['memory']) . ')';
         }
 
         $table .= sprintf(
             "|%-19s|%25s|%14s|%11s|%14s|\n",
             $fw,
             number_format($result['rps'], 2) . ' ' . @$comp['rps'],
-            number_format($result['rps_relative'], 1),
+            is_numeric($result['rps_relative'])?number_format($result['rps_relative'], 1):$result['rps_relative'],
             number_format($result['memory'], 2) . ' ' . @$comp['memory'],
-            number_format($result['memory_relative'], 1)
+            is_numeric($result['memory_relative'])?number_format($result['memory_relative'], 1):$result['memory_relative']
         );
     }
 
@@ -41,9 +41,13 @@ function build_table($res1, $res2 = null, $header = true)
 
 function culc_percentage($targetNumber, $baseNumber)
 {
+    if (!is_numeric($targetNumber) || !is_numeric($baseNumber) || $baseNumber<=0) {
+        return '-';
+    }
+
     $diff = $targetNumber - $baseNumber;
     $percentage = ($diff / $baseNumber) * 100;
     if ($percentage==0)
-        return 0;
-    return number_format($percentage, 1);
+        return '0%';
+    return number_format($percentage, 1).'%';
 }

libs/parse_results.php

@@ -34,10 +34,10 @@ function parse_results($file)
     }
 
     foreach ($results as $fw => $data) {
-        $results[$fw]['rps_relative']    = $data['rps'] / ($min_rps);
-        $results[$fw]['memory_relative'] = $data['memory'] / ($min_memory);
-        $results[$fw]['time_relative'] = $data['time'] / ($min_time);
-        $results[$fw]['file_relative'] = $data['file'] / ($min_file);
+        $results[$fw]['rps_relative']    = $min_rps>0?$data['rps'] / ($min_rps): '-';
+        $results[$fw]['memory_relative'] = $min_memory>0?$data['memory'] / ($min_memory): '-';
+        $results[$fw]['time_relative'] = $min_time>0?$data['time'] / ($min_time): '-';
+        $results[$fw]['file_relative'] = $min_file>0?$data['file'] / ($min_file): '-';
     }
 
     array_multisort(array_column($results, 'rps'), SORT_DESC, $results);