Merge pull request #16 from TLmaK0/feature/telemetry

Feature/telemetry

.gitignore

@@ -20,3 +20,6 @@ Cargo.lock
 # Vim
 *.swp
 *.swo
+
+# Fmt
+**/*.rs.bk

.travis.yml

@@ -1,24 +1,26 @@
 sudo: false
 language: rust
 rust:
- - stable
- - beta
+  - stable
+  - beta
 os:
- - linux
- - osx
+  - linux
+  - osx
 cache: cargo
 before_cache:
- - cargo prune
+  - cargo prune
 env:
   global:
     - PATH=$PATH:$HOME/.cargo/bin
     - RUST_BACKTRACE=1
 before_script:
-- |
-  (which cargo-install-update   && cargo install-update cargo-update) || cargo install cargo-update &&
-  (which rustfmt && cargo install-update rustfmt) || cargo install rustfmt &&
-  (which cargo-prune && cargo install-update cargo-prune) || cargo install cargo-prune
-
+  - |
+    (which cargo-install-update   && cargo install-update cargo-update) || cargo install cargo-update &&
+    (which rustfmt && cargo install-update rustfmt) || cargo install rustfmt &&
+    (which cargo-prune && cargo install-update cargo-prune) || cargo install cargo-prune
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then export OPENSSL_LIB_DIR=`brew --prefix openssl`/lib; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then export DEP_OPENSSL_INCLUDE=`brew --prefix openssl`/include; fi
 script:
   - if [ "${TRAVIS_RUST_VERSION}" = stable ]; then
       (

Cargo.toml

@@ -16,7 +16,13 @@ lazy_static = "0.2.2"
 num_cpus = "1.0"
 rand = "0.3"
 rulinalg = "0.3.4"
+rusty_dashed = "0.1.2" 
+rustc-serialize = "0.3.21"
 
 [dependencies.clippy]
 optional = true
 version = "0.0.103"
+
+[features]
+default = []
+telemetry = []

README.md

@@ -15,7 +15,9 @@ To speed up tests, run them with `--release` (XOR classification/simple_sample s
 ```
 ## Run example
 
-`cargo run --release --example simple_sample`
+`cargo run --release --example simple_sample --features=telemetry`
+
+then go to `http://localhost:3000` to see how neural network evolves
 
 ## Sample usage
 
@@ -70,3 +72,9 @@ fn main() {
 }
 
 ```
+
+# Develop
+Check style guidelines with:
+
+`cargo install rustfmt`
+`cargo fmt -- --write-mode=diff`

examples/simple_sample.rs

@@ -1,7 +1,14 @@
 extern crate rustneat;
+#[macro_use]
+extern crate rusty_dashed;
+
+extern crate rand;
+
 use rustneat::Environment;
 use rustneat::Organism;
 use rustneat::Population;
+use rusty_dashed::Dashboard;
+
 
 struct XORClassification;
 
@@ -17,11 +24,24 @@ impl Environment for XORClassification {
         distance += (1f64 - output[0]).abs();
         organism.activate(&vec![1f64, 1f64], &mut output);
         distance += (0f64 - output[0]).abs();
-        (4f64 - distance).powi(2)
+
+        let fitness = (4f64 - distance).powi(2);
+
+        fitness
     }
 }
 
 fn main() {
+    let mut dashboard = Dashboard::new();
+    dashboard.add_graph("fitness1", "fitness", 0, 0, 4, 4);
+    dashboard.add_graph("network1", "network", 4, 0, 4, 4);
+
+    rusty_dashed::Server::serve_dashboard(dashboard);
+
+
+    #[cfg(feature = "telemetry")]
+    println!("\nGo to http://localhost:3000 to see how neural network evolves\n");
+
     let mut population = Population::create_population(150);
     let mut environment = XORClassification;
     let mut champion: Option<Organism> = None;

graphs/fitness.css

@@ -0,0 +1,9 @@
+svg {
+  width: 100%;
+  height: 100%;
+}
+
+svg path {
+  stroke: black;
+  fill: none;
+}

graphs/fitness.js

@@ -0,0 +1,51 @@
+var fitnessAxis = {};
+function fitness_init(id){
+  var svg = d3.select('#' + id).append('svg');
+  svg.append('path');
+
+  fitnessAxis[id+"y"] = svg.append("g");
+  fitnessAxis[id+"x"] = svg.append("g");
+}
+
+var fitnessData = {};
+
+function fitness(id, value){
+  if (!fitnessData[id]){
+    fitnessData[id] = [];
+    for(i = 0; i < 100; i++){
+      fitnessData[id].push(0);
+    }
+  }
+
+  fitnessData[id].shift();
+  fitnessData[id].push(value);
+
+  var data = fitnessData[id];
+
+  var svg = d3.select('#' + id).select('svg');
+  var path = svg.select('path');
+
+  var width = $('#' + id).children().width(),
+      height = $('#' + id).children().height();
+
+  var y = d3.scaleLinear()
+    .range([height, 0])
+    .domain([-1, 17]);
+
+  var x = d3.scaleLinear()
+    .range([0, width])
+    .domain([data.length, 0]);
+
+
+  var lineChart = d3.line()
+                    .x(function(d, i){ return x(i) })
+                    .y(function(d){ return y(d) });
+
+  var yAxis = d3.axisLeft(y);
+  var xAxis = d3.axisBottom(x);
+
+  fitnessAxis[id+'y'].attr("transform", "translate(30,0)").call(yAxis);
+  fitnessAxis[id+'x'].attr("transform", "translate(30,"+ (height - 19) + ")").call(xAxis);
+
+  path.attr("transform", "translate(30,0)").attr("d", lineChart(data));
+}

graphs/network.css

@@ -0,0 +1,15 @@
+.links line {
+  stroke: #999;
+  stroke-opacity: 0.6;
+}
+
+.nodes circle {
+  stroke: #fff;
+  stroke-width: 1.5px;
+}
+
+svg {
+  width: 100%;
+  height: 100%;
+}
+