work/smartcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port ensemble. Add Display to naive_bayes (#208)

Browse Source
This commit is contained in:
Lorenzo
2022-10-31 17:35:33 +00:00
committed by morenol
parent d91f4f7ce4
commit a16927aa16
10 changed files with 330 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/naive_bayes/multinomial.rs
+30 -17
View File
@@ -33,6 +33,8 @@
//! ## References:
//!
//! * ["Introduction to Information Retrieval", Manning C. D., Raghavan P., Schutze H., 2009, Chapter 13 ](https://nlp.stanford.edu/IR-book/information-retrieval-book.html)
use std::fmt;
use num_traits::Unsigned;
use crate::api::{Predictor, SupervisedEstimator};
@@ -62,6 +64,18 @@ struct MultinomialNBDistribution<T: Number> {
n_features: usize,
}
impl<T: Number + Ord + Unsigned> fmt::Display for MultinomialNBDistribution<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
writeln!(
f,
"MultinomialNBDistribution: n_features: {:?}",
self.n_features
)?;
writeln!(f, "class_labels: {:?}", self.class_labels)?;
Ok(())
}
}
impl<X: Number + Unsigned, Y: Number + Ord + Unsigned> NBDistribution<X, Y>
for MultinomialNBDistribution<Y>
{
@@ -510,23 +524,22 @@ mod tests {
assert_eq!(y_hat, vec!(2, 2, 0, 0, 0, 2, 2, 1, 0, 1, 0, 2, 0, 0, 2));
}
// TODO: implement serialization
// #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
// #[test]
// #[cfg(feature = "serde")]
// fn serde() {
// let x = DenseMatrix::from_2d_array(&[
// &[1, 1, 0, 0, 0, 0],
// &[0, 1, 0, 0, 1, 0],
// &[0, 1, 0, 1, 0, 0],
// &[0, 1, 1, 0, 0, 1],
// ]);
// let y = vec![0, 0, 0, 1];
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)]
#[test]
#[cfg(feature = "serde")]
fn serde() {
let x = DenseMatrix::from_2d_array(&[
&[1, 1, 0, 0, 0, 0],
&[0, 1, 0, 0, 1, 0],
&[0, 1, 0, 1, 0, 0],
&[0, 1, 1, 0, 0, 1],
]);
let y = vec![0, 0, 0, 1];
// let mnb = MultinomialNB::fit(&x, &y, Default::default()).unwrap();
// let deserialized_mnb: MultinomialNB<u32, u32, DenseMatrix<u32>, Vec<u32>> =
// serde_json::from_str(&serde_json::to_string(&mnb).unwrap()).unwrap();
let mnb = MultinomialNB::fit(&x, &y, Default::default()).unwrap();
let deserialized_mnb: MultinomialNB<u32, u32, DenseMatrix<u32>, Vec<u32>> =
serde_json::from_str(&serde_json::to_string(&mnb).unwrap()).unwrap();
// assert_eq!(mnb, deserialized_mnb);
// }
assert_eq!(mnb, deserialized_mnb);
}
}