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 694b71f..58df989 100644 Binary files a/include/GaussNewton.h and b/include/GaussNewton.h differ diff --git a/include/LevenbergMarquardt.h b/include/LevenbergMarquardt.h index a0374d3..0c8a2b1 100644 Binary files a/include/LevenbergMarquardt.h and b/include/LevenbergMarquardt.h differ diff --git a/include/clip.h b/include/clip.h index 3b1d982..b2b6659 100644 --- a/include/clip.h +++ b/include/clip.h @@ -18,9 +18,8 @@ public: SigmaClip(double sigma = 3, int maxiters = 5, double (*cenF)(std::vector 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);