Merge branch 'feature/git-dependency/ml' into dev

Author: mlange-42

Cargo.lock

@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 num-traits = "0.2"
 rand = "0.5.5"
-easy_graph = { path = "../easy_graph", version = "0.1.0" }
+easy_graph = { git = "https://m-lange@bitbucket.org/m-lange/easy_graph.git" }
 
 [dev-dependencies]
 statistical = "1.0.0"

Cargo.toml

@@ -2,8 +2,6 @@ use crate::data::DataFrame;
 
 use crate::calc::metric::{EuclideanMetric, Metric, SqEuclideanMetric, TanimotoMetric};
 use crate::map::som::Layer;
-use crossbeam::thread;
-use std::sync::mpsc;
 
 #[allow(dead_code)]
 const EUCLIDEAN: EuclideanMetric = EuclideanMetric();

src/calc/nn.rs

@@ -42,25 +42,6 @@ fn run_layer_view() {
     }
 }
 
-#[allow(dead_code)]
-fn parallel_nn() {
-    let mut rng = rand::thread_rng();
-    let from = [0.0, 0.0, 0.0];
-    let mut to = DataFrame::<f64>::empty(3);
-
-    for _i in 0..1000 {
-        to.push_row(&[
-            rng.gen_range(0.0, 1.0),
-            rng.gen_range(0.0, 1.0),
-            rng.gen_range(0.0, 1.0),
-        ]);
-    }
-
-    let (idx, dist) = nn::par_nearest_neighbor(&from, &to, 8);
-
-    println!("{}, {}", idx, dist);
-}
-
 #[allow(dead_code)]
 fn run_xyf(graphics: bool) {
     let dim = 4;