Fix Bugs

1 files changed, 55 insertions, 28 deletions

diff --git a/src/solvers/gpu/output.rs b/src/solvers/gpu/output.rs
index 58a4aa5..a716340 100644
--- a/src/solvers/gpu/output.rs
+++ b/src/solvers/gpu/output.rs
@@ -1,13 +1,12 @@
-use super::Message;
-use std::collections::{HashSet, HashMap};
+use super::{Message, ResultMessage};
+use std::collections::{HashMap, HashSet};
 use std::sync::mpsc::{channel, Receiver, Sender};
 use std::thread::JoinHandle;
 
 struct InBuffer {
     receiver: Receiver<Message>,
-    row_requests: HashMap<u64, Vec<u32>>,
-    results_requests: HashMap<u64, Vec<u64>>,
-
+    row_requests: HashMap<u64, Vec<Vec<u32>>>,
+    results_requests: HashMap<u64, ResultMessage>,
 }
 
 impl InBuffer {
@@ -18,23 +17,51 @@ impl InBuffer {
             results_requests: HashMap::new(),
         }
     }
-    fn read(&mut self) -> Option<Result> {
+    fn read(&mut self) -> Option<Vec<RowResult>> {
         loop {
-            match self.receiver.recv() {
-                Message::OutputMessage((id, ResultMessage)) => {
-                    if Some(result) = self.results_requests.get(id) {
-                        Some(RowResult::new()
+            match self
+                .receiver
+                .recv()
+                .expect("Channel to Output Daemon broke")
+            {
+                Message::ResultMessage(results) => {
+                    if let Some(result_walls) = self.row_requests.get(&results.id) {
+                        return Some(Self::calc_results(results.valid_walls(), result_walls));
+                    } else {
+                        self.results_requests.insert(results.id, results);
+                    }
+                }
+                Message::OutputMessage((id, output)) => {
+                    if let Some(results) = self.results_requests.get(&id) {
+                        return Some(Self::calc_results(results.valid_walls(), output.as_ref()));
+                    } else {
+                        self.row_requests.insert(id, output);
                     }
-                    else {
-                        self.row_requests.insert(id, walls);}
+                }
+                Message::Terminate => {
+                    return None;
+                }
+                _ => {
+                    println!("Invalid MessageType");
+                }
             }
         }
     }
-
+    fn calc_results(res_req: &[Vec<u32>], row_req: &[Vec<u32>]) -> Vec<RowResult> {
+        let out = Vec::new();
+        for (rows, perms) in row_req.iter().zip(res_req.iter()) {
+            for p in perms {
+                let new = rows.clone();
+                new.push(*p);
+                out.push(RowResult::new(new));
+            }
+        }
+        out
+    }
 }
 
 #[derive(PartialEq, Eq, Hash)]
-struct RowResult {
+pub struct RowResult {
     rows: Vec<u32>,
 }
 
@@ -50,26 +77,25 @@ impl RowResult {
 
 pub struct Output {
     input: InBuffer,
-    receiver: Receiver<Message>,
     permutations: Vec<Vec<u32>>,
     permutations_mask: Vec<u64>,
     results: HashSet<RowResult>,
 }
 
 impl Output {
-    fn launch_sevice(
+    pub fn launch_sevice(
         permutations: &[Vec<u32>],
-        permutation_masks: &[u64],
-    ) -> (Sender<Message>, JoinHandle<String>) {
+        permutations_mask: &[u64],
+    ) -> (Sender<Message>, JoinHandle<()>) {
         let (sender, receiver) = channel();
         let input = InBuffer::new(receiver);
 
         let output = Self {
             input,
             permutations: permutations.into(),
-            permutation_masks: permutation_masks.into(),
-            HashSet::new(),
-        }
+            permutations_mask: permutations_mask.into(),
+            results: HashSet::new(),
+        };
         (
             sender,
             std::thread::Builder::new()
@@ -83,13 +109,14 @@ impl Output {
 
     fn run(mut self) {
         loop {
-            match self.receiver.recv() {
-                Message::OutputMessage((id, ResultMessage)) => {
-                    if Some(result) = self.results_requests.get(id) {
-                        Some(RowResult::new()
-                    }
-                    else {
-                        self.row_requests.insert(id, walls);}
+            if let Some(walls) = self.input.read() {
+                for wall in walls {
+                    self.results.insert(wall);
+                }
+            } else {
+                for wall in self.results {
+                    wall.output()
+                }
             }
         }
     }