diff --git a/src/dataset/generator.rs b/src/dataset/generator.rs index 2514134..e0b2939 100644 --- a/src/dataset/generator.rs +++ b/src/dataset/generator.rs @@ -49,7 +49,7 @@ pub fn make_blobs( /// Make a large circle containing a smaller circle in 2d. pub fn make_circles(num_samples: usize, factor: f32, noise: f32) -> Dataset { - if factor >= 1.0 || factor < 0.0 { + if !(0.0..1.0).contains(&factor) { panic!("'factor' has to be between 0 and 1."); } diff --git a/src/linear/logistic_regression.rs b/src/linear/logistic_regression.rs index 796caed..022942c 100644 --- a/src/linear/logistic_regression.rs +++ b/src/linear/logistic_regression.rs @@ -328,8 +328,10 @@ impl> LogisticRegression { let df = |g: &mut M, w: &M| objective.df(g, w); - let mut ls: Backtracking = Default::default(); - ls.order = FunctionOrder::THIRD; + let ls: Backtracking = Backtracking { + order: FunctionOrder::THIRD, + ..Default::default() + }; let optimizer: LBFGS = Default::default(); optimizer.optimize(&f, &df, &x0, &ls) diff --git a/src/model_selection/mod.rs b/src/model_selection/mod.rs index d4908f6..ddcd9d4 100644 --- a/src/model_selection/mod.rs +++ b/src/model_selection/mod.rs @@ -110,7 +110,7 @@ pub struct KFold { impl Default for KFold { fn default() -> KFold { KFold { - n_splits: 3 as usize, + n_splits: 3_usize, shuffle: true, } }