diff --git a/CMakeLists.txt b/CMakeLists.txt index e713116..3aa58b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,12 @@ cmake_minimum_required(VERSION 3.15.2) # 设置项目名称与语言 -project(GCTL_OPTIMIZATION VERSION 1.0) +project(GCTL_OPTIMIZATION VERSION 2.0) # 添加配置配件编写的函数 include(CMakePackageConfigHelpers) +# ExprTK库在macOS 15.4中编译会有错误 添加以下命令对应检查项 +add_compile_options(-Wno-missing-template-arg-list-after-template-kw) + message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) message(STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX}) message(STATUS "Processor: " ${CMAKE_HOST_SYSTEM_PROCESSOR}) diff --git a/example/cfg_ex.cpp b/example/cfg_ex.cpp index 1a9cadd..315bfdc 100644 --- a/example/cfg_ex.cpp +++ b/example/cfg_ex.cpp @@ -26,6 +26,7 @@ ******************************************************/ #include "../lib/optimization.h" +#include "gctl/math/gaussfunc.h" using namespace gctl; diff --git a/lib/optimization/clcg.h b/lib/optimization/clcg.h index 8856ab7..f0c64f2 100644 --- a/lib/optimization/clcg.h +++ b/lib/optimization/clcg.h @@ -28,10 +28,10 @@ #ifndef _GCTL_CLCG_H #define _GCTL_CLCG_H -#include "gctl/utility.h" -#include "gctl/core.h" -#include "gctl/maths.h" -#include "gctl/algorithms.h" +#include "gctl/core/array.h" +#include "gctl/math/gmath.h" +#include "gctl/math/linear_algebra.h" +#include "gctl/io/term_io.h" #include "gctl_optimization_config.h" #ifdef GCTL_OPTIMIZATION_TOML diff --git a/lib/optimization/cmn_grad.h b/lib/optimization/cmn_grad.h index 059f146..89e57e6 100644 --- a/lib/optimization/cmn_grad.h +++ b/lib/optimization/cmn_grad.h @@ -29,6 +29,7 @@ #define _GCTL_COMMON_GRADIENT_H #include "lcg.h" +#include "gctl/io/file_io.h" namespace gctl { diff --git a/lib/optimization/lbfgs.h b/lib/optimization/lbfgs.h index 7afb183..e2b09d3 100644 --- a/lib/optimization/lbfgs.h +++ b/lib/optimization/lbfgs.h @@ -28,10 +28,9 @@ #ifndef _GCTL_LBFGS_H #define _GCTL_LBFGS_H -#include "gctl/utility.h" -#include "gctl/core.h" -#include "gctl/maths.h" -#include "gctl/algorithms.h" +#include "gctl/core/array.h" +#include "gctl/math/linear_algebra.h" +#include "gctl/io/term_io.h" #include "gctl_optimization_config.h" #ifdef GCTL_OPTIMIZATION_TOML diff --git a/lib/optimization/lcg.h b/lib/optimization/lcg.h index fe5b51e..1d01af7 100644 --- a/lib/optimization/lcg.h +++ b/lib/optimization/lcg.h @@ -39,9 +39,10 @@ #include "windows.h" #endif // _WINDOWS || __WIN32__ -#include "gctl/utility/stream_t.h" -#include "gctl/utility/stream.h" -#include "gctl/maths/linear_algebra.h" +#include "gctl/core/str.h" +#include "gctl/math/linear_algebra.h" +#include "gctl/io/term_io.h" +#include "gctl/io/file_io.h" namespace gctl { diff --git a/lib/optimization/lgd.h b/lib/optimization/lgd.h index 32af33c..ec1a088 100644 --- a/lib/optimization/lgd.h +++ b/lib/optimization/lgd.h @@ -41,10 +41,10 @@ #include "omp.h" #endif // GSTL_OPENMP -#include "gctl/core.h" -#include "gctl/io.h" -#include "gctl/maths.h" -#include "gctl/algorithms.h" +#include "gctl/core/array.h" +#include "gctl/io/term_io.h" +#include "gctl/io/file_io.h" +#include "gctl/math/linear_algebra.h" namespace gctl { diff --git a/lib/optimization/sgd.h b/lib/optimization/sgd.h index cae9e91..6401b71 100644 --- a/lib/optimization/sgd.h +++ b/lib/optimization/sgd.h @@ -28,9 +28,10 @@ #ifndef _GCTL_SGD_H #define _GCTL_SGD_H -#include "gctl/utility.h" -#include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/core/array.h" +#include "gctl/io/term_io.h" +#include "gctl/io/file_io.h" +#include "gctl/math/linear_algebra.h" #include "gctl_optimization_config.h" #ifdef GCTL_OPTIMIZATION_TOML diff --git a/lib/optimization/svd.h b/lib/optimization/svd.h index 0537cdf..da85956 100644 --- a/lib/optimization/svd.h +++ b/lib/optimization/svd.h @@ -28,8 +28,8 @@ #ifndef _GCTL_SVD_H #define _GCTL_SVD_H -#include "gctl/core.h" -#include "gctl/algorithms.h" +#include "gctl/core/array.h" +#include "gctl/math/linear_algebra.h" namespace gctl {