Merge branch 'master' into asynceval

src/evaluate.rs

@@ -42,13 +42,14 @@ pub(crate) struct Evaluator {
 
 impl Evaluator {
     pub fn new(deadline: Arc<Deadline>) -> Self {
+        // queue size ensures we're not using too much memory for pending reductions
         let (tx, rx) = sync_channel(4);
         Self {
             deadline,
             best_candidate_size: Arc::new(AtomicMin::new(None)),
             nth: AtomicUsize::new(0),
             eval_send: Some(tx),
-            eval_thread: thread::spawn(move || Self::evaluate_images(rx)),
+            eval_thread: thread::spawn(move || Self::evaluate_images(rx, deadline)),
         }
     }
 
@@ -116,10 +117,12 @@ impl Evaluator {
     }
 
     /// Main loop of evaluation thread
-    fn evaluate_images(from_channel: Receiver<Candidate>) -> Option<PngData> {
+    fn evaluate_images(from_channel: Receiver<(Arc<PngImage>, f32, bool)>, deadline: Arc<Deadline>) -> Option<PngData> {
+        let best_candidate_size = AtomicMin::new(None);
         let mut best_result: Option<Candidate> = None;
-        // ends when the last sender is dropped
-        for new in from_channel.iter() {
+        let best_result: Mutex<Option<(PngData, _, _)>> = Mutex::new(None);
+        // ends when sender is dropped
+        for (nth, (image, bias, is_reduction)) in from_channel.iter().enumerate() {
             // a tie-breaker is required to make evaluation deterministic
             let is_best = if let Some(ref old) = best_result {
                 // ordering is important - later file gets to use bias over earlier, but not the other way