Skip to content

Commit

Permalink
Merge branch 'feature/function_separation' into develop
Browse files Browse the repository at this point in the history
* 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
  ...
  • Loading branch information
Zheng SHAO committed Nov 29, 2015
2 parents b558902 + f02e58a commit 008bbe2
Show file tree
Hide file tree
Showing 27 changed files with 1,911 additions and 599 deletions.
9 changes: 2 additions & 7 deletions GLP/Examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
add_executable(gspls gspls.cpp)
add_executable(gspan gspan.cpp)
add_executable(gspls_static gspls.cpp)
add_executable(gspan_static gspan.cpp)
add_executable(gspan_pls_static gspan_pls.cpp)

target_link_libraries(gspls glp)
target_link_libraries(gspan glp)
target_link_libraries(gspls_static glp_static)
target_link_libraries(gspan_static glp_static)
target_link_libraries(gspan_pls_static glp_static)

IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set_target_properties(gspls_static PROPERTIES LINK_FLAGS "-static")
set_target_properties(gspan_static PROPERTIES LINK_FLAGS "-static")
set_target_properties(gspan_pls_static PROPERTIES LINK_FLAGS "-static")
ENDIF()

install_targets(/bin gspls)
install_targets(/bin gspan)
install_targets(/bin gspls_static)
install_targets(/bin gspan_static)
install_targets(/bin gspan_pls_static)

add_subdirectory(gspls)
6 changes: 0 additions & 6 deletions GLP/Examples/gspan_pls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ void usage()
" [-a use average residual column, defult is using max variance column]\n"
" [-r use random residual column, defult is using max variance column]\n"
" [-t the threshold value which used to avoid overfiting default: 3(times)]\n"
" [-s shuffle data(preprocess)]\n"
" [-b use memory boosting]\n"
" [-v verbose]\n\n"
" Author: Zheng Shao\n"
Expand All @@ -73,7 +72,6 @@ int main(int argc, const char *argv[])
char *gspfile = NULL;
bool verbose = false;
bool boost = false;
bool useShuffledData = false;
bool useAverageCol = false;
bool useRandomCol = false;

Expand Down Expand Up @@ -114,9 +112,6 @@ int main(int argc, const char *argv[])
case 'b':
boost = true;
break;
case 's':
useShuffledData = true;
break;
case 'a':
useAverageCol = true;
break;
Expand Down Expand Up @@ -152,7 +147,6 @@ int main(int argc, const char *argv[])
BOOST_AUTO(nipals, (*SLGlpFactory<SLNipals, SLGspan>::create(nipalsParam, gspanParam)));

SLCrossValidation<SLNipals>::SLCrossValidationParameters cvParam;
cvParam.useShuffledData = useShuffledData;
cvParam.kFold = fold;
cvParam.resultHistorySize = resultHistorySize;

Expand Down
Loading

0 comments on commit 008bbe2

Please sign in to comment.