diff --git a/addnoise/addnoise.cpp b/addnoise/addnoise.cpp index 92476a0..535657a 100644 --- a/addnoise/addnoise.cpp +++ b/addnoise/addnoise.cpp @@ -55,7 +55,7 @@ int ADDNOSIE::Addnoise(std::string infilename, std::string outfilename, int orde int data_num = in_data_.size(); double tmp_dou; gctl::array noises(data_num); - noises.random_float(noise_mean_, noise_dev_); + random_float(noises, noise_mean_, noise_dev_); for (int i = 0; i < data_num; i++) { tmp_dou = in_data_.at(i).at(order) + noises.at(i); diff --git a/dsviewer/dsviewer.cpp b/dsviewer/dsviewer.cpp index b46c3c3..1be5ec4 100644 --- a/dsviewer/dsviewer.cpp +++ b/dsviewer/dsviewer.cpp @@ -389,8 +389,8 @@ void statistic(const std::vector &cmd_units) { tc.get_column(data, cmd_units[i]); std::clog << "column: " << cmd_units[i] - << " | " << data.min() << "/" << data.mean() << "/" << data.max() - << " | STD: " << data.std() << "\n"; + << " | " << min(data) << "/" << mean(data) << "/" << max(data) + << " | STD: " << gctl::std(data) << "\n"; } return; } @@ -476,7 +476,7 @@ void rand_data(const std::vector &cmd_units) double p1 = atof(cmd_units[2].c_str()); double p2 = atof(cmd_units[3].c_str()); array rd_data(tc.row_number()); - rd_data.random_float(p1, p2, rd_type); + random_float(rd_data, p1, p2, rd_type); if (cmd_units.size() >= 5) tc.fill_column(rd_data, cmd_units[4], 12); else diff --git a/dsviewer/dsviewer.h b/dsviewer/dsviewer.h index 4d178b5..4a5baec 100644 --- a/dsviewer/dsviewer.h +++ b/dsviewer/dsviewer.h @@ -29,6 +29,7 @@ #define GCTL_DSVIEWER_H #include +#include "gctl/core/array_algorithm.h" #include "gctl/io.h" using namespace gctl; diff --git a/levy_planner/levy_planner.cpp b/levy_planner/levy_planner.cpp index 566dbf0..6dc5b01 100644 --- a/levy_planner/levy_planner.cpp +++ b/levy_planner/levy_planner.cpp @@ -25,6 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ +#include "gctl/core/array_algorithm.h" #include "gctl/optimization/lgd.h" class levy_planner : public gctl::lgd_solver @@ -64,17 +65,17 @@ int main(int argc, char *argv[]) try dist[i] *= alpha; } - double mean = dist.mean(); - double std = dist.std(); + double d_mean = mean(dist); + double d_std = gctl::std(dist); double cnt = 0.0; for (size_t i = 0; i < dist.size(); i++) { - if (fabs(dist[i] - mean) > 3.0*std) cnt += 1.0; + if (fabs(dist[i] - d_mean) > 3.0*d_std) cnt += 1.0; } - std::cout << "Step Avg. = " << mean << "\n"; - std::cout << "Step STD = " << std << "\n"; + std::cout << "Step Avg. = " << d_mean << "\n"; + std::cout << "Step STD = " << d_std << "\n"; std::cout << "Large Ones = " << cnt/1000.0 << "%\n"; return 0; }