' . htmlspecialchars($url, ENT_QUOTES, 'UTF-8') .
'' . "\n";
@@ -73,6 +92,11 @@
+
Error log
+
+
+
+
diff --git a/libs/make_graph.php b/libs/make_graph.php
index e7bf1e460..a14351396 100644
--- a/libs/make_graph.php
+++ b/libs/make_graph.php
@@ -2,7 +2,7 @@
require __DIR__ . '/php-recipe-2nd/make_chart_parts.php';
-function make_graph($id, $title, $hAxis_title)
+function make_graph($id, $title, $hAxis_title, $vAxis_maxValue = 0.01)
{
global $results;
@@ -14,8 +14,8 @@ function make_graph($id, $title, $hAxis_title)
'DarkKhaki', 'DarkMagenta', 'DarkOliveGreen', 'DarkOrange', 'DarkOrchid',
'DarkRed', 'DarkSalmon', 'DarkSeaGreen', 'DarkSlateBlue', 'DarkSlateGray',
);
- $graphWidth = 1100;
- $graphHeight = 400;
+ $graphWidth = 1300;
+ $graphHeight = 500;
$data = array();
$data[] = array('', $id, array('role' => 'style')); // header
@@ -31,7 +31,7 @@ function make_graph($id, $title, $hAxis_title)
'titleTextStyle' => array('fontSize' => 16),
'hAxis' => array('title' => $hAxis_title,
'titleTextStyle' => array('bold' => true)),
- 'vAxis' => array('minValue' => 0, 'maxValue' => 0.01),
+ 'vAxis' => array('minValue' => 0, 'maxValue' => $vAxis_maxValue),
'width' => $graphWidth,
'height' => $graphHeight,
'bar' => array('groupWidth' => '90%'),
diff --git a/libs/output_data.php b/libs/output_data.php
index 5c12ec2b1..24e75575e 100644
--- a/libs/output_data.php
+++ b/libs/output_data.php
@@ -1,8 +1,22 @@
0,
+ 'memory' => 0,
+ 'time' => 0,
+ 'file' => 0,
+ ];
+
+ // Prevent from affecting the relative results
+ continue;
+
+ }
+
+ // Only allow enabled frameworks to affect the relative results
+ if (array_search($fw, $frameworks)) {
+
+ $min_rps = $rps > 0 ? min($min_rps, $rps) : $min_rps;
+ $min_memory = $memory > 0 ? min($min_memory, $memory) : $min_memory;
+ $min_time = $time > 0 ? min($min_time, $time) : $min_time;
+ $min_file = $file > 0 ? min($min_file, $file) : $min_file;
+
+ }
+
$results[$fw] = [
'rps' => $rps,
'memory' => round($memory, 2),
'time' => $time,
'file' => $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;
+
+ $ordered_results = [];
+ foreach ($frameworks as $fw) {
+ if (isset($results[$fw])) {
+ $data = $results[$fw];
+ $ordered_results[$fw] = $data;
+ $ordered_results[$fw]['rps_relative'] = $data['rps'] / $min_rps;
+ $ordered_results[$fw]['memory_relative'] = $data['memory'] / $min_memory;
+ $ordered_results[$fw]['time_relative'] = $data['time'] / $min_time;
+ $ordered_results[$fw]['file_relative'] = $data['file'] / $min_file;
+ } else {
+ $ordered_results[$fw] = [
+ 'rps' => 0,
+ 'memory' => 0,
+ 'time' => 0,
+ 'file' => 0,
+ 'rps_relative' => 0,
+ 'memory_relative' => 0,
+ 'time_relative' => 0,
+ 'file_relative' => 0,
+ ];
+ }
}
-// var_dump($results);
+// var_dump($ordered_results);
- return $results;
+ return $ordered_results;
}
diff --git a/libs/recalc_relative.php b/libs/recalc_relative.php
index d51ee2fb4..88c8ff6c9 100644
--- a/libs/recalc_relative.php
+++ b/libs/recalc_relative.php
@@ -7,9 +7,9 @@ function recalc_relative($results)
$min_time = INF;
foreach ($results as $fw) {
- $min_rps = min($min_rps, $fw['rps']);
- $min_memory = min($min_memory, $fw['memory']);
- $min_time = min($min_time, $fw['time']);
+ $min_rps = $fw['rps'] > 0 ? min($min_rps, $fw['rps']) : $min_rps;
+ $min_memory = $fw['memory'] > 0 ? min($min_memory, $fw['memory']) : $min_memory;
+ $min_time = $fw['time'] > 0 ? min($min_time, $fw['time']) : $min_time;
}
foreach ($results as $fw => $data) {
diff --git a/list.php b/list.php
new file mode 100644
index 000000000..e00bc34ff
--- /dev/null
+++ b/list.php
@@ -0,0 +1,47 @@
+