Skip to content

Commit 62de85f

Browse files
committed
Replace canyon in benchmarks
1 parent 46eabf1 commit 62de85f

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

splashsurf_lib/benches/benches/bench_aabb.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use nalgebra::Vector3;
33
use splashsurf_lib::AxisAlignedBoundingBox3d;
44
use std::time::Duration;
55

6-
use super::io::xyz::particles_from_xyz;
6+
use super::io::vtk::particles_from_vtk;
77

88
pub fn aabb_from_points(c: &mut Criterion) {
99
let particle_positions: &Vec<Vector3<f32>> =
10-
&particles_from_xyz("../data/canyon_13353401_particles.xyz").unwrap();
10+
&particles_from_vtk("../data/hilbert_46843_particles.vtk").unwrap();
1111

1212
let mut group = c.benchmark_group("aabb");
1313
group.sample_size(200);
@@ -23,7 +23,7 @@ pub fn aabb_from_points(c: &mut Criterion) {
2323

2424
pub fn aabb_from_points_par(c: &mut Criterion) {
2525
let particle_positions: &Vec<Vector3<f32>> =
26-
&particles_from_xyz("../data/canyon_13353401_particles.xyz").unwrap();
26+
&particles_from_vtk("../data/hilbert_46843_particles.vtk").unwrap();
2727

2828
let mut group = c.benchmark_group("aabb");
2929
group.sample_size(500);

splashsurf_lib/benches/benches/bench_full.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use super::io::xyz::particles_from_xyz;
1212
#[allow(dead_code)]
1313
use super::io::vtk::write_vtk;
1414

15+
/*
1516
pub fn surface_reconstruction_canyon(c: &mut Criterion) {
1617
let particle_positions: &Vec<Vector3<f32>> =
1718
&particles_from_xyz("../data/canyon_13353401_particles.xyz").unwrap();
@@ -83,6 +84,7 @@ pub fn surface_reconstruction_canyon(c: &mut Criterion) {
8384
)
8485
.unwrap();
8586
}
87+
*/
8688

8789
pub fn surface_reconstruction_dam_break(c: &mut Criterion) {
8890
let particle_positions: &Vec<Vector3<f32>> =
@@ -338,5 +340,5 @@ criterion_group!(
338340
surface_reconstruction_double_dam_break,
339341
surface_reconstruction_double_dam_break_inplace,
340342
surface_reconstruction_dam_break,
341-
surface_reconstruction_canyon
343+
//surface_reconstruction_canyon
342344
);

splashsurf_lib/benches/benches/bench_octree.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use splashsurf_lib::octree::Octree;
44
use splashsurf_lib::{grid_for_reconstruction, SubdivisionCriterion, UniformGrid};
55
use std::time::Duration;
66

7-
use super::io::xyz::particles_from_xyz;
7+
use super::io::vtk::particles_from_vtk;
88

99
pub fn subdivide_recursively_benchmark(c: &mut Criterion) {
1010
let particle_positions: &Vec<Vector3<f32>> =
11-
&particles_from_xyz("../data/canyon_13353401_particles.xyz").unwrap();
11+
&particles_from_vtk("../data/hilbert_46843_particles.vtk").unwrap();
1212
let particles_per_cell = 20000;
1313

1414
let particle_radius = 0.011;

0 commit comments

Comments
 (0)