Added additional doctest and fixed indices (#141)

This commit is contained in:
Chris McComb
2022-08-12 17:38:13 -04:00
committed by morenol
parent 98e3465e7b
commit eb4b49d552
6 changed files with 22 additions and 9 deletions
+1 -1
View File
@@ -59,7 +59,7 @@ impl<T: RealNumber> BBDTree<T> {
tree
}
pub(in crate) fn clustering(
pub(crate) fn clustering(
&self,
centroids: &[Vec<T>],
sums: &mut Vec<Vec<T>>,
+16 -3
View File
@@ -25,6 +25,19 @@
//! let eigenvectors: DenseMatrix<f64> = evd.V;
//! let eigenvalues: Vec<f64> = evd.d;
//! ```
//! ```
//! use smartcore::linalg::naive::dense_matrix::*;
//! use smartcore::linalg::evd::*;
//!
//! let A = DenseMatrix::from_2d_array(&[
//! &[-5.0, 2.0],
//! &[-7.0, 4.0],
//! ]);
//!
//! let evd = A.evd(false).unwrap();
//! let eigenvectors: DenseMatrix<f64> = evd.V;
//! let eigenvalues: Vec<f64> = evd.d;
//! ```
//!
//! ## References:
//! * ["Numerical Recipes: The Art of Scientific Computing", Press W.H., Teukolsky S.A., Vetterling W.T, Flannery B.P, 3rd ed., Section 11 Eigensystems](http://numerical.recipes/)
@@ -799,10 +812,10 @@ fn sort<T: RealNumber, M: BaseMatrix<T>>(d: &mut [T], e: &mut [T], V: &mut M) {
}
i -= 1;
}
d[i as usize + 1] = real;
e[i as usize + 1] = img;
d[(i + 1) as usize] = real;
e[(i + 1) as usize] = img;
for (k, temp_k) in temp.iter().enumerate().take(n) {
V.set(k, i as usize + 1, *temp_k);
V.set(k, (i + 1) as usize, *temp_k);
}
}
}
+1 -1
View File
@@ -5,7 +5,7 @@ pub type F<'a, T, X> = dyn for<'b> Fn(&'b X) -> T + 'a;
pub type DF<'a, X> = dyn for<'b> Fn(&'b mut X, &'b X) + 'a;
#[allow(clippy::upper_case_acronyms)]
#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Eq)]
pub enum FunctionOrder {
SECOND,
THIRD,
+1 -1
View File
@@ -242,7 +242,7 @@ impl<T: RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> SVR<T, M, K> {
Ok(y_hat)
}
pub(in crate) fn predict_for_row(&self, x: M::RowVector) -> T {
pub(crate) fn predict_for_row(&self, x: M::RowVector) -> T {
let mut f = self.b;
for i in 0..self.instances.len() {
+2 -2
View File
@@ -285,7 +285,7 @@ impl<'a, T: RealNumber, M: Matrix<T>> NodeVisitor<'a, T, M> {
}
}
pub(in crate) fn which_max(x: &[usize]) -> usize {
pub(crate) fn which_max(x: &[usize]) -> usize {
let mut m = x[0];
let mut which = 0;
@@ -421,7 +421,7 @@ impl<T: RealNumber> DecisionTreeClassifier<T> {
Ok(result.to_row_vector())
}
pub(in crate) fn predict_for_row<M: Matrix<T>>(&self, x: &M, row: usize) -> usize {
pub(crate) fn predict_for_row<M: Matrix<T>>(&self, x: &M, row: usize) -> usize {
let mut result = 0;
let mut queue: LinkedList<usize> = LinkedList::new();
+1 -1
View File
@@ -321,7 +321,7 @@ impl<T: RealNumber> DecisionTreeRegressor<T> {
Ok(result.to_row_vector())
}
pub(in crate) fn predict_for_row<M: Matrix<T>>(&self, x: &M, row: usize) -> T {
pub(crate) fn predict_for_row<M: Matrix<T>>(&self, x: &M, row: usize) -> T {
let mut result = T::zero();
let mut queue: LinkedList<usize> = LinkedList::new();