Fix clippy::comparison_chain

src/lib.rs

@@ -69,7 +69,6 @@
     clippy::ptr_arg,
     clippy::len_without_is_empty,
     clippy::map_entry,
-    clippy::comparison_chain,
     clippy::type_complexity,
     clippy::too_many_arguments,
     clippy::many_single_char_names

src/linalg/lu.rs

@@ -33,6 +33,7 @@
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 #![allow(non_snake_case)]
 
+use std::cmp::Ordering;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 
@@ -78,12 +79,10 @@ impl<T: RealNumber, M: BaseMatrix<T>> LU<T, M> {
 
         for i in 0..n_rows {
             for j in 0..n_cols {
-                if i > j {
+                match i.cmp(&j) {
-                    L.set(i, j, self.LU.get(i, j));
+                    Ordering::Greater => L.set(i, j, self.LU.get(i, j)),
-                } else if i == j {
+                    Ordering::Equal => L.set(i, j, T::one()),
-                    L.set(i, j, T::one());
+                    Ordering::Less => L.set(i, j, T::zero()),
-                } else {
-                    L.set(i, j, T::zero());
                 }
             }
         }

src/linear/logistic_regression.rs

@@ -52,6 +52,7 @@
 //!
 //! <script src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
 //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
+use std::cmp::Ordering;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 
@@ -231,29 +232,12 @@ impl<T: RealNumber, M: Matrix<T>> LogisticRegression<T, M> {
             yi[i] = classes.iter().position(|c| yc == *c).unwrap();
         }
 
-        if k < 2 {
+        match k.cmp(&2) {
-            Err(Failed::fit(&format!(
+            Ordering::Less => Err(Failed::fit(&format!(
                 "incorrect number of classes: {}. Should be >= 2.",
                 k
-            )))
+            ))),
-        } else if k == 2 {
+            Ordering::Greater => {
-            let x0 = M::zeros(1, num_attributes + 1);
-
-            let objective = BinaryObjectiveFunction {
-                x,
-                y: yi,
-                phantom: PhantomData,
-            };
-
-            let result = LogisticRegression::minimize(x0, objective);
-
-            Ok(LogisticRegression {
-                weights: result.x,
-                classes,
-                num_attributes,
-                num_classes: k,
-            })
-        } else {
                 let x0 = M::zeros(1, (num_attributes + 1) * k);
 
                 let objective = MultiClassObjectiveFunction {
@@ -274,6 +258,25 @@ impl<T: RealNumber, M: Matrix<T>> LogisticRegression<T, M> {
                     num_classes: k,
                 })
             }
+            Ordering::Equal => {
+                let x0 = M::zeros(1, num_attributes + 1);
+
+                let objective = BinaryObjectiveFunction {
+                    x,
+                    y: yi,
+                    phantom: PhantomData,
+                };
+
+                let result = LogisticRegression::minimize(x0, objective);
+
+                Ok(LogisticRegression {
+                    weights: result.x,
+                    classes,
+                    num_attributes,
+                    num_classes: k,
+                })
+            }
+        }
     }
 
     /// Predict class labels for samples in `x`.