titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change some usage of constants

Browse Source
This commit is contained in:
Simon Gardling 2022-03-08 10:47:45 -05:00
parent 0deff05ab5
commit 21e56cac4d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/egui_app.rs
View File

@ -34,7 +34,7 @@ const INTEGRAL_X_MAX: f64 = 1000.0;
const INTEGRAL_X_RANGE: RangeInclusive<f64> = INTEGRAL_X_MIN..=INTEGRAL_X_MAX; const INTEGRAL_X_RANGE: RangeInclusive<f64> = INTEGRAL_X_MIN..=INTEGRAL_X_MAX;
// Default values // Default values
const DEFAULT_FUNCION: &str = "x^2"; pub const DEFAULT_FUNCION: &str = "x^2";
pub const DEFAULT_RIEMANN: RiemannSum = RiemannSum::Left; pub const DEFAULT_RIEMANN: RiemannSum = RiemannSum::Left;
const DEFAULT_MIN_X: f64 = -10.0; const DEFAULT_MIN_X: f64 = -10.0;
const DEFAULT_MAX_X: f64 = 10.0; const DEFAULT_MAX_X: f64 = 10.0;

5
src/function.rs
View File

@ -3,6 +3,7 @@
#[allow(unused_imports)] #[allow(unused_imports)]
use crate::misc::{debug_log, SteppedVector}; use crate::misc::{debug_log, SteppedVector};
use crate::egui_app::{DEFAULT_FUNCION, DEFAULT_RIEMANN};
use crate::parsing::BackingFunction; use crate::parsing::BackingFunction;
use eframe::egui::{ use eframe::egui::{
@ -50,7 +51,7 @@ impl FunctionEntry {
// Creates Empty Function instance // Creates Empty Function instance
pub fn empty() -> Self { pub fn empty() -> Self {
Self { Self {
function: BackingFunction::new("x^2"), function: BackingFunction::new(DEFAULT_FUNCION),
func_str: String::new(), func_str: String::new(),
min_x: -1.0, min_x: -1.0,
max_x: 1.0, max_x: 1.0,
@ -63,7 +64,7 @@ impl FunctionEntry {
integral_min_x: f64::NAN, integral_min_x: f64::NAN,
integral_max_x: f64::NAN, integral_max_x: f64::NAN,
integral_num: 0, integral_num: 0,
sum: crate::egui_app::DEFAULT_RIEMANN, sum: DEFAULT_RIEMANN,
} }
} }