diff --git a/CMakeLists.txt b/CMakeLists.txt index ab52146..ce88762 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,30 @@ macro(add_example ex_dir name lib1 lib2 lib3 lib4) endmacro() if(GCTL_FOUND) + add_example(core array_ex ON OFF OFF OFF) + add_example(core autodiff_ex ON OFF OFF OFF) + add_example(core ceemdan_ex ON OFF OFF OFF) + add_example(core cliplot_ex ON OFF OFF OFF) + add_example(core dsv_io_ex ON OFF OFF OFF) + add_example(core eemd_ex ON OFF OFF OFF) + add_example(core fft_ex ON OFF OFF OFF) + add_example(core fft_filter_ex ON OFF OFF OFF) + add_example(core fft2d_ex ON OFF OFF OFF) + add_example(core fir_filter_ex ON OFF OFF OFF) + add_example(core getoption_ex ON OFF OFF OFF) + add_example(core gmt_ex ON OFF OFF OFF) + add_example(core gnuplot_ex ON OFF OFF OFF) + add_example(core kde_ex ON OFF OFF OFF) + add_example(core legendre_ex ON OFF OFF OFF) + add_example(core multinary_ex ON OFF OFF OFF) + add_example(core ply_io_ex ON OFF OFF OFF) + add_example(core process_ex ON OFF OFF OFF) + add_example(core refellipsoid_ex ON OFF OFF OFF) + add_example(core sparray_ex ON OFF OFF OFF) + add_example(core sparray2d_ex ON OFF OFF OFF) add_example(core spmat_ex ON OFF OFF OFF) + add_example(core stl_io_ex ON OFF OFF OFF) + add_example(core windowfunc_ex ON OFF OFF OFF) endif() #if(GCTL_FOUND AND GCTL_MESH_FOUND) diff --git a/src/ai/ex1.cpp b/src/ai/ex1.cpp index 1bed7e0..7050cdd 100644 --- a/src/ai/ex1.cpp +++ b/src/ai/ex1.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/dnn.h" +#include "gctl/dnn.h" using namespace gctl; void data_generator(const matrix &train_obs, matrix &train_tar) diff --git a/src/ai/ex2.cpp b/src/ai/ex2.cpp index 91e27bd..ac06365 100644 --- a/src/ai/ex2.cpp +++ b/src/ai/ex2.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/dnn.h" +#include "gctl/dnn.h" using namespace gctl; int main(int argc, char const *argv[]) try diff --git a/src/ai/ex_mnist.cpp b/src/ai/ex_mnist.cpp index b587502..0c5e3cd 100644 --- a/src/ai/ex_mnist.cpp +++ b/src/ai/ex_mnist.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "../data/MNIST/mnist_database.h" -#include "../lib/dnn.h" +#include "gctl/dnn.h" using namespace gctl; diff --git a/src/ai/ex_mnist2.cpp b/src/ai/ex_mnist2.cpp index f5b24f9..b60867c 100644 --- a/src/ai/ex_mnist2.cpp +++ b/src/ai/ex_mnist2.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "../data/MNIST/mnist_database.h" -#include "../lib/dnn.h" +#include "gctl/dnn.h" using namespace gctl; diff --git a/src/ai/ex_mnist3.cpp b/src/ai/ex_mnist3.cpp index d7fae16..bae8b6b 100644 --- a/src/ai/ex_mnist3.cpp +++ b/src/ai/ex_mnist3.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "../data/MNIST/mnist_database.h" -#include "../lib/dnn.h" +#include "gctl/dnn.h" using namespace gctl; diff --git a/src/core/array_ex.cpp b/src/core/array_ex.cpp index 9729e6f..001f53a 100644 --- a/src/core/array_ex.cpp +++ b/src/core/array_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/io.h" +#include "gctl/core.h" +#include "gctl/io.h" using namespace gctl; diff --git a/src/core/autodiff_ex.cpp b/src/core/autodiff_ex.cpp index c55084a..9316399 100644 --- a/src/core/autodiff_ex.cpp +++ b/src/core/autodiff_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/algorithm.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/ceemdan_ex.cpp b/src/core/ceemdan_ex.cpp index 3e1da1c..0474e3f 100644 --- a/src/core/ceemdan_ex.cpp +++ b/src/core/ceemdan_ex.cpp @@ -43,9 +43,9 @@ * along with libeemd. If not, see . */ -#include "../lib/core.h" -#include "../lib/io.h" -#include "../lib/algorithm.h" +#include "gctl/core.h" +#include "gctl/io.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/cliplot_ex.cpp b/src/core/cliplot_ex.cpp index bf48515..ef66edf 100644 --- a/src/core/cliplot_ex.cpp +++ b/src/core/cliplot_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/graphic/cliplot.h" +#include "gctl/graphic/cliplot.h" int main(int argc, char *argv[]) { diff --git a/src/core/dsv_io_ex.cpp b/src/core/dsv_io_ex.cpp index dc01039..b9b3d48 100644 --- a/src/core/dsv_io_ex.cpp +++ b/src/core/dsv_io_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/io.h" +#include "gctl/io.h" using namespace gctl; @@ -35,7 +35,7 @@ int main(int argc, char const *argv[]) try dsv_io tc; tc.delimeter('|'); tc.head_number(1); - tc.load_text("tmp/world_data", ".txt", ColHead|RowHead); + tc.load_text("data/world_data", ".txt", ColHead|RowHead); tc.info(AttInfo|HeadInfo|TagInfo); tc.filter("America", "Continent_s", ColHead); diff --git a/src/core/eemd_ex.cpp b/src/core/eemd_ex.cpp index c905941..9dca71b 100644 --- a/src/core/eemd_ex.cpp +++ b/src/core/eemd_ex.cpp @@ -43,9 +43,9 @@ * along with libeemd. If not, see . */ -#include "../lib/core.h" -#include "../lib/io.h" -#include "../lib/algorithms.h" +#include "gctl/core.h" +#include "gctl/io.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/fft2d_ex.cpp b/src/core/fft2d_ex.cpp index 7ba4d3d..e945a67 100644 --- a/src/core/fft2d_ex.cpp +++ b/src/core/fft2d_ex.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/io.h" -#include "../lib/algorithm.h" +#include "gctl/core.h" +#include "gctl/io.h" +#include "gctl/math.h" using namespace gctl; @@ -64,7 +64,7 @@ void average_radian_spec(const array &in_freq, const array &in_p if (!bin.empty()) { - bin_arr.import_vector(bin); + bin_arr.input(bin); out_power[i] = bin_arr.mean(); out_std[i] = bin_arr.std(); } diff --git a/src/core/fft_ex.cpp b/src/core/fft_ex.cpp index 17c8c78..b22f7bc 100644 --- a/src/core/fft_ex.cpp +++ b/src/core/fft_ex.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/io.h" -#include "../lib/algorithm.h" +#include "gctl/core.h" +#include "gctl/io.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/fft_filter_ex.cpp b/src/core/fft_filter_ex.cpp index de892c9..c908649 100644 --- a/src/core/fft_filter_ex.cpp +++ b/src/core/fft_filter_ex.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/io.h" -#include "../lib/algorithm.h" +#include "gctl/core.h" +#include "gctl/io.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/fir_filter_ex.cpp b/src/core/fir_filter_ex.cpp index 26ce0ab..8b8cb0d 100644 --- a/src/core/fir_filter_ex.cpp +++ b/src/core/fir_filter_ex.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/io.h" -#include "../lib/algorithm.h" +#include "gctl/core.h" +#include "gctl/io.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/getoption_ex.cpp b/src/core/getoption_ex.cpp index 29bd7a8..c49991c 100644 --- a/src/core/getoption_ex.cpp +++ b/src/core/getoption_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/utility.h" -#include "../lib/geometry.h" +#include "gctl/utility.h" +#include "gctl/poly.h" using namespace gctl; diff --git a/src/core/gmt_ex.cpp b/src/core/gmt_ex.cpp index 8079e47..e6638d6 100644 --- a/src/core/gmt_ex.cpp +++ b/src/core/gmt_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/graphic/gmt.h" +#include "gctl/graphic/gmt.h" int main(int argc, char *argv[]) { diff --git a/src/core/gnuplot_ex.cpp b/src/core/gnuplot_ex.cpp index 99d77e8..a8e7340 100644 --- a/src/core/gnuplot_ex.cpp +++ b/src/core/gnuplot_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core/macro.h" -#include "../lib/graphic/gnuplot.h" +#include "gctl/core/macro.h" +#include "gctl/graphic/gnuplot.h" int main(int argc, char *argv[]) { diff --git a/src/core/kde_ex.cpp b/src/core/kde_ex.cpp index 423732b..e268cda 100644 --- a/src/core/kde_ex.cpp +++ b/src/core/kde_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/algorithm.h" +#include "gctl/core.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/legendre_ex.cpp b/src/core/legendre_ex.cpp index 54acc7a..af380d8 100644 --- a/src/core/legendre_ex.cpp +++ b/src/core/legendre_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/io.h" -#include "../lib/algebra.h" +#include "gctl/io.h" +#include "gctl/math.h" using namespace gctl; diff --git a/src/core/multinary_ex.cpp b/src/core/multinary_ex.cpp index 6398cbf..a5a9e67 100644 --- a/src/core/multinary_ex.cpp +++ b/src/core/multinary_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/geometry.h" -#include "../lib/algorithm.h" +#include "gctl/poly.h" +#include "gctl/math.h" using namespace gctl; @@ -39,8 +39,7 @@ int main(int argc, char const *argv[]) try //array xs = {-2.2, -1.8, -1.5, -1.0, -0.7, -0.2, 0.9, 1.3, 1.9, 2.5}; //ml.init(xs, std); - array x(201); - sequence(x, 0.1, 0.001); + array x(201, 0.1, 0.001); for (size_t i = 0; i < x.size(); i++) { diff --git a/src/core/ply_io_ex.cpp b/src/core/ply_io_ex.cpp index d402110..7ccb1d6 100644 --- a/src/core/ply_io_ex.cpp +++ b/src/core/ply_io_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ - #include "../lib/core.h" - #include "../lib/io.h" + #include "gctl/core.h" + #include "gctl/io.h" using namespace gctl; diff --git a/src/core/process_ex.cpp b/src/core/process_ex.cpp index 060dc2f..c2e06dc 100644 --- a/src/core/process_ex.cpp +++ b/src/core/process_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/utility.h" +#include "gctl/core.h" +#include "gctl/utility.h" using namespace gctl; diff --git a/src/core/refellipsoid_ex.cpp b/src/core/refellipsoid_ex.cpp index 0f297e4..9589591 100644 --- a/src/core/refellipsoid_ex.cpp +++ b/src/core/refellipsoid_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/geometry.h" +#include "gctl/math.h" using namespace gctl; @@ -60,7 +60,7 @@ int main(int argc, char const *argv[]) try std::cout << "Geocentric: " << ps << std::endl; // 转换为大地坐标 point3ds pd; - ellip.xyz2geodetic(ps.s2c(), pd.lon, pd.lat, pd.rad); + ellip.xyz2geodetic(s2c(ps), pd.lon, pd.lat, pd.rad); std::cout << "Geodetic: " << pd << std::endl; // 400km高 pd.rad = 400000.0; diff --git a/src/core/sparray_ex.cpp b/src/core/sparray_ex.cpp index 9ad967d..e3e1d33 100644 --- a/src/core/sparray_ex.cpp +++ b/src/core/sparray_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/algorithms.h" +#include "gctl/core.h" +#include "gctl/math.h" int main(int argc, char const *argv[]) { diff --git a/src/core/stl_io_ex.cpp b/src/core/stl_io_ex.cpp index 340869b..e54efe4 100644 --- a/src/core/stl_io_ex.cpp +++ b/src/core/stl_io_ex.cpp @@ -25,8 +25,8 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/io.h" +#include "gctl/core.h" +#include "gctl/io.h" using namespace gctl; diff --git a/src/core/windowfunc_ex.cpp b/src/core/windowfunc_ex.cpp index f1cda7c..bfed5d4 100644 --- a/src/core/windowfunc_ex.cpp +++ b/src/core/windowfunc_ex.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/core.h" -#include "../lib/algorithm.h" -#include "../lib/io.h" +#include "gctl/core.h" +#include "gctl/math.h" +#include "gctl/io.h" using namespace gctl; diff --git a/src/mesh/mesh_ex1.cpp b/src/mesh/mesh_ex1.cpp index 41759c6..4612bf2 100644 --- a/src/mesh/mesh_ex1.cpp +++ b/src/mesh/mesh_ex1.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) { diff --git a/src/mesh/mesh_ex10.cpp b/src/mesh/mesh_ex10.cpp index fdf3300..f96214a 100644 --- a/src/mesh/mesh_ex10.cpp +++ b/src/mesh/mesh_ex10.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) { diff --git a/src/mesh/mesh_ex2.cpp b/src/mesh/mesh_ex2.cpp index 3e05cb4..2dc60fe 100644 --- a/src/mesh/mesh_ex2.cpp +++ b/src/mesh/mesh_ex2.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) { diff --git a/src/mesh/mesh_ex3.cpp b/src/mesh/mesh_ex3.cpp index bac21f8..4d8923a 100644 --- a/src/mesh/mesh_ex3.cpp +++ b/src/mesh/mesh_ex3.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) try { diff --git a/src/mesh/mesh_ex4.cpp b/src/mesh/mesh_ex4.cpp index 834cc98..02a1d33 100644 --- a/src/mesh/mesh_ex4.cpp +++ b/src/mesh/mesh_ex4.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) try { diff --git a/src/mesh/mesh_ex5.cpp b/src/mesh/mesh_ex5.cpp index 4f4d8b5..119fd67 100644 --- a/src/mesh/mesh_ex5.cpp +++ b/src/mesh/mesh_ex5.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) try { diff --git a/src/mesh/mesh_ex6.cpp b/src/mesh/mesh_ex6.cpp index dac659c..532fe37 100644 --- a/src/mesh/mesh_ex6.cpp +++ b/src/mesh/mesh_ex6.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) try { diff --git a/src/mesh/mesh_ex7.cpp b/src/mesh/mesh_ex7.cpp index 2c36e9f..8dd2f33 100644 --- a/src/mesh/mesh_ex7.cpp +++ b/src/mesh/mesh_ex7.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) try { diff --git a/src/mesh/mesh_ex8.cpp b/src/mesh/mesh_ex8.cpp index 532eede..199188d 100644 --- a/src/mesh/mesh_ex8.cpp +++ b/src/mesh/mesh_ex8.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) try { diff --git a/src/mesh/mesh_ex9.cpp b/src/mesh/mesh_ex9.cpp index bba0587..c525cbd 100644 --- a/src/mesh/mesh_ex9.cpp +++ b/src/mesh/mesh_ex9.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh.h" +#include "gctl/mesh.h" int main(int argc, char *argv[]) try { diff --git a/src/mesh/meshio_ex.cpp b/src/mesh/meshio_ex.cpp index 39910c1..385a931 100644 --- a/src/mesh/meshio_ex.cpp +++ b/src/mesh/meshio_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/mesh/mesh_io.h" +#include "gctl/mesh/mesh_io.h" using namespace gctl; diff --git a/src/mesh/tri2d_meshio_ex.cpp b/src/mesh/tri2d_meshio_ex.cpp index db0ad93..e5b6a5c 100644 --- a/src/mesh/tri2d_meshio_ex.cpp +++ b/src/mesh/tri2d_meshio_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ - #include "../lib/mesh/tri2d_mesh.h" + #include "gctl/mesh/tri2d_mesh.h" using namespace gctl; diff --git a/src/optimization/cfg_ex.cpp b/src/optimization/cfg_ex.cpp index 315bfdc..6e0390e 100644 --- a/src/optimization/cfg_ex.cpp +++ b/src/optimization/cfg_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization.h" +#include "gctl/optimization.h" #include "gctl/math/gaussfunc.h" using namespace gctl; diff --git a/src/optimization/ex1.cpp b/src/optimization/ex1.cpp index b9676b8..47e765c 100644 --- a/src/optimization/ex1.cpp +++ b/src/optimization/ex1.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization/lcg.h" +#include "gctl/optimization/lcg.h" #include "gctl/graphic/gnuplot.h" #define M 1000 diff --git a/src/optimization/ex10.cpp b/src/optimization/ex10.cpp index 30dd1d8..8c6b614 100644 --- a/src/optimization/ex10.cpp +++ b/src/optimization/ex10.cpp @@ -27,9 +27,9 @@ #include #include -#include "../lib/optimization.h" +#include "gctl/optimization.h" #include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/math.h" using std::cout; using std::endl; diff --git a/src/optimization/ex2.cpp b/src/optimization/ex2.cpp index ea2695f..91e2e55 100644 --- a/src/optimization/ex2.cpp +++ b/src/optimization/ex2.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization.h" +#include "gctl/optimization.h" #define M 90 #define N 100 diff --git a/src/optimization/ex3.cpp b/src/optimization/ex3.cpp index 474eb94..e578c6c 100644 --- a/src/optimization/ex3.cpp +++ b/src/optimization/ex3.cpp @@ -1,4 +1,4 @@ -#include "../lib/optimization.h" +#include "gctl/optimization.h" class TEST_FUNC : public gctl::lbfgs_solver { diff --git a/src/optimization/ex4.cpp b/src/optimization/ex4.cpp index bd0fdee..bcde574 100644 --- a/src/optimization/ex4.cpp +++ b/src/optimization/ex4.cpp @@ -27,9 +27,9 @@ #include #include -#include "../lib/optimization.h" +#include "gctl/optimization.h" #include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/math.h" using std::cout; using std::endl; diff --git a/src/optimization/ex5.cpp b/src/optimization/ex5.cpp index b195f9c..af0d871 100644 --- a/src/optimization/ex5.cpp +++ b/src/optimization/ex5.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization.h" +#include "gctl/optimization.h" #include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/math.h" int main(int argc, char const *argv[]) { diff --git a/src/optimization/ex6.cpp b/src/optimization/ex6.cpp index 8a020b6..4f39f6d 100644 --- a/src/optimization/ex6.cpp +++ b/src/optimization/ex6.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization.h" +#include "gctl/optimization.h" #include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/math.h" // get random floating points double random_double(double l, double t) diff --git a/src/optimization/ex7.cpp b/src/optimization/ex7.cpp index c18d73b..a95569f 100644 --- a/src/optimization/ex7.cpp +++ b/src/optimization/ex7.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization.h" +#include "gctl/optimization.h" #include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/math.h" typedef gctl::array> cd_array; diff --git a/src/optimization/ex8.cpp b/src/optimization/ex8.cpp index fc7d11d..f822bb1 100644 --- a/src/optimization/ex8.cpp +++ b/src/optimization/ex8.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization.h" +#include "gctl/optimization.h" #include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/math.h" #define M 1000 #define N 900 diff --git a/src/optimization/ex9.cpp b/src/optimization/ex9.cpp index 7565e8f..4fe4c67 100644 --- a/src/optimization/ex9.cpp +++ b/src/optimization/ex9.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/optimization.h" +#include "gctl/optimization.h" using namespace gctl; diff --git a/src/potential/forward_grav_shc.cpp b/src/potential/forward_grav_shc.cpp index 6fdb4ec..93d690f 100644 --- a/src/potential/forward_grav_shc.cpp +++ b/src/potential/forward_grav_shc.cpp @@ -27,7 +27,7 @@ #include "gctl/core.h" #include "gctl/io.h" -#include "../lib/potential.h" +#include "gctl/potential.h" // 多线程异步头文件 #include #include diff --git a/src/potential/gobser_tri2d_ex.cpp b/src/potential/gobser_tri2d_ex.cpp index 94e6f38..3f10d36 100644 --- a/src/potential/gobser_tri2d_ex.cpp +++ b/src/potential/gobser_tri2d_ex.cpp @@ -27,7 +27,7 @@ #include "gctl/core.h" #include "gctl/io.h" -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/gobser_tri2d_sph_ex.cpp b/src/potential/gobser_tri2d_sph_ex.cpp index 99abe80..538c073 100644 --- a/src/potential/gobser_tri2d_sph_ex.cpp +++ b/src/potential/gobser_tri2d_sph_ex.cpp @@ -26,9 +26,9 @@ ******************************************************/ #include "toml.hpp" -#include "../lib/potential.h" +#include "gctl/potential.h" #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" #include "gctl/io.h" using namespace gctl; diff --git a/src/potential/mobser_block_ex.cpp b/src/potential/mobser_block_ex.cpp index 53d87fa..303c944 100644 --- a/src/potential/mobser_block_ex.cpp +++ b/src/potential/mobser_block_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_block_gradient_ex.cpp b/src/potential/mobser_block_gradient_ex.cpp index 78de426..e348056 100644 --- a/src/potential/mobser_block_gradient_ex.cpp +++ b/src/potential/mobser_block_gradient_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_dipole_ex.cpp b/src/potential/mobser_dipole_ex.cpp index 08994b1..36f237e 100644 --- a/src/potential/mobser_dipole_ex.cpp +++ b/src/potential/mobser_dipole_ex.cpp @@ -26,8 +26,8 @@ ******************************************************/ #include "gctl/io.h" -#include "gctl/geometry.h" -#include "../lib/potential.h" +#include "gctl/poly.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_tesseroid_ex.cpp b/src/potential/mobser_tesseroid_ex.cpp index a10878b..50cd4e7 100644 --- a/src/potential/mobser_tesseroid_ex.cpp +++ b/src/potential/mobser_tesseroid_ex.cpp @@ -27,7 +27,7 @@ #include "gctl/core.h" #include "gctl/io.h" -#include "../lib/potential.h" +#include "gctl/potential.h" #include "iostream" int main(int argc, char const *argv[]) try diff --git a/src/potential/mobser_tetra_ex.cpp b/src/potential/mobser_tetra_ex.cpp index 4aaff55..8c471b2 100644 --- a/src/potential/mobser_tetra_ex.cpp +++ b/src/potential/mobser_tetra_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/io.h" -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_tetra_ex2.cpp b/src/potential/mobser_tetra_ex2.cpp index 3e9bf7e..d4af67c 100644 --- a/src/potential/mobser_tetra_ex2.cpp +++ b/src/potential/mobser_tetra_ex2.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/io.h" -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_tetra_sph_ex.cpp b/src/potential/mobser_tetra_sph_ex.cpp index 0cdf3c8..7c99c1a 100644 --- a/src/potential/mobser_tetra_sph_ex.cpp +++ b/src/potential/mobser_tetra_sph_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/io.h" -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_tri_ex.cpp b/src/potential/mobser_tri_ex.cpp index 4437c3a..9b4be7a 100644 --- a/src/potential/mobser_tri_ex.cpp +++ b/src/potential/mobser_tri_ex.cpp @@ -26,8 +26,8 @@ ******************************************************/ #include "gctl/io.h" -#include "gctl/geometry.h" -#include "../lib/potential.h" +#include "gctl/poly.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_tri_sph_ex.cpp b/src/potential/mobser_tri_sph_ex.cpp index 8c05284..5ad0ff1 100644 --- a/src/potential/mobser_tri_sph_ex.cpp +++ b/src/potential/mobser_tri_sph_ex.cpp @@ -26,8 +26,8 @@ ******************************************************/ #include "gctl/io.h" -#include "gctl/geometry.h" -#include "../lib/potential.h" +#include "gctl/poly.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/mobser_tricone_ex.cpp b/src/potential/mobser_tricone_ex.cpp index 9639b2f..1208710 100644 --- a/src/potential/mobser_tricone_ex.cpp +++ b/src/potential/mobser_tricone_ex.cpp @@ -26,8 +26,8 @@ ******************************************************/ #include "gctl/io.h" -#include "gctl/geometry.h" -#include "../lib/potential.h" +#include "gctl/poly.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/power_spectrum_ex.cpp b/src/potential/power_spectrum_ex.cpp index 0c4cc74..d416e02 100644 --- a/src/potential/power_spectrum_ex.cpp +++ b/src/potential/power_spectrum_ex.cpp @@ -26,8 +26,8 @@ ******************************************************/ #include "gctl/io.h" -#include "gctl/geometry.h" -#include "../lib/potential.h" +#include "gctl/poly.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/read_IGRF_ex.cpp b/src/potential/read_IGRF_ex.cpp index a860ca9..fe15a2f 100644 --- a/src/potential/read_IGRF_ex.cpp +++ b/src/potential/read_IGRF_ex.cpp @@ -27,7 +27,7 @@ #include "gctl/core.h" #include "gctl/io.h" -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/potential/read_Swarm_ex.cpp b/src/potential/read_Swarm_ex.cpp index 534ed23..2e40127 100644 --- a/src/potential/read_Swarm_ex.cpp +++ b/src/potential/read_Swarm_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "iomanip" -#include "../lib/potential.h" +#include "gctl/potential.h" using namespace gctl; diff --git a/src/seismic/check_sac.cpp b/src/seismic/check_sac.cpp index 04e969e..40f9bd4 100644 --- a/src/seismic/check_sac.cpp +++ b/src/seismic/check_sac.cpp @@ -17,7 +17,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/seismic.h" +#include "gctl/seismic.h" int main(int argc, char *argv[]) { diff --git a/src/seismic/check_sig.cpp b/src/seismic/check_sig.cpp index 3033282..06d2227 100644 --- a/src/seismic/check_sig.cpp +++ b/src/seismic/check_sig.cpp @@ -17,7 +17,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/seismic.h" +#include "gctl/seismic.h" int main(int argc, char *argv[]) { diff --git a/src/seismic/check_utc_time.cpp b/src/seismic/check_utc_time.cpp index f5cf64b..e3506f2 100644 --- a/src/seismic/check_utc_time.cpp +++ b/src/seismic/check_utc_time.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/seismic.h" +#include "gctl/seismic.h" int main(int argc, char const *argv[]) try { diff --git a/src/seismic/check_xc.cpp b/src/seismic/check_xc.cpp index 7f4d330..492aad4 100644 --- a/src/seismic/check_xc.cpp +++ b/src/seismic/check_xc.cpp @@ -17,7 +17,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "../lib/seismic.h" +#include "gctl/seismic.h" int before_processing(gctl::SIG_UNIT &sig) { diff --git a/src/unsorted/array_ex.cpp b/src/unsorted/array_ex.cpp index 0557694..aede179 100644 --- a/src/unsorted/array_ex.cpp +++ b/src/unsorted/array_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "gctl/io.h" int main(int argc, char const *argv[]) diff --git a/src/unsorted/cut_2d_tri_mesh_ex.cpp b/src/unsorted/cut_2d_tri_mesh_ex.cpp index b10f571..de44686 100644 --- a/src/unsorted/cut_2d_tri_mesh_ex.cpp +++ b/src/unsorted/cut_2d_tri_mesh_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" #include "gctl/io.h" using namespace gctl; diff --git a/src/unsorted/cut_3d_tri_mesh_ex.cpp b/src/unsorted/cut_3d_tri_mesh_ex.cpp index 453f3e0..57a5348 100644 --- a/src/unsorted/cut_3d_tri_mesh_ex.cpp +++ b/src/unsorted/cut_3d_tri_mesh_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" #include "gctl/io.h" using namespace gctl; diff --git a/src/unsorted/difference_1d_ex.cpp b/src/unsorted/difference_1d_ex.cpp index 0129fd4..61b354f 100644 --- a/src/unsorted/difference_1d_ex.cpp +++ b/src/unsorted/difference_1d_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "gctl/io.h" int main(int argc, char const *argv[]) diff --git a/src/unsorted/difference_2d_ex.cpp b/src/unsorted/difference_2d_ex.cpp index f564282..dbecb0a 100644 --- a/src/unsorted/difference_2d_ex.cpp +++ b/src/unsorted/difference_2d_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "gctl/io.h" int main(int argc, char const *argv[]) diff --git a/src/unsorted/dynamic_stddev_ex.cpp b/src/unsorted/dynamic_stddev_ex.cpp index 5d913af..cc7e982 100644 --- a/src/unsorted/dynamic_stddev_ex.cpp +++ b/src/unsorted/dynamic_stddev_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" int main(int argc, char const *argv[]) { diff --git a/src/unsorted/ellipse_filter_ex.cpp b/src/unsorted/ellipse_filter_ex.cpp index ffe3178..8b49bf1 100644 --- a/src/unsorted/ellipse_filter_ex.cpp +++ b/src/unsorted/ellipse_filter_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" int main(int argc, char const *argv[]) { diff --git a/src/unsorted/entity_ex.cpp b/src/unsorted/entity_ex.cpp index 4d20a8c..383e730 100644 --- a/src/unsorted/entity_ex.cpp +++ b/src/unsorted/entity_ex.cpp @@ -25,7 +25,7 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "gctl/geometry.h" +#include "gctl/poly.h" using namespace gctl; diff --git a/src/unsorted/find_index_ex.cpp b/src/unsorted/find_index_ex.cpp index 7b8e817..51d12ff 100644 --- a/src/unsorted/find_index_ex.cpp +++ b/src/unsorted/find_index_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "iostream" int main(int argc, char const *argv[]) diff --git a/src/unsorted/frac_model_ex.cpp b/src/unsorted/frac_model_ex.cpp index a76057e..3bca22b 100644 --- a/src/unsorted/frac_model_ex.cpp +++ b/src/unsorted/frac_model_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "gctl/io.h" #include "iostream" diff --git a/src/unsorted/gaussian_hill_ex.cpp b/src/unsorted/gaussian_hill_ex.cpp index f38b91f..a82b010 100644 --- a/src/unsorted/gaussian_hill_ex.cpp +++ b/src/unsorted/gaussian_hill_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "gctl/utility.h" int main(int argc, char const *argv[]) diff --git a/src/unsorted/geometry2d_ex.cpp b/src/unsorted/geometry2d_ex.cpp index ceab4c9..e45d171 100644 --- a/src/unsorted/geometry2d_ex.cpp +++ b/src/unsorted/geometry2d_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" int main(int argc, char const *argv[]) { diff --git a/src/unsorted/heap_sort_ex.cpp b/src/unsorted/heap_sort_ex.cpp index 776299a..0fa709c 100644 --- a/src/unsorted/heap_sort_ex.cpp +++ b/src/unsorted/heap_sort_ex.cpp @@ -26,8 +26,8 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" -#include "gctl/geometry.h" +#include "gctl/math.h" +#include "gctl/poly.h" #include "gctl/utility.h" #include "iostream" diff --git a/src/unsorted/mat_inverse_ex.cpp b/src/unsorted/mat_inverse_ex.cpp index bbba0ca..6b5bd31 100644 --- a/src/unsorted/mat_inverse_ex.cpp +++ b/src/unsorted/mat_inverse_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "iostream" int main(int argc, char const *argv[]) diff --git a/src/unsorted/point2d_rotate_ex.cpp b/src/unsorted/point2d_rotate_ex.cpp index 99e3cea..d6229ad 100644 --- a/src/unsorted/point2d_rotate_ex.cpp +++ b/src/unsorted/point2d_rotate_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" #include "iostream" int main(int argc, char const *argv[]) diff --git a/src/unsorted/point_ex.cpp b/src/unsorted/point_ex.cpp index 94c3267..7e28aff 100644 --- a/src/unsorted/point_ex.cpp +++ b/src/unsorted/point_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" #include "iostream" using namespace gctl; diff --git a/src/unsorted/sparray_ex.cpp b/src/unsorted/sparray_ex.cpp index 5f1193c..7f63f83 100644 --- a/src/unsorted/sparray_ex.cpp +++ b/src/unsorted/sparray_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" int main(int argc, char const *argv[]) { diff --git a/src/unsorted/spmat_inversion_ex.cpp b/src/unsorted/spmat_inversion_ex.cpp index f14f529..125993e 100644 --- a/src/unsorted/spmat_inversion_ex.cpp +++ b/src/unsorted/spmat_inversion_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "lcg/lcg.h" #include "ctime" diff --git a/src/unsorted/svd_ex.cpp b/src/unsorted/svd_ex.cpp index 2196511..8848882 100644 --- a/src/unsorted/svd_ex.cpp +++ b/src/unsorted/svd_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/algorithm.h" +#include "gctl/math.h" #include "gctl/optimization.h" #include "iostream" #include "iomanip" diff --git a/src/unsorted/tensor_ex.cpp b/src/unsorted/tensor_ex.cpp index fbed004..095bde6 100644 --- a/src/unsorted/tensor_ex.cpp +++ b/src/unsorted/tensor_ex.cpp @@ -26,7 +26,7 @@ ******************************************************/ #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" namespace { // show elements diff --git a/src/unsorted/tetra_neighbor_ex.cpp b/src/unsorted/tetra_neighbor_ex.cpp index 3797c05..b261097 100644 --- a/src/unsorted/tetra_neighbor_ex.cpp +++ b/src/unsorted/tetra_neighbor_ex.cpp @@ -27,7 +27,7 @@ #include "gctl/core.h" #include "gctl/io.h" -#include "gctl/geometry.h" +#include "gctl/poly.h" using namespace gctl;