diff --git a/crates/kernels/vulkan-and-cpu/kernel.spv b/crates/kernels/vulkan-and-cpu/kernel.spv index 08e4b4b..8b0619a 100644 Binary files a/crates/kernels/vulkan-and-cpu/kernel.spv and b/crates/kernels/vulkan-and-cpu/kernel.spv differ diff --git a/crates/kernels/vulkan-and-cpu/src/kernel.rs b/crates/kernels/vulkan-and-cpu/src/kernel.rs index 6b0cf1c..f7a7245 100644 --- a/crates/kernels/vulkan-and-cpu/src/kernel.rs +++ b/crates/kernels/vulkan-and-cpu/src/kernel.rs @@ -136,7 +136,7 @@ impl Kernel { return; } - for index in 0..=buffers.constants.max_los_as_points { + for index in 0..buffers.constants.max_los_as_points { runner.kernel(buffers, index); } @@ -435,9 +435,9 @@ mod test { let angle = 0.0; let (surfaces, rings, lines) = invoke_default(&tvs_id, angle); - expect_tvs(&tvs_id, &surfaces, 0.2617995); + expect_tvs(&tvs_id, &surfaces, 0.17453301); expect_ring_data(&tvs_id, angle, &rings, vec![4]); - expect_tvs(&tvs_id, &lines, 5.0); + expect_tvs(&tvs_id, &lines, 4.0); } #[gtest] @@ -457,9 +457,9 @@ mod test { let angle = 90.0; let (surfaces, rings, lines) = invoke_default(&tvs_id, angle); - expect_tvs(&tvs_id, &surfaces, 0.2617995); + expect_tvs(&tvs_id, &surfaces, 0.17453301); expect_ring_data(&tvs_id, angle, &rings, vec![4]); - expect_tvs(&tvs_id, &lines, 5.0); + expect_tvs(&tvs_id, &lines, 4.0); } #[gtest] @@ -490,11 +490,11 @@ mod test { let angle = 0.0; let (surfaces, rings, lines) = invoke_default(&tvs_id, angle); - expect_tvs(&tvs_id, &surfaces, 0.2617995); + expect_tvs(&tvs_id, &surfaces, 0.17453301); // TODO: I think this result clearly shows that we should be closing the ring sector for // the _previous_ DEM ID? expect_ring_data(&tvs_id, angle, &rings, vec![4]); - expect_tvs(&tvs_id, &lines, -5.0); + expect_tvs(&tvs_id, &lines, -4.0); } #[gtest] @@ -503,9 +503,9 @@ mod test { let angle = 45.0; let (surfaces, rings, lines) = invoke_default(&tvs_id, angle); - expect_tvs(&tvs_id, &surfaces, 0.2617995); + expect_tvs(&tvs_id, &surfaces, 0.17453301); expect_ring_data(&tvs_id, angle, &rings, vec![4]); - expect_tvs(&tvs_id, &lines, -5.0); + expect_tvs(&tvs_id, &lines, -4.0); } #[gtest] @@ -525,9 +525,9 @@ mod test { let angle = 135.0; let (surfaces, rings, lines) = invoke_default(&tvs_id, angle); - expect_tvs(&tvs_id, &surfaces, 0.2617995); + expect_tvs(&tvs_id, &surfaces, 0.17453301); expect_ring_data(&tvs_id, angle, &rings, vec![4]); - expect_tvs(&tvs_id, &lines, -5.0); + expect_tvs(&tvs_id, &lines, -4.0); } #[gtest] diff --git a/crates/total-viewsheds/src/compute.rs b/crates/total-viewsheds/src/compute.rs index d5ac19a..9e5c063 100644 --- a/crates/total-viewsheds/src/compute.rs +++ b/crates/total-viewsheds/src/compute.rs @@ -595,8 +595,8 @@ pub mod test { compute.total_surfaces, [ 0.0, 0.0, 0.0, 0.0, - 0.0, 568.6271, 3996.5193, 0.0, - 0.0, 6310.845, 8529.429, 0.0, + 0.0, 568.6271, 2461.8464, 0.0, + 0.0, 4290.639, 5686.299, 0.0, 0.0, 0.0, 0.0, 0.0 ] ); @@ -619,8 +619,8 @@ pub mod test { .collect::>(), [ 0.0, 0.0, 0.0, 0.0, - 0.0, 1.0, 5.0, 0.0, - 0.0, 5.0, 5.0, 0.0, + 0.0, 1.0, 4.0, 0.0, + 0.0, 4.0, 4.0, 0.0, 0.0, 0.0, 0.0, 0.0 ] ); @@ -632,7 +632,7 @@ pub mod test { .collect::>(), [ 0, 0, 0, 0, - 0, 0, 0, 0, + 0, 0, 12, 0, 0, 180, 0, 0, 0, 0, 0, 0 ]