diff options
author | Dennis Kobert <dennis@kobert.dev> | 2020-01-12 21:50:28 +0100 |
---|---|---|
committer | Dennis Kobert <dennis@kobert.dev> | 2020-01-12 21:50:28 +0100 |
commit | aa9069b0913759e39c4d3451896ebcf3ac5538fb (patch) | |
tree | e52e7c193fded70ee24f9ab0c270d752acb03741 | |
parent | 70fa220f7a2b1b2275679547ac21768ab657cea2 (diff) |
Fix a bug in the progress bar
-rw-r--r-- | src/solvers/gpu/manager.rs | 1 | ||||
-rw-r--r-- | src/solvers/gpusolver.rs | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/solvers/gpu/manager.rs b/src/solvers/gpu/manager.rs index def1f35..ede6a85 100644 --- a/src/solvers/gpu/manager.rs +++ b/src/solvers/gpu/manager.rs @@ -106,6 +106,7 @@ impl OclManager { match self.receiver.recv().expect("Channel to GPU Manager broke") { Message::CheckRequest(request) => { let queue = request.queue; + //println!("num: {:?} bit {:b}", request.rows, request.bitmask); if let Some(buffer) = self.buffers[queue as usize].read(request) { self.host_sender .send(Message::HostMessage((self.job_id, queue, buffer.0.into()))) diff --git a/src/solvers/gpusolver.rs b/src/solvers/gpusolver.rs index 7133e95..b073e7e 100644 --- a/src/solvers/gpusolver.rs +++ b/src/solvers/gpusolver.rs @@ -96,7 +96,11 @@ impl GpuSolver { if index == 1 { let mut data = self.progress.lock().unwrap(); *data += 1; - println!("progress: {}%", *data as f64 / self.chunk as f64 * 100.0); + let bias = self.n - (self.h - 1 - index as u32); + println!( + "progress: {}%", + *data as f64 / self.chunk as f64 * 100.0 / bias as f64 + ); } } } |