diff --git a/eqpalg/algs/exp_sample2D.cc b/eqpalg/algs/exp_sample2D.cc index e45a477..16c10f5 100644 --- a/eqpalg/algs/exp_sample2D.cc +++ b/eqpalg/algs/exp_sample2D.cc @@ -388,12 +388,10 @@ std::vector ExpSample2D::exec_task(mix_cc::time_range_t time_range) { } catch (const std::exception &e) { this->sample_result_ = "polyfit ERROR!"; this->gb_logger_->log_error(rule_name_ + "exec_task:" + e.what()); - // return {}; cal_vlid = false; this->update_t_sample_mag(cal_vlid); return {}; } - // sample2d.fit_coefs = lsm_ptr_->polyfit(); sample2d.scores = lsm_ptr_->get_r2a(); sample2d.pear_coefs = lsm_ptr_->cor(); sample2d.orders = lsm_ptr_->get_order_best(); @@ -405,7 +403,6 @@ std::vector ExpSample2D::exec_task(mix_cc::time_range_t time_range) { } /* 插入样本管理表 T_SAMPLE_MAG */ this->query_time_range_ = time_range; - // insert_mag(sample_id); this->sample_result_ = this->sample_param_.dump(); } else { this->gb_logger_->log_error(rule_name_ + "数据量不足,不计算!"); diff --git a/eqpalg/feature_extraction/STA.cc b/eqpalg/feature_extraction/STA.cc index b542f3c..6d9717d 100644 --- a/eqpalg/feature_extraction/STA.cc +++ b/eqpalg/feature_extraction/STA.cc @@ -545,4 +545,4 @@ bool STA::reset_data() { this->running_stat_.min()); } -} // namespace DAA +} diff --git a/eqpalg/feature_extraction/STA.h b/eqpalg/feature_extraction/STA.h index 3a9dcc0..7a63925 100644 --- a/eqpalg/feature_extraction/STA.h +++ b/eqpalg/feature_extraction/STA.h @@ -27,7 +27,7 @@ using std::map; using std::string; using std::unordered_map; using std::vector; -const int STA_SIZE_MIN = 50; ///<统计最小分组数量 +const int STA_SIZE_MIN = 50; string double2str(double data, int precision = 2); @@ -169,27 +169,26 @@ public: private: string rule_id_; RSD running_stat_; - bool is_init_ = false; ///< T_RULE_SAMPLE_1D_INFO 是否有记录 + bool is_init_ = false; std::unique_ptr logger_; - Dist dist_1d_; ///<分布处理类 - bool is_need_ = true; ///<需要放大100倍 - double range_; ///<间距 - double init_value_; ///< a0,an = a0 + n*range_ - // unordered_map dist_data_; ///<分布数据 - map dist_data_; ///<分布数据 + Dist dist_1d_; + bool is_need_ = true; + double range_; + double init_value_; + map dist_data_; - double scale_; ///< 数据缩放大小 - static constexpr size_t k_dest_dump_size = 10000; ///< 目标解压缩后 数据量大小 + double scale_; + static constexpr size_t k_dest_dump_size = 10000; - vector sample_1d_data_; ///<频数分布数据 db2查询获得 + vector sample_1d_data_; - mix_cc::float_range_t dist_range_ci_; ///<置信区间 + mix_cc::float_range_t dist_range_ci_; bool is_task_ = false; - SampleStat sample_stat_; ///<统计样本 结果 json + SampleStat sample_stat_; - int seq_ = 0; ///<样本记录序号 + int seq_ = 0; private: /**