Skip to content

Commit f03426e

Browse files
committed
added rational 3/3, 4/4, 5/5
1 parent a628636 commit f03426e

21 files changed

Lines changed: 907 additions & 124 deletions

src/app.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ use self::optimizer::{
7575
use self::panel_state::{DiagnosticsTab, PanelState};
7676
use self::param_init::{
7777
data_based_params_for_family, is_advanced_param_init_supported, polynomial_family,
78+
rational_family,
7879
};
7980
use self::plot_utils::{fit_bounds_for_content, plot_domain};
8081
use self::points_state::{ParsedPointsCache, PointsEditorState};
@@ -99,8 +100,9 @@ use self::types::{
99100
PlotTool, SampledCurveCache, SprayBrush, UiLanguage, params_to_input_strings,
100101
};
101102
use crate::domain::{
102-
AdamConfig, CurveFamily, CurveParams, FitResult, LbfgsConfig, NelderMeadConfig, NewtonCgConfig,
103-
OptimizerConfig, OptimizerMethod, Point, Points, SgdConfig, SteepestDescentConfig,
103+
AdamConfig, CurveFamily, CurveParams, FitResult, LbfgsConfig, MAX_RATIONAL_DEGREE,
104+
MIN_RATIONAL_DEGREE, NelderMeadConfig, NewtonCgConfig, OptimizerConfig, OptimizerMethod, Point,
105+
Points, SgdConfig, SteepestDescentConfig,
104106
};
105107
#[cfg(not(target_arch = "wasm32"))]
106108
use crate::fit::FitError;

src/app/bootstrap.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ impl Default for CurveFitApp {
1717
fn default() -> Self {
1818
let selected_model = ModelChoice::Polynomial;
1919
let polynomial_degree = 1;
20+
let rational_degree = MIN_RATIONAL_DEGREE;
2021
let selected_family = polynomial_family(polynomial_degree);
2122
let default_lbfgs = LbfgsConfig::default();
2223
let default_nelder_mead = NelderMeadConfig::default();
@@ -50,6 +51,7 @@ impl Default for CurveFitApp {
5051
clipboard_copy_web_result: Rc::new(RefCell::new(None)),
5152
selected_model,
5253
polynomial_degree,
54+
rational_degree,
5355
parameter_inputs: params_to_input_strings(&selected_family.default_params()),
5456
optimizer_method: OptimizerMethod::Lbfgs,
5557
optimizer_mode: OptimizerUiMode::Basic,

0 commit comments

Comments
 (0)