Skip to content

Commit 008bbe2

Browse files
author
Zheng SHAO
committed
Merge branch 'feature/function_separation' into develop
* feature/function_separation: (21 commits) validation data length option update classify almost done train almost done overfit detection debug test change darts version use data for dfs comparsion memory boost bug fix validation test a train without validation done a morning commit datasource != train daliy daliy stash stash daily ...
2 parents b558902 + f02e58a commit 008bbe2

27 files changed

+1911
-599
lines changed

GLP/Examples/CMakeLists.txt

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
1-
add_executable(gspls gspls.cpp)
21
add_executable(gspan gspan.cpp)
3-
add_executable(gspls_static gspls.cpp)
42
add_executable(gspan_static gspan.cpp)
53
add_executable(gspan_pls_static gspan_pls.cpp)
64

7-
target_link_libraries(gspls glp)
85
target_link_libraries(gspan glp)
9-
target_link_libraries(gspls_static glp_static)
106
target_link_libraries(gspan_static glp_static)
117
target_link_libraries(gspan_pls_static glp_static)
128

139
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
14-
set_target_properties(gspls_static PROPERTIES LINK_FLAGS "-static")
1510
set_target_properties(gspan_static PROPERTIES LINK_FLAGS "-static")
1611
set_target_properties(gspan_pls_static PROPERTIES LINK_FLAGS "-static")
1712
ENDIF()
1813

19-
install_targets(/bin gspls)
2014
install_targets(/bin gspan)
21-
install_targets(/bin gspls_static)
2215
install_targets(/bin gspan_static)
2316
install_targets(/bin gspan_pls_static)
17+
18+
add_subdirectory(gspls)

GLP/Examples/gspan_pls.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ void usage()
5252
" [-a use average residual column, defult is using max variance column]\n"
5353
" [-r use random residual column, defult is using max variance column]\n"
5454
" [-t the threshold value which used to avoid overfiting default: 3(times)]\n"
55-
" [-s shuffle data(preprocess)]\n"
5655
" [-b use memory boosting]\n"
5756
" [-v verbose]\n\n"
5857
" Author: Zheng Shao\n"
@@ -73,7 +72,6 @@ int main(int argc, const char *argv[])
7372
char *gspfile = NULL;
7473
bool verbose = false;
7574
bool boost = false;
76-
bool useShuffledData = false;
7775
bool useAverageCol = false;
7876
bool useRandomCol = false;
7977

@@ -114,9 +112,6 @@ int main(int argc, const char *argv[])
114112
case 'b':
115113
boost = true;
116114
break;
117-
case 's':
118-
useShuffledData = true;
119-
break;
120115
case 'a':
121116
useAverageCol = true;
122117
break;
@@ -152,7 +147,6 @@ int main(int argc, const char *argv[])
152147
BOOST_AUTO(nipals, (*SLGlpFactory<SLNipals, SLGspan>::create(nipalsParam, gspanParam)));
153148

154149
SLCrossValidation<SLNipals>::SLCrossValidationParameters cvParam;
155-
cvParam.useShuffledData = useShuffledData;
156150
cvParam.kFold = fold;
157151
cvParam.resultHistorySize = resultHistorySize;
158152

0 commit comments

Comments
 (0)