From abd731a5ae0b1c701b0ac95802c96691fce45097 Mon Sep 17 00:00:00 2001 From: YiHui Liu Date: Wed, 6 Jul 2022 23:53:09 +0800 Subject: [PATCH] change: code style --- include/BindHandler.h | 12 +++++++++--- include/FileHandler.h | 4 ++-- include/GaussFit.h | 12 ++++++------ include/GaussNewton.h | Bin 3848 -> 3846 bytes include/LevenbergMarquardt.h | Bin 6336 -> 6334 bytes include/clip.h | 5 ++--- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/include/BindHandler.h b/include/BindHandler.h index 0790230..2ec132d 100644 --- a/include/BindHandler.h +++ b/include/BindHandler.h @@ -3,13 +3,19 @@ #ifndef bind_handler_h #define bind_handler_h -#include "GaussFit.h" #include "FileHandler.h" +#include "GaussFit.h" class BindHandler { public: - BindHandler(); - ~BindHandler() {}; + BindHandler(){}; + ~BindHandler(){}; + +public: + std::vector data; + +public: + void addData(FileHandler); }; #endif diff --git a/include/FileHandler.h b/include/FileHandler.h index 83a3757..e26938f 100644 --- a/include/FileHandler.h +++ b/include/FileHandler.h @@ -10,9 +10,9 @@ using std::to_string; class FileHandler { public: - FileHandler() {}; + FileHandler(){}; FileHandler(string, int n_ = 6, int thMin_ = 800, int thMax_ = 4000); - ~FileHandler() {}; + ~FileHandler(){}; public: int n = 6, m = 8; diff --git a/include/GaussFit.h b/include/GaussFit.h index da13955..ff6d017 100644 --- a/include/GaussFit.h +++ b/include/GaussFit.h @@ -27,8 +27,12 @@ double* GaussianJacobian(double x, double* p) { class GaussFit { public: - GaussFit() {}; - ~GaussFit() {}; + GaussFit(){}; + ~GaussFit(){}; + +public: + double* parma = new double[3]; + std::vector data; public: void addData(double x, double y); @@ -36,10 +40,6 @@ public: double RSquare(); int getTotal(); void draw(std::string title = "./Figure.png"); - -public: - double* parma = new double[3]; - std::vector data; }; void GaussFit::addData(double x, double y) { data.push_back(Eigen::Vector2d(x, y)); } diff --git a/include/GaussNewton.h b/include/GaussNewton.h index 694b71f1c3726d2956d94138bdc88327b58d8d92..58df989c45b5a321573bb28cff93f1289d31fac5 100644 GIT binary patch delta 34 qcmeB>Ym?jH!o*z7P`mji(`Lrae^@veCkHT1n_R?_wV8#Dg%beIzY6jI delta 55 zcmV-70LcG_9*7>WL;?sP0DAy^06PGa{sfwn2n86E&Ik^(dIEp}lOP2Ole`5+lad7> Nv-$%F0kZ-I1PR4i577Vs diff --git a/include/LevenbergMarquardt.h b/include/LevenbergMarquardt.h index a0374d3ebfc176c9fa19f969547b039201794dc6..0c8a2b14cdb7ee8df7692a050ee2bf9390ecc24e 100644 GIT binary patch delta 41 zcmV+^0M`G&F}^XdwgLlt0DZGd1JwbOUJ)Xb`UT>X!UC3)z6BbSAO)DS+y>+kU*{0& delta 51 zcmV-30L=fsF~BjfwgLzs0DAy^06PGajs=>Nm<1TK-U6@zlduH}lS~GVlOhHnvyKD= J0khf$ data) = nullptr, double (*stdF)(std::vector data) = nullptr); - ~SigmaClip() {}; + ~SigmaClip(){}; std::vector clip(std::vector data); - std::vector clipN(std::vector data); private: void computeBound(std::vector data); @@ -45,7 +44,7 @@ void SigmaClip::computeBound(std::vector data) { std::vector SigmaClip::clip(std::vector data) { std::vector::iterator itor; - + minValue = INF, maxValue = -INF; for (int k = 1; k <= maxiters; k++) { computeBound(data);