Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

arff deserialiser #4627

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open

arff deserialiser #4627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7c705c6
arff deserialiser
gf712 May 2, 2019
9425e62
added stream constructor
gf712 May 8, 2019
53f8925
clean up tokenisation
gf712 May 9, 2019
22343c6
initial datetime support
gf712 May 9, 2019
14b0d49
use std::get_time from stl
gf712 May 10, 2019
2b23d96
added date c++ library for datetime parsing
gf712 May 13, 2019
056583c
fix msvc error
gf712 May 13, 2019
cc9b8b3
more tests
gf712 May 13, 2019
06844aa
ignore missing values
gf712 May 14, 2019
f4cf772
added a couple more tests
gf712 May 14, 2019
46b9158
added feature name getter
gf712 May 14, 2019
4c3346d
minor fixes
gf712 May 14, 2019
82ae47e
much faster parsing!
gf712 May 16, 2019
8591a16
added option to choose parsing type
gf712 May 16, 2019
6b542a1
fixed parsing of strings in quotes
gf712 May 17, 2019
892d911
moved element count check to before loop
gf712 May 17, 2019
02b5f81
fix msvc bug
gf712 May 17, 2019
24d1303
typed tests for numeric values
gf712 May 22, 2019
2ee0718
added more feature getters
gf712 May 22, 2019
cbf50e0
arff serialiser
gf712 May 22, 2019
f0e934b
fix bugs
gf712 Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions cmake/external/date.cmake
View file
Open in desktop
@@ -0,0 +1,16 @@
include(ExternalProject)
set(DATE_PREFIX ${CMAKE_BINARY_DIR}/date)
set(DATE_SOURCE_DIR "${THIRD_PARTY_DIR}/date")
set(DATE_INCLUDE_DIR "${DATE_SOURCE_DIR}/include")
ExternalProject_Add(
date
PREFIX ${DATE_PREFIX}
SOURCE_DIR ${DATE_SOURCE_DIR}
GIT_REPOSITORY https://github.com/HowardHinnant/date.git
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems ok to me to have this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, this will be part of the stl in C++20, so might as well start using it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hahahaha
Ah man, finally in c++20, c++ will have nice date parsing... things are changing fast these days ;)

GIT_TAG e7e1482087f58913b80a20b04d5c58d9d6d90155
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${DATE_INCLUDE_DIR}/ ${THIRD_PARTY_INCLUDE_DIR}/
)

add_dependencies(libshogun date)
1 change: 1 addition & 0 deletions src/interfaces/swig/IO.i
View file
Open in desktop
Expand Up @@ -79,6 +79,7 @@
%shared_ptr(shogun::StreamingFileFromDenseFeatures<floatmax_t>)
#endif

%include <shogun/io/ARFFFile.h>
%include <shogun/io/File.h>
%include <shogun/io/streaming/StreamingFile.h>
%include <shogun/io/streaming/StreamingFileFromFeatures.h>
Expand Down
1 change: 1 addition & 0 deletions src/interfaces/swig/IO_includes.i
View file
Open in desktop
@@ -1,4 +1,5 @@
%{
#include <shogun/io/ARFFFile.h>
#include <shogun/io/IOBuffer.h>
#include <shogun/io/streaming/ParseBuffer.h>
#include <shogun/io/streaming/InputParser.h>
Expand Down
6 changes: 6 additions & 0 deletions src/shogun/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -522,6 +522,12 @@ SHOGUN_DEPENDENCIES(
SCOPE PRIVATE
CONFIG_FLAG HAVE_ARPREC)

# Date external lib
include(external/date)
SHOGUN_INCLUDE_DIRS(SCOPE PUBLIC
$<BUILD_INTERFACE:${DATE_INCLUDE_DIR}>
$<INSTALL_INTERFACE:include/shogun/third_party/date>)

############################ HMM
OPTION(USE_HMMDEBUG "HMM debug mode" OFF)
OPTION(USE_HMMCACHE "HMM cache" ON)
Expand Down