From fc6bc818d684fa7636329afeedc602ce7a3b0e16 Mon Sep 17 00:00:00 2001 From: Viktor Gal Date: Mon, 26 Mar 2018 17:12:33 +0200 Subject: [PATCH] fix the default arg value for factories and add f flag to ctags kinds --- src/shogun/CMakeLists.txt | 2 +- src/shogun/util/factory.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt index 68909b6b585..eb38bb67cc7 100644 --- a/src/shogun/CMakeLists.txt +++ b/src/shogun/CMakeLists.txt @@ -458,7 +458,7 @@ IF (CTAGS_FOUND) ADD_CUSTOM_COMMAND(OUTPUT ${CTAGS_FILE} COMMAND ${CTAGS_EXECUTABLE} -f ${CTAGS_FILE} # classes, enums, functions - --c++-kinds=cgp + --c++-kinds=cfgp --fields=+im --exclude=*.cpp --languages=c++ diff --git a/src/shogun/util/factory.h b/src/shogun/util/factory.h index b1a4f3339e7..f7645abd9f8 100644 --- a/src/shogun/util/factory.h +++ b/src/shogun/util/factory.h @@ -36,7 +36,7 @@ namespace shogun return features; } - CFeatures* features(CFile* file, EPrimitiveType primitive_type) + CFeatures* features(CFile* file, EPrimitiveType primitive_type = PT_FLOAT64) { REQUIRE(file, "No file provided.\n"); CFeatures* result = nullptr; @@ -78,7 +78,7 @@ namespace shogun return result; } - CFile* csv_file(std::string fname, char rw) + CFile* csv_file(std::string fname, char rw = 'r') { CFile* result = new CCSVFile(fname.c_str(), rw); SG_REF(result);