Numerische-Methoden/MonteCarlo-Rust
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

called f by value

Browse Source
This commit is contained in:
Timo Schneider
2024-06-02 14:36:30 +02:00
parent f9e9fb7e10
commit 91fad47f31
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/function.rs
View File

@@ -6,11 +6,11 @@ use crate::point::Point;
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub struct Function{ pub struct Function{
f: fn(&f64)->f64, f: fn(f64)->f64,
} }
impl Function { impl Function {
pub fn new(f: fn(&f64) -> f64) -> Function { pub fn new(f: fn(f64) -> f64) -> Function {
return Function {f}; return Function {f};
} }
@@ -19,7 +19,7 @@ impl Function {
} }
fn includes(&self, point: &Point) -> bool { fn includes(&self, point: &Point) -> bool {
let y_0: f64 = (self.f)(&point.get_x()); let y_0: f64 = (self.f)(point.get_x());
return y_0.abs() > point.get_y().abs() && y_0 * point.get_y() >= 0_f64; return y_0.abs() > point.get_y().abs() && y_0 * point.get_y() >= 0_f64;
} }

11
src/main.rs
View File

@@ -14,21 +14,22 @@ mod bounds;
mod function; mod function;
mod plot; mod plot;
const THREAD_CNT: usize = 8; const THREAD_CNT: usize = 20;
const SAMPLE_LIMIT: usize = 100_000_000; const SAMPLE_LIMIT: usize = 100_000_000;
const SUB_SAMPLES: [usize; 3] = [1, 2, 5]; const SUB_SAMPLES: [usize; 3] = [1, 2, 5];
const SAMPLES_PER_ITERATION: usize = 250; const SAMPLES_PER_ITERATION: usize = 250;
fn f(x: &f64) -> f64 { fn f(x: f64) -> f64 {
E.powf(*x) * (1.0 / (*x).sin()).cos() + (*x).powf(2.0) E.powf(x) * (1.0 / x.sin()).cos() + x.powf(2.0)
//E.powf(-x) * x.tan() * (2.0 / (2.0 * x).sin()).cos() + 1.0
} }
fn main() { fn main() {
let bounds: Bounds = Bounds::new(LinearBounds::new(3.1_f64, 3.2_f64), LinearBounds::new(-15_f64, 35_f64)); let bounds: Bounds = Bounds::new(LinearBounds::new(-1_f64, 1_f64), LinearBounds::new(0_f64, 10_f64));
let func: Function = Function::new(f); let func: Function = Function::new(f);
let start: Instant = Instant::now(); let start: Instant = Instant::now();
println!("{}\n{}ms", func.approximate(&bounds, 10_000_000, THREAD_CNT), start.elapsed().as_millis()) println!("{}\n{}ms", func.approximate(&bounds, 1_000_000_000, THREAD_CNT), start.elapsed().as_millis())
//simulate(&bounds, &func) //simulate(&bounds, &func)
} }