refactor(laplace): clone matrix in compute

examples/demo/src/laplace.rs

@@ -3,7 +3,7 @@
 //! This module performs the Jacobi method for solving Laplace's differential equation.
 
 use std::time::Instant;
-use std::vec;
+use std::{mem, vec};
 
 use rayon::prelude::*;
 
@@ -23,31 +23,27 @@ pub fn laplace() {
 	assert!(residual < 0.001);
 }
 
-fn matrix_setup(size_x: usize, size_y: usize) -> vec::Vec<vec::Vec<f64>> {
-	let mut matrix = vec![vec![0.0; size_x * size_y]; 2];
+fn matrix_setup(size_x: usize, size_y: usize) -> vec::Vec<f64> {
+	let mut matrix = vec![0.0; size_x * size_y];
 
 	// top row
-	for x in 0..size_x {
-		matrix[0][x] = 1.0;
-		matrix[1][x] = 1.0;
+	for f in matrix.iter_mut().take(size_x) {
+		*f = 1.0;
 	}
 
 	// bottom row
 	for x in 0..size_x {
-		matrix[0][(size_y - 1) * size_x + x] = 1.0;
-		matrix[1][(size_y - 1) * size_x + x] = 1.0;
+		matrix[(size_y - 1) * size_x + x] = 1.0;
 	}
 
 	// left row
 	for y in 0..size_y {
-		matrix[0][y * size_x] = 1.0;
-		matrix[1][y * size_x] = 1.0;
+		matrix[y * size_x] = 1.0;
 	}
 
 	// right row
 	for y in 0..size_y {
-		matrix[0][y * size_x + size_x - 1] = 1.0;
-		matrix[1][y * size_x + size_x - 1] = 1.0;
+		matrix[y * size_x + size_x - 1] = 1.0;
 	}
 
 	matrix
@@ -93,20 +89,17 @@ fn iteration(cur: &[f64], next: &mut [f64], size_x: usize, size_y: usize) {
 		});
 }
 
-pub fn compute(mut matrix: vec::Vec<vec::Vec<f64>>, size_x: usize, size_y: usize) -> (usize, f64) {
+pub fn compute(matrix: vec::Vec<f64>, size_x: usize, size_y: usize) -> (usize, f64) {
+	let mut current = matrix;
+	let mut next = current.clone();
 	let mut counter = 0;
 
 	while counter < 1000 {
-		{
-			// allow a borrow and a reference to the same vector
-			let (current, next) = matrix.split_at_mut(1);
-
-			iteration(&current[0], &mut next[0], size_x, size_y);
-		}
-		matrix.swap(0, 1);
+		iteration(&current, &mut next, size_x, size_y);
+		mem::swap(&mut current, &mut next);
 
 		counter += 1;
 	}
 
-	(counter, get_residual(&matrix[0], size_x, size_y))
+	(counter, get_residual(&current, size_x, size_y))
 }