diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9ca2ceb..1766dfa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ aux_source_directory(. DIR_SRC) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -O2") include_directories(/usr/local/include) diff --git a/src/gm3d.h b/src/gm3d.h index ccdafa6..9317dd2 100644 --- a/src/gm3d.h +++ b/src/gm3d.h @@ -11,8 +11,9 @@ #include "random" // add gctl head files here -#include "gctl/gctl_core.h" -#include "gctl/gctl_utility.h" +#include "gctl/core.h" +#include "gctl/geometry.h" +#include "gctl/utility.h" using namespace std; @@ -39,7 +40,7 @@ struct modelist }; typedef vector modelistVector; //直角坐标系顶点 比坐标点位只多一个序号 -struct vertex : public gctl::point3d_c +struct vertex : public gctl::point3dc { int id = -1; }; diff --git a/src/init_obs.cpp b/src/init_obs.cpp index 573835b..0ce181c 100644 --- a/src/init_obs.cpp +++ b/src/init_obs.cpp @@ -41,14 +41,14 @@ int GM3D::InitObs(const char* obs_para){ temp_obs.val = temp_obs.dev = 0.0; obs_p_.push_back(temp_obs); } - else throw GCTL_WRONG_FILE_FORMAT; + else throw gctl::runtime_error("Invalid file format. From GM3D::InitObs(...)"); } } infile.close(); } if (obs_p_.empty()) - throw GM3D_INVALID_OBS_PARAMETER; + throw gctl::runtime_error("No valid observation entrances. From GM3D::InitObs(...)"); else{ obs_num_ = obs_p_.size(); }