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

fix: SVC: some more post-review refactoring

Browse Source
This commit is contained in:
Volodymyr Orlov
2020-10-26 16:27:26 -07:00
parent aa38fc8b70
commit bf8d0c081f
1 changed files with 67 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/svm/svc.rs
+31 -33
View File
@@ -468,29 +468,26 @@ impl<'a, T: RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> Optimizer<'a,
idx_2: Option<usize>, idx_2: Option<usize>,
cache: &mut Cache<T, M, K>, cache: &mut Cache<T, M, K>,
) -> Option<(usize, usize, T)> { ) -> Option<(usize, usize, T)> {
let mut idx_1 = idx_1;
let mut idx_2 = idx_2;
let mut k_v_12: Option<T> = None; match (idx_1, idx_2) {
(None, None) => {
if idx_1.is_none() && idx_2.is_none() {
self.find_min_max_gradient();
if self.gmax > -self.gmin { if self.gmax > -self.gmin {
idx_2 = Some(self.svmax); self.select_pair(None, Some(self.svmax), cache)
} else { } else {
idx_1 = Some(self.svmin); self.select_pair(Some(self.svmin), None, cache)
} }
} },
(Some(idx_1), None) => {
if idx_2.is_none() { let sv1 = &self.sv[idx_1];
let idx_1 = &self.sv[idx_1.unwrap()]; let mut idx_2 = None;
let km = idx_1.k; let mut k_v_12 = None;
let gm = idx_1.grad; let km = sv1.k;
let gm = sv1.grad;
let mut best = T::zero(); let mut best = T::zero();
for i in 0..self.sv.len() { for i in 0..self.sv.len() {
let v = &self.sv[i]; let v = &self.sv[i];
let z = v.grad - gm; let z = v.grad - gm;
let k = cache.get(idx_1, &v); let k = cache.get(sv1, &v);
let mut curv = km + v.k - T::two() * k; let mut curv = km + v.k - T::two() * k;
if curv <= T::zero() { if curv <= T::zero() {
curv = self.tau; curv = self.tau;
@@ -505,17 +502,22 @@ impl<'a, T: RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> Optimizer<'a,
} }
} }
} }
}
if idx_1.is_none() { idx_2.map(|idx_2| {
let idx_2 = &self.sv[idx_2.unwrap()]; (idx_1, idx_2, k_v_12.unwrap_or(self.kernel.apply(&self.sv[idx_1].x, &self.sv[idx_2].x)))
let km = idx_2.k; })
let gm = idx_2.grad; },
(None, Some(idx_2)) => {
let mut idx_1 = None;
let sv2 = &self.sv[idx_2];
let mut k_v_12 = None;
let km = sv2.k;
let gm = sv2.grad;
let mut best = T::zero(); let mut best = T::zero();
for i in 0..self.sv.len() { for i in 0..self.sv.len() {
let v = &self.sv[i]; let v = &self.sv[i];
let z = gm - v.grad; let z = gm - v.grad;
let k = cache.get(idx_2, v); let k = cache.get(sv2, v);
let mut curv = km + v.k - T::two() * k; let mut curv = km + v.k - T::two() * k;
if curv <= T::zero() { if curv <= T::zero() {
curv = self.tau; curv = self.tau;
@@ -531,20 +533,16 @@ impl<'a, T: RealNumber, M: Matrix<T>, K: Kernel<T, M::RowVector>> Optimizer<'a,
} }
} }
} }
idx_1.map(|idx_1| {
(idx_1, idx_2, k_v_12.unwrap_or(self.kernel.apply(&self.sv[idx_1].x, &self.sv[idx_2].x)))
})
},
(Some(idx_1), Some(idx_2)) => {
Some((idx_1, idx_2, self.kernel.apply(&self.sv[idx_1].x, &self.sv[idx_2].x)))
}
} }
if idx_1.is_none() || idx_2.is_none() {
None
} else {
let idx_1 = idx_1.unwrap();
let idx_2 = idx_2.unwrap();
if k_v_12.is_none() {
k_v_12 = Some(self.kernel.apply(&self.sv[idx_1].x, &self.sv[idx_2].x));
}
Some((idx_1, idx_2, k_v_12.unwrap()))
}
} }
fn smo( fn smo(