From f7e2e56876768a32044aac89283b29703ea98cd6 Mon Sep 17 00:00:00 2001 From: Alexey Velikiy Date: Sun, 14 Nov 2021 07:10:19 +0300 Subject: [PATCH] bugfx --- .../analytic_unit/pattern_analytic_unit.rs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/server/src/services/analytic_service/analytic_unit/pattern_analytic_unit.rs b/server/src/services/analytic_service/analytic_unit/pattern_analytic_unit.rs index 1a910e8..b5dc9f2 100644 --- a/server/src/services/analytic_service/analytic_unit/pattern_analytic_unit.rs +++ b/server/src/services/analytic_service/analytic_unit/pattern_analytic_unit.rs @@ -9,9 +9,6 @@ use gbdt::decision_tree::{Data, DataVec, PredVec}; use gbdt::gradient_boost::GBDT; - -use ndarray::Array; - use crate::services::{analytic_service::types::{self, HSR, LearningTrain}, metric_service::MetricService, segments_service::{Segment, SegmentType, SegmentsService}}; use super::types::{AnalyticUnit, AnalyticUnitConfig, LearningResult, PatternConfig}; @@ -64,8 +61,6 @@ impl fmt::Debug for LearningResults { } } - - fn nan_to_zero(n: f64) -> f64 { if n.is_nan() { return 0.; @@ -139,7 +134,8 @@ fn get_features(xs: &Vec) -> Features { } return vec![ - min, max, mean, sd, + min, max, + mean, sd, c_buffer[0].re, c_buffer[0].im, c_buffer[1].re, c_buffer[1].im, c_buffer[2].re, c_buffer[2].im, @@ -318,13 +314,14 @@ impl AnalyticUnit for PatternAnalyticUnit { let mut train_dv = Vec::new(); assert_eq!(records_raw.len(), targets_raw.len()); - for i in 0..train_dv.len() { + for i in 0..records_raw.len() { let data = Data::new_training_data( records_raw[i].iter().map(|e| *e as f32).collect(), 1.0, if targets_raw[i] { 1.0 } else { -1.0 }, Some(0.5) ); + // println!("{:?}", targets_raw[i]); train_dv.push(data); }