Fmt.

Clippy.

src/lib.rs

@@ -16,7 +16,7 @@ pub trait Individual: Send {
 
 pub trait Select<T>: Send
 where
-    T: Individual
+    T: Individual,
 {
     fn select(&self, population: Vec<Wrapper<T>>) -> Vec<Wrapper<T>>;
 }
@@ -28,18 +28,16 @@ pub struct MaximizeSelector {
 
 impl MaximizeSelector {
     pub fn new(count: usize) -> Self {
-        MaximizeSelector {
-            count: count,
-        }
+        MaximizeSelector { count: count }
     }
 }
 
 impl<T> Select<T> for MaximizeSelector
 where
-    T: Individual
+    T: Individual,
 {
     fn select(&self, mut population: Vec<Wrapper<T>>) -> Vec<Wrapper<T>> {
-        population.par_sort_unstable_by(|a, b| b.fitness.cmp(&a.fitness));
+        population.sort_unstable_by(|a, b| b.fitness.cmp(&a.fitness));
 
         population.into_iter().take(self.count).collect()
     }
@@ -52,18 +50,16 @@ pub struct MinimizeSelector {
 
 impl MinimizeSelector {
     pub fn new(count: usize) -> Self {
-        MinimizeSelector {
-            count: count,
-        }
+        MinimizeSelector { count: count }
     }
 }
 
 impl<T> Select<T> for MinimizeSelector
 where
-    T: Individual
+    T: Individual,
 {
     fn select(&self, mut population: Vec<Wrapper<T>>) -> Vec<Wrapper<T>> {
-        population.par_sort_unstable_by(|a, b| a.fitness.cmp(&b.fitness));
+        population.sort_unstable_by(|a, b| a.fitness.cmp(&b.fitness));
 
         population.into_iter().take(self.count).collect()
     }
@@ -96,28 +92,34 @@ where
 
         initial
             .into_par_iter()
-            .map(|individual| Wrapper {
-                individual: individual,
-                fitness: None,
+            .map(|individual| {
+                Wrapper {
+                    individual: individual,
+                    fitness: None,
+                }
             })
             .collect_into(&mut population);
 
-        Simulation {
-            population: population,
-        }
+        Simulation { population: population }
     }
 
+    #[inline]
     pub fn calculate(&mut self) {
-        self.population.par_iter_mut()
+        self.population
+            .par_iter_mut()
             .filter(|wrapper| wrapper.fitness.is_none())
-            .for_each(|wrapper| wrapper.fitness = Some(wrapper.individual.fitness()));
+            .for_each(|wrapper| {
+                wrapper.fitness = Some(wrapper.individual.fitness())
+            });
 
-        self.population.par_sort_unstable_by(|a, b| b.fitness.cmp(&a.fitness));
+        self.population.par_sort_unstable_by(
+            |a, b| b.fitness.cmp(&a.fitness),
+        );
     }
 
     pub fn evolve<F>(&mut self, func: F)
     where
-        F: Fn(&[Wrapper<T>], &mut Vec<Wrapper<T>>)
+        F: Fn(&[Wrapper<T>], &mut Vec<Wrapper<T>>),
     {
         let mut population = Vec::with_capacity(self.population.len());
 

src/lib.rs.bk

@@ -0,0 +1,131 @@
+extern crate rayon;
+
+
+use rayon::prelude::*;
+
+
+pub trait Individual: Send {
+    type Fitness: Send + Ord;
+
+    fn fitness(&self) -> Self::Fitness;
+
+    fn mate(&self, other: &Self) -> Self;
+    fn mutate(&mut self);
+}
+
+
+pub trait Select<T>: Send
+where
+    T: Individual
+{
+    fn select(&self, population: Vec<Wrapper<T>>) -> Vec<Wrapper<T>>;
+}
+
+
+pub struct MaximizeSelector {
+    count: usize,
+}
+
+impl MaximizeSelector {
+    pub fn new(count: usize) -> Self {
+        MaximizeSelector {
+            count: count,
+        }
+    }
+}
+
+impl<T> Select<T> for MaximizeSelector
+where
+    T: Individual
+{
+    fn select(&self, mut population: Vec<Wrapper<T>>) -> Vec<Wrapper<T>> {
+        population.sort_unstable_by(|a, b| b.fitness.cmp(&a.fitness));
+
+        population.into_iter().take(self.count).collect()
+    }
+}
+
+
+pub struct MinimizeSelector {
+    count: usize,
+}
+
+impl MinimizeSelector {
+    pub fn new(count: usize) -> Self {
+        MinimizeSelector {
+            count: count,
+        }
+    }
+}
+
+impl<T> Select<T> for MinimizeSelector
+where
+    T: Individual
+{
+    fn select(&self, mut population: Vec<Wrapper<T>>) -> Vec<Wrapper<T>> {
+        population.sort_unstable_by(|a, b| a.fitness.cmp(&b.fitness));
+
+        population.into_iter().take(self.count).collect()
+    }
+}
+
+
+#[derive(Clone)]
+pub struct Wrapper<T>
+where
+    T: Individual,
+{
+    pub individual: T,
+    pub fitness: Option<T::Fitness>,
+}
+
+
+pub struct Simulation<T>
+where
+    T: Individual,
+{
+    pub population: Vec<Wrapper<T>>,
+}
+
+impl<T> Simulation<T>
+where
+    T: Individual,
+{
+    pub fn with_population(initial: Vec<T>) -> Self {
+        let mut population = Vec::with_capacity(initial.len() * 2);
+
+        initial
+            .into_par_iter()
+            .map(|individual| Wrapper {
+                individual: individual,
+                fitness: None,
+            })
+            .collect_into(&mut population);
+
+        Simulation {
+            population: population,
+        }
+    }
+
+    #[inline]
+    pub fn calculate(&mut self) {
+        self.population.par_iter_mut()
+            .filter(|wrapper| wrapper.fitness.is_none())
+            .for_each(|wrapper| wrapper.fitness = Some(wrapper.individual.fitness()));
+
+        self.population.par_sort_unstable_by(|a, b| b.fitness.cmp(&a.fitness));
+    }
+
+    pub fn evolve<F>(&mut self, func: F)
+    where
+        F: Fn(&[Wrapper<T>], &mut Vec<Wrapper<T>>)
+    {
+        let mut population = Vec::with_capacity(self.population.len());
+
+        func(&self.population, &mut population);
+
+        self.population = population;
+
+        self.calculate();
+    }
+}