This commit is contained in:
2018-09-14 08:59:09 +02:00
parent f9069e12bb
commit db996837e7
3 changed files with 8 additions and 16 deletions

View File

@@ -101,13 +101,11 @@ fn criterion_benchmark(c: &mut Criterion) {
.filter(|&(n, _)| n % 2 == 1) .filter(|&(n, _)| n % 2 == 1)
.map(|(_, wrapper)| wrapper) .map(|(_, wrapper)| wrapper)
.take(5), .take(5),
) ).map(|(a, b)| a.individual.mate(&b.individual))
.map(|(a, b)| a.individual.mate(&b.individual))
.map(|individual| Wrapper { .map(|individual| Wrapper {
individual, individual,
fitness: None, fitness: None,
}) }).for_each(|wrapper| {
.for_each(|wrapper| {
population.push(wrapper); population.push(wrapper);
}); });
@@ -122,8 +120,7 @@ fn criterion_benchmark(c: &mut Criterion) {
individual, individual,
fitness: None, fitness: None,
} }
}) }).collect_into_vec(population);
.collect_into_vec(population);
// Add all parents again. // Add all parents again.
population.extend(parents.iter().cloned()); population.extend(parents.iter().cloned());

View File

@@ -87,13 +87,11 @@ fn main() {
.filter(|&(n, _)| n % 2 == 1) .filter(|&(n, _)| n % 2 == 1)
.map(|(_, wrapper)| wrapper) .map(|(_, wrapper)| wrapper)
.take(5), .take(5),
) ).map(|(a, b)| a.individual.mate(&b.individual))
.map(|(a, b)| a.individual.mate(&b.individual))
.map(|individual| Wrapper { .map(|individual| Wrapper {
individual, individual,
fitness: None, fitness: None,
}) }).for_each(|wrapper| {
.for_each(|wrapper| {
population.push(wrapper); population.push(wrapper);
}); });
@@ -108,8 +106,7 @@ fn main() {
individual, individual,
fitness: None, fitness: None,
} }
}) }).collect_into_vec(population);
.collect_into_vec(population);
// Add all parents again. // Add all parents again.
population.extend(parents.iter().cloned()); population.extend(parents.iter().cloned());

View File

@@ -88,8 +88,7 @@ where
.map(|individual| Wrapper { .map(|individual| Wrapper {
individual, individual,
fitness: None, fitness: None,
}) }).for_each(|wrapper| {
.for_each(|wrapper| {
population.push(wrapper); population.push(wrapper);
}); });
@@ -140,8 +139,7 @@ where
.map(|individual| Wrapper { .map(|individual| Wrapper {
individual, individual,
fitness: None, fitness: None,
}) }).collect_into_vec(&mut population);
.collect_into_vec(&mut population);
ParSimulation { population } ParSimulation { population }
} }