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

Refactor modules structure in src/svm

Browse Source
This commit is contained in:
Lorenzo (Mec-iS)
2022-11-02 15:28:50 +00:00
parent 4cff7da50d
commit deac31a2ab
3 changed files with 175 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/svm/mod.rs
+2
View File
@@ -24,6 +24,8 @@
//! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script> //! <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
pub mod svc; pub mod svc;
pub mod svr; pub mod svr;
/// search parameters
pub mod search;
use core::fmt::Debug; use core::fmt::Debug;
use std::marker::PhantomData; use std::marker::PhantomData;
src/svm/search/mod.rs
+4
View File
@@ -0,0 +1,4 @@
/// SVC search parameters
pub mod svc_params;
/// SVC search parameters
pub mod svr_params;
src/svm/search/svc_params.rs
+169 -169
View File
@@ -1,184 +1,184 @@
/// SVC grid search parameters // /// SVC grid search parameters
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] // #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone)] // #[derive(Debug, Clone)]
pub struct SVCSearchParameters< // pub struct SVCSearchParameters<
TX: Number + RealNumber, // TX: Number + RealNumber,
TY: Number + Ord, // TY: Number + Ord,
X: Array2<TX>, // X: Array2<TX>,
Y: Array1<TY>, // Y: Array1<TY>,
K: Kernel, // K: Kernel,
> { // > {
#[cfg_attr(feature = "serde", serde(default))] // #[cfg_attr(feature = "serde", serde(default))]
/// Number of epochs. // /// Number of epochs.
pub epoch: Vec<usize>, // pub epoch: Vec<usize>,
#[cfg_attr(feature = "serde", serde(default))] // #[cfg_attr(feature = "serde", serde(default))]
/// Regularization parameter. // /// Regularization parameter.
pub c: Vec<TX>, // pub c: Vec<TX>,
#[cfg_attr(feature = "serde", serde(default))] // #[cfg_attr(feature = "serde", serde(default))]
/// Tolerance for stopping epoch. // /// Tolerance for stopping epoch.
pub tol: Vec<TX>, // pub tol: Vec<TX>,
#[cfg_attr(feature = "serde", serde(default))] // #[cfg_attr(feature = "serde", serde(default))]
/// The kernel function. // /// The kernel function.
pub kernel: Vec<K>, // pub kernel: Vec<K>,
#[cfg_attr(feature = "serde", serde(default))] // #[cfg_attr(feature = "serde", serde(default))]
/// Unused parameter. // /// Unused parameter.
m: PhantomData<(X, Y, TY)>, // m: PhantomData<(X, Y, TY)>,
#[cfg_attr(feature = "serde", serde(default))] // #[cfg_attr(feature = "serde", serde(default))]
/// Controls the pseudo random number generation for shuffling the data for probability estimates // /// Controls the pseudo random number generation for shuffling the data for probability estimates
seed: Vec<Option<u64>>, // seed: Vec<Option<u64>>,
} // }
/// SVC grid search iterator // /// SVC grid search iterator
pub struct SVCSearchParametersIterator< // pub struct SVCSearchParametersIterator<
TX: Number + RealNumber, // TX: Number + RealNumber,
TY: Number + Ord, // TY: Number + Ord,
X: Array2<TX>, // X: Array2<TX>,
Y: Array1<TY>, // Y: Array1<TY>,
K: Kernel, // K: Kernel,
> { // > {
svc_search_parameters: SVCSearchParameters<TX, TY, X, Y, K>, // svc_search_parameters: SVCSearchParameters<TX, TY, X, Y, K>,
current_epoch: usize, // current_epoch: usize,
current_c: usize, // current_c: usize,
current_tol: usize, // current_tol: usize,
current_kernel: usize, // current_kernel: usize,
current_seed: usize, // current_seed: usize,
} // }
impl<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>, K: Kernel> // impl<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>, K: Kernel>
IntoIterator for SVCSearchParameters<TX, TY, X, Y, K> // IntoIterator for SVCSearchParameters<TX, TY, X, Y, K>
{ // {
type Item = SVCParameters<'a, TX, TY, X, Y>; // type Item = SVCParameters<'a, TX, TY, X, Y>;
type IntoIter = SVCSearchParametersIterator<TX, TY, X, Y, K>; // type IntoIter = SVCSearchParametersIterator<TX, TY, X, Y, K>;
fn into_iter(self) -> Self::IntoIter { // fn into_iter(self) -> Self::IntoIter {
SVCSearchParametersIterator { // SVCSearchParametersIterator {
svc_search_parameters: self, // svc_search_parameters: self,
current_epoch: 0, // current_epoch: 0,
current_c: 0, // current_c: 0,
current_tol: 0, // current_tol: 0,
current_kernel: 0, // current_kernel: 0,
current_seed: 0, // current_seed: 0,
} // }
} // }
} // }
impl<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>, K: Kernel> // impl<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>, K: Kernel>
Iterator for SVCSearchParametersIterator<TX, TY, X, Y, K> // Iterator for SVCSearchParametersIterator<TX, TY, X, Y, K>
{ // {
type Item = SVCParameters<TX, TY, X, Y>; // type Item = SVCParameters<TX, TY, X, Y>;
fn next(&mut self) -> Option<Self::Item> { // fn next(&mut self) -> Option<Self::Item> {
if self.current_epoch == self.svc_search_parameters.epoch.len() // if self.current_epoch == self.svc_search_parameters.epoch.len()
&& self.current_c == self.svc_search_parameters.c.len() // && self.current_c == self.svc_search_parameters.c.len()
&& self.current_tol == self.svc_search_parameters.tol.len() // && self.current_tol == self.svc_search_parameters.tol.len()
&& self.current_kernel == self.svc_search_parameters.kernel.len() // && self.current_kernel == self.svc_search_parameters.kernel.len()
&& self.current_seed == self.svc_search_parameters.seed.len() // && self.current_seed == self.svc_search_parameters.seed.len()
{ // {
return None; // return None;
} // }
let next = SVCParameters { // let next = SVCParameters {
epoch: self.svc_search_parameters.epoch[self.current_epoch], // epoch: self.svc_search_parameters.epoch[self.current_epoch],
c: self.svc_search_parameters.c[self.current_c], // c: self.svc_search_parameters.c[self.current_c],
tol: self.svc_search_parameters.tol[self.current_tol], // tol: self.svc_search_parameters.tol[self.current_tol],
kernel: self.svc_search_parameters.kernel[self.current_kernel].clone(), // kernel: self.svc_search_parameters.kernel[self.current_kernel].clone(),
m: PhantomData, // m: PhantomData,
seed: self.svc_search_parameters.seed[self.current_seed], // seed: self.svc_search_parameters.seed[self.current_seed],
}; // };
if self.current_epoch + 1 < self.svc_search_parameters.epoch.len() { // if self.current_epoch + 1 < self.svc_search_parameters.epoch.len() {
self.current_epoch += 1; // self.current_epoch += 1;
} else if self.current_c + 1 < self.svc_search_parameters.c.len() { // } else if self.current_c + 1 < self.svc_search_parameters.c.len() {
self.current_epoch = 0; // self.current_epoch = 0;
self.current_c += 1; // self.current_c += 1;
} else if self.current_tol + 1 < self.svc_search_parameters.tol.len() { // } else if self.current_tol + 1 < self.svc_search_parameters.tol.len() {
self.current_epoch = 0; // self.current_epoch = 0;
self.current_c = 0; // self.current_c = 0;
self.current_tol += 1; // self.current_tol += 1;
} else if self.current_kernel + 1 < self.svc_search_parameters.kernel.len() { // } else if self.current_kernel + 1 < self.svc_search_parameters.kernel.len() {
self.current_epoch = 0; // self.current_epoch = 0;
self.current_c = 0; // self.current_c = 0;
self.current_tol = 0; // self.current_tol = 0;
self.current_kernel += 1; // self.current_kernel += 1;
} else if self.current_seed + 1 < self.svc_search_parameters.seed.len() { // } else if self.current_seed + 1 < self.svc_search_parameters.seed.len() {
self.current_epoch = 0; // self.current_epoch = 0;
self.current_c = 0; // self.current_c = 0;
self.current_tol = 0; // self.current_tol = 0;
self.current_kernel = 0; // self.current_kernel = 0;
self.current_seed += 1; // self.current_seed += 1;
} else { // } else {
self.current_epoch += 1; // self.current_epoch += 1;
self.current_c += 1; // self.current_c += 1;
self.current_tol += 1; // self.current_tol += 1;
self.current_kernel += 1; // self.current_kernel += 1;
self.current_seed += 1; // self.current_seed += 1;
} // }
Some(next) // Some(next)
} // }
} // }
impl<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>, K: Kernel> Default // impl<TX: Number + RealNumber, TY: Number + Ord, X: Array2<TX>, Y: Array1<TY>, K: Kernel> Default
for SVCSearchParameters<TX, TY, X, Y, K> // for SVCSearchParameters<TX, TY, X, Y, K>
{ // {
fn default() -> Self { // fn default() -> Self {
let default_params: SVCParameters<TX, TY, X, Y> = SVCParameters::default(); // let default_params: SVCParameters<TX, TY, X, Y> = SVCParameters::default();
SVCSearchParameters { // SVCSearchParameters {
epoch: vec![default_params.epoch], // epoch: vec![default_params.epoch],
c: vec![default_params.c], // c: vec![default_params.c],
tol: vec![default_params.tol], // tol: vec![default_params.tol],
kernel: vec![default_params.kernel], // kernel: vec![default_params.kernel],
m: PhantomData, // m: PhantomData,
seed: vec![default_params.seed], // seed: vec![default_params.seed],
} // }
} // }
} // }
#[cfg(test)] // #[cfg(test)]
mod tests { // mod tests {
use num::ToPrimitive; // use num::ToPrimitive;
use super::*; // use super::*;
use crate::linalg::basic::matrix::DenseMatrix; // use crate::linalg::basic::matrix::DenseMatrix;
use crate::metrics::accuracy; // use crate::metrics::accuracy;
#[cfg(feature = "serde")] // #[cfg(feature = "serde")]
use crate::svm::*; // use crate::svm::*;
#[test] // #[test]
fn search_parameters() { // fn search_parameters() {
let parameters: SVCSearchParameters<f64, DenseMatrix<f64>, LinearKernel> = // let parameters: SVCSearchParameters<f64, DenseMatrix<f64>, LinearKernel> =
SVCSearchParameters { // SVCSearchParameters {
epoch: vec![10, 100], // epoch: vec![10, 100],
kernel: vec![LinearKernel {}], // kernel: vec![LinearKernel {}],
..Default::default() // ..Default::default()
}; // };
let mut iter = parameters.into_iter(); // let mut iter = parameters.into_iter();
let next = iter.next().unwrap(); // let next = iter.next().unwrap();
assert_eq!(next.epoch, 10); // assert_eq!(next.epoch, 10);
assert_eq!(next.kernel, LinearKernel {}); // assert_eq!(next.kernel, LinearKernel {});
let next = iter.next().unwrap(); // let next = iter.next().unwrap();
assert_eq!(next.epoch, 100); // assert_eq!(next.epoch, 100);
assert_eq!(next.kernel, LinearKernel {}); // assert_eq!(next.kernel, LinearKernel {});
assert!(iter.next().is_none()); // assert!(iter.next().is_none());
} // }
#[test] // #[test]
fn search_parameters() { // fn search_parameters() {
let parameters: SVCSearchParameters<f64, DenseMatrix<f64>, LinearKernel> = // let parameters: SVCSearchParameters<f64, DenseMatrix<f64>, LinearKernel> =
SVCSearchParameters { // SVCSearchParameters {
epoch: vec![10, 100], // epoch: vec![10, 100],
kernel: vec![LinearKernel {}], // kernel: vec![LinearKernel {}],
..Default::default() // ..Default::default()
}; // };
let mut iter = parameters.into_iter(); // let mut iter = parameters.into_iter();
let next = iter.next().unwrap(); // let next = iter.next().unwrap();
assert_eq!(next.epoch, 10); // assert_eq!(next.epoch, 10);
assert_eq!(next.kernel, LinearKernel {}); // assert_eq!(next.kernel, LinearKernel {});
let next = iter.next().unwrap(); // let next = iter.next().unwrap();
assert_eq!(next.epoch, 100); // assert_eq!(next.epoch, 100);
assert_eq!(next.kernel, LinearKernel {}); // assert_eq!(next.kernel, LinearKernel {});
assert!(iter.next().is_none()); // assert!(iter.next().is_none());
} // }
} // }