Merge pull request #146 from PaulSec/master

refactor (without deleting)
This commit is contained in:
mokaddem 2017-11-23 12:00:54 +01:00 committed by GitHub
commit 8460131f24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 68 deletions

View file

@ -34,7 +34,7 @@ Features
Installation Installation
------------ ------------
Type these command lines for a fully automated installation and start AIL framework Type these command lines for a fully automated installation and start AIL framework:
```bash ```bash
git clone https://github.com/CIRCL/AIL-framework.git git clone https://github.com/CIRCL/AIL-framework.git
cd AIL-framework cd AIL-framework
@ -46,6 +46,7 @@ cd ~/AIL-framework/
cd bin/ cd bin/
./LAUNCH.sh ./LAUNCH.sh
``` ```
The default [installing_deps.sh](./installing_deps.sh) is for Debian and Ubuntu based distributions. For Arch The default [installing_deps.sh](./installing_deps.sh) is for Debian and Ubuntu based distributions. For Arch
linux based distributions, you can replace it with [installing_deps_archlinux.sh](./installing_deps_archlinux.sh). linux based distributions, you can replace it with [installing_deps_archlinux.sh](./installing_deps_archlinux.sh).
@ -53,6 +54,7 @@ There is also a [Travis file](.travis.yml) used for automating the installation
Docker Quick Start (Ubuntu 16.04 LTS) Docker Quick Start (Ubuntu 16.04 LTS)
------------ ------------
1. Install Docker 1. Install Docker
```bash ```bash
sudo su sudo su

View file

@ -37,84 +37,82 @@ function update_values() {
// Plot and update the number of processed pastes // Plot and update the number of processed pastes
// BEGIN PROCESSED PASTES // BEGIN PROCESSED PASTES
var default_minute = (typeof window.default_minute !== "undefined") ? parseInt(window.default_minute) : 10; var default_minute = (typeof window.default_minute !== "undefined") ? parseInt(window.default_minute) : 10;
var totalPoints = 2*parseInt(default_minute); //60s*minute var totalPoints = 2*parseInt(default_minute); //60s*minute
var curr_max = {"global": 0}; var curr_max = {"global": 0};
function fetch_data(dataset, curr_data, feeder_name) { function fetch_data(dataset, curr_data, feeder_name) {
if (curr_data.length > 0){ if (curr_data.length > 0){
var data_old = curr_data[0]; var data_old = curr_data[0];
curr_data = curr_data.slice(1); curr_data = curr_data.slice(1);
curr_max[dataset] = curr_max[dataset] == data_old ? Math.max.apply(null, curr_data) : curr_max[dataset]; curr_max[dataset] = curr_max[dataset] == data_old ? Math.max.apply(null, curr_data) : curr_max[dataset];
}
while (curr_data.length < totalPoints) {
var y = (typeof window.paste_num_tabvar_all[dataset] !== "undefined") ? parseInt(window.paste_num_tabvar_all[dataset]) : 0;
curr_max[dataset] = y > curr_max[dataset] ? y : curr_max[dataset];
curr_data.push(y);
}
// Zip the generated y values with the x values
var res = [];
for (var i = 0; i < curr_data.length; ++i) {
res.push([i, curr_data[i]])
}
data_for_processed_paste[dataset] = curr_data;
return { label: feeder_name, data: res };
} }
function getData(dataset_group, graph_type) { while (curr_data.length < totalPoints) {
var curr_data; var y = (typeof window.paste_num_tabvar_all[dataset] !== "undefined") ? parseInt(window.paste_num_tabvar_all[dataset]) : 0;
curr_max[dataset] = y > curr_max[dataset] ? y : curr_max[dataset];
curr_data.push(y);
}
// Zip the generated y values with the x values
var res = [];
for (var i = 0; i < curr_data.length; ++i) {
res.push([i, curr_data[i]])
}
data_for_processed_paste[dataset] = curr_data;
return { label: feeder_name, data: res };
}
var all_res = []; function getData(dataset_group, graph_type) {
if (dataset_group == "global") { var curr_data;
if (data_for_processed_paste["global"] === undefined) { // create feeder dataset if not exists yet
data_for_processed_paste["global"] = [];
}
curr_data = data_for_processed_paste["global"];
all_res.push(fetch_data("global", curr_data, "global"));
} else {
for(d_i in list_feeder) { var all_res = [];
if(list_feeder[d_i] == "global") { if (dataset_group == "global") {
continue; if (data_for_processed_paste["global"] === undefined) { // create feeder dataset if not exists yet
} data_for_processed_paste["global"] = [];
}
dataset = graph_type+list_feeder[d_i]; curr_data = data_for_processed_paste["global"];
if (data_for_processed_paste[dataset] === undefined) { // create feeder dataset if not exists yet all_res.push(fetch_data("global", curr_data, "global"));
data_for_processed_paste[dataset] = []; } else {
} for(d_i in list_feeder) {
curr_data = data_for_processed_paste[dataset]; if(list_feeder[d_i] == "global") {
all_res.push(fetch_data(dataset, curr_data, list_feeder[d_i])); continue;
} }
dataset = graph_type+list_feeder[d_i];
if (data_for_processed_paste[dataset] === undefined) { // create feeder dataset if not exists yet
data_for_processed_paste[dataset] = [];
}
curr_data = data_for_processed_paste[dataset];
all_res.push(fetch_data(dataset, curr_data, list_feeder[d_i]));
} }
return all_res;
} }
return all_res;
}
var updateInterval = 30*1000; //30s = 30*1000ms var updateInterval = 30*1000; //30s = 30*1000ms
var options_processed_pastes = { var options_processed_pastes = {
series: { shadowSize: 0 , series: { shadowSize: 0 ,
lines: { fill: true, fillColor: { colors: [ { opacity: 1 }, { opacity: 0.1 } ] }} lines: { fill: true, fillColor: { colors: [ { opacity: 1 }, { opacity: 0.1 } ] }}
}, },
yaxis: { min: 0, max: 40 }, yaxis: { min: 0, max: 40 },
xaxis: { ticks: [[0, 0], [2, 1], [4, 2], [6, 3], [8, 4], [10, 5], [12, 6], [14, 7], [16, 8], [18, 9], [20, 10]] }, xaxis: { ticks: [[0, 0], [2, 1], [4, 2], [6, 3], [8, 4], [10, 5], [12, 6], [14, 7], [16, 8], [18, 9], [20, 10]] },
grid: { grid: {
tickColor: "#dddddd", tickColor: "#dddddd",
borderWidth: 0 borderWidth: 0
}, },
legend: { legend: {
show: true, show: true,
position: "nw", position: "nw",
}
};
function update_processed_pastes(graph, dataset, graph_type) {
graph.setData(getData(dataset, graph_type));
graph.getOptions().yaxes[0].max = curr_max[dataset];
graph.setupGrid();
graph.draw();
setTimeout(function(){ update_processed_pastes(graph, dataset, graph_type); }, updateInterval);
} }
};
function update_processed_pastes(graph, dataset, graph_type) {
graph.setData(getData(dataset, graph_type));
graph.getOptions().yaxes[0].max = curr_max[dataset];
graph.setupGrid();
graph.draw();
setTimeout(function(){ update_processed_pastes(graph, dataset, graph_type); }, updateInterval);
}
// END PROCESSED PASTES // END PROCESSED PASTES