logaritmisk/genetisk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to weak_rng.

Browse Source
This commit is contained in:
logaritmisk
2018-05-10 14:36:28 +02:00
parent d3799c8bfa
commit f9069e12bb
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -11,7 +11,7 @@ name = "parabole"
path = "examples/parabole.rs" path = "examples/parabole.rs"
[dev-dependencies] [dev-dependencies]
rand = "0.3" rand = "0.4"
criterion = "0.2" criterion = "0.2"
[[bench]] [[bench]]

8
benches/parabole.rs
View File

@@ -50,9 +50,9 @@ impl Individual for Parabole {
} }
fn mutate(&mut self) { fn mutate(&mut self) {
let between = Range::new(-1.0, 1.0); let mut rng = rand::weak_rng();
let mut rng = rand::thread_rng(); let between = Range::new(-1.0, 1.0);
let offset = between.ind_sample(&mut rng); let offset = between.ind_sample(&mut rng);
self.x += offset; self.x += offset;
@@ -104,7 +104,7 @@ fn criterion_benchmark(c: &mut Criterion) {
) )
.map(|(a, b)| a.individual.mate(&b.individual)) .map(|(a, b)| a.individual.mate(&b.individual))
.map(|individual| Wrapper { .map(|individual| Wrapper {
individual: individual, individual,
fitness: None, fitness: None,
}) })
.for_each(|wrapper| { .for_each(|wrapper| {
@@ -119,7 +119,7 @@ fn criterion_benchmark(c: &mut Criterion) {
individual.mutate(); individual.mutate();
Wrapper { Wrapper {
individual: individual, individual,
fitness: None, fitness: None,
} }
}) })

10
examples/parabole.rs
View File

@@ -7,7 +7,7 @@ use std::cmp::Ordering;
use rand::distributions::{IndependentSample, Range}; use rand::distributions::{IndependentSample, Range};
use rayon::prelude::*; use rayon::prelude::*;
use genetisk::{Individual, MaximizeSelector, MinimizeSelector, Select, Simulation, Wrapper}; use genetisk::{Individual, Simulation, Wrapper};
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
struct Fitness(f64); struct Fitness(f64);
@@ -47,9 +47,9 @@ impl Individual for Parabole {
} }
fn mutate(&mut self) { fn mutate(&mut self) {
let between = Range::new(-1.0, 1.0); let mut rng = rand::weak_rng();
let mut rng = rand::thread_rng(); let between = Range::new(-1.0, 1.0);
let offset = between.ind_sample(&mut rng); let offset = between.ind_sample(&mut rng);
self.x += offset; self.x += offset;
@@ -90,7 +90,7 @@ fn main() {
) )
.map(|(a, b)| a.individual.mate(&b.individual)) .map(|(a, b)| a.individual.mate(&b.individual))
.map(|individual| Wrapper { .map(|individual| Wrapper {
individual: individual, individual,
fitness: None, fitness: None,
}) })
.for_each(|wrapper| { .for_each(|wrapper| {
@@ -105,7 +105,7 @@ fn main() {
individual.mutate(); individual.mutate();
Wrapper { Wrapper {
individual: individual, individual,
fitness: None, fitness: None,
} }
}) })