Skip to content

Commit

Permalink
Moved streaming classes into a separate folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@lisitsyn
lisitsyn committed Jul 31, 2012
1 parent d866352 commit 6a311bd
Show file tree
Hide file tree
Showing 36 changed files with 84 additions and 66 deletions.
12 changes: 6 additions & 6 deletions src/interfaces/modular/Features.i
View file
Expand Up @@ -77,9 +77,9 @@
%include <shogun/features/DotFeatures.h>
%include <shogun/features/DirectorDotFeatures.h>
%include <shogun/features/BinnedDotFeatures.h>
%include <shogun/features/StreamingFeatures.h>
%include <shogun/features/StreamingDotFeatures.h>
%include <shogun/features/StreamingVwFeatures.h>
%include <shogun/features/streaming/StreamingFeatures.h>
%include <shogun/features/streaming/StreamingDotFeatures.h>
%include <shogun/features/streaming/StreamingVwFeatures.h>
%include <shogun/features/DataGenerator.h>

/* Templated Class StringFeatures */
Expand Down Expand Up @@ -125,7 +125,7 @@ namespace shogun
}

/* Templated Class StreamingStringFeatures */
%include <shogun/features/StreamingStringFeatures.h>
%include <shogun/features/streaming/StreamingStringFeatures.h>
namespace shogun
{
#ifdef USE_BOOL
Expand Down Expand Up @@ -251,7 +251,7 @@ namespace shogun
}

/* Templated Class StreamingSparseFeatures */
%include <shogun/features/StreamingSparseFeatures.h>
%include <shogun/features/streaming/StreamingSparseFeatures.h>
namespace shogun
{
#ifdef USE_BOOL
Expand Down Expand Up @@ -357,7 +357,7 @@ namespace shogun
}

/* Templated Class StreamingDenseFeatures */
%include <shogun/features/StreamingDenseFeatures.h>
%include <shogun/features/streaming/StreamingDenseFeatures.h>
namespace shogun
{
#ifdef USE_BOOL
Expand Down
10 changes: 5 additions & 5 deletions src/interfaces/modular/Features_includes.i
View file
Expand Up @@ -2,18 +2,18 @@
#include <shogun/lib/Compressor.h>
#include <shogun/features/FeatureTypes.h>
#include <shogun/features/Features.h>
#include <shogun/features/StreamingFeatures.h>
#include <shogun/features/streaming/StreamingFeatures.h>
#include <shogun/features/StringFeatures.h>
#include <shogun/features/StreamingStringFeatures.h>
#include <shogun/features/streaming/StreamingStringFeatures.h>
#include <shogun/features/StringFileFeatures.h>
#include <shogun/features/DotFeatures.h>
#include <shogun/features/DirectorDotFeatures.h>
#include <shogun/features/BinnedDotFeatures.h>
#include <shogun/features/StreamingDotFeatures.h>
#include <shogun/features/streaming/StreamingDotFeatures.h>
#include <shogun/features/SparseFeatures.h>
#include <shogun/features/StreamingSparseFeatures.h>
#include <shogun/features/streaming/StreamingSparseFeatures.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/features/StreamingDenseFeatures.h>
#include <shogun/features/streaming/StreamingDenseFeatures.h>
#include <shogun/features/DenseSubsetFeatures.h>
#include <shogun/features/DummyFeatures.h>
#include <shogun/features/AttributeFeatures.h>
Expand Down
14 changes: 7 additions & 7 deletions src/interfaces/modular/IO.i
View file
Expand Up @@ -30,11 +30,11 @@
%rename(VwParser) CVwParser;

%include <shogun/io/File.h>
%include <shogun/io/StreamingFile.h>
%include <shogun/io/StreamingFileFromFeatures.h>
%include <shogun/io/streaming/StreamingFile.h>
%include <shogun/io/streaming/StreamingFileFromFeatures.h>

/* Template Class StreamingFileFromSparseFeatures */
%include <shogun/io/StreamingFileFromSparseFeatures.h>
%include <shogun/io/streaming/StreamingFileFromSparseFeatures.h>
namespace shogun
{
#ifdef USE_BOOL
Expand Down Expand Up @@ -76,7 +76,7 @@ namespace shogun
}

/* Template Class StreamingFileFromDenseFeatures */
%include <shogun/io/StreamingFileFromDenseFeatures.h>
%include <shogun/io/streaming/StreamingFileFromDenseFeatures.h>
namespace shogun
{
#ifdef USE_BOOL
Expand Down Expand Up @@ -118,10 +118,10 @@ namespace shogun
}

%include <shogun/io/AsciiFile.h>
%include <shogun/io/StreamingAsciiFile.h>
%include <shogun/io/streaming/StreamingAsciiFile.h>
%include <shogun/classifier/vw/VwParser.h>
%include <shogun/io/StreamingVwFile.h>
%include <shogun/io/StreamingVwCacheFile.h>
%include <shogun/io/streaming/StreamingVwFile.h>
%include <shogun/io/streaming/StreamingVwCacheFile.h>
%include <shogun/io/BinaryFile.h>
%include <shogun/io/HDF5File.h>
%include <shogun/io/SerializableFile.h>
Expand Down
18 changes: 9 additions & 9 deletions src/interfaces/modular/IO_includes.i
View file
@@ -1,17 +1,17 @@
%{
#include <shogun/io/IOBuffer.h>
#include <shogun/io/ParseBuffer.h>
#include <shogun/io/InputParser.h>
#include <shogun/io/streaming/ParseBuffer.h>
#include <shogun/io/streaming/InputParser.h>
#include <shogun/io/File.h>
#include <shogun/io/StreamingFile.h>
#include <shogun/io/StreamingFileFromFeatures.h>
#include <shogun/io/StreamingFileFromSparseFeatures.h>
#include <shogun/io/StreamingFileFromDenseFeatures.h>
#include <shogun/io/streaming/StreamingFile.h>
#include <shogun/io/streaming/StreamingFileFromFeatures.h>
#include <shogun/io/streaming/StreamingFileFromSparseFeatures.h>
#include <shogun/io/streaming/StreamingFileFromDenseFeatures.h>
#include <shogun/io/AsciiFile.h>
#include <shogun/io/StreamingAsciiFile.h>
#include <shogun/io/streaming/StreamingAsciiFile.h>
#include <shogun/classifier/vw/VwParser.h>
#include <shogun/io/StreamingVwFile.h>
#include <shogun/io/StreamingVwCacheFile.h>
#include <shogun/io/streaming/StreamingVwFile.h>
#include <shogun/io/streaming/StreamingVwCacheFile.h>
#include <shogun/io/BinaryFile.h>
#include <shogun/io/HDF5File.h>
#include <shogun/io/SerializableFile.h>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/classifier/svm/OnlineLibLinear.cpp
View file
Expand Up @@ -11,7 +11,7 @@
*/

#include <shogun/classifier/svm/OnlineLibLinear.h>
#include <shogun/features/StreamingDenseFeatures.h>
#include <shogun/features/streaming/StreamingDenseFeatures.h>
#include <shogun/lib/Time.h>

using namespace shogun;
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/classifier/svm/OnlineSVMSGD.h
View file
Expand Up @@ -24,7 +24,7 @@
#include <shogun/lib/common.h>
#include <shogun/labels/Labels.h>
#include <shogun/machine/OnlineLinearMachine.h>
#include <shogun/features/StreamingDotFeatures.h>
#include <shogun/features/streaming/StreamingDotFeatures.h>
#include <shogun/loss/LossFunction.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/classifier/vw/VowpalWabbit.h
View file
Expand Up @@ -21,7 +21,7 @@
#include <shogun/classifier/vw/learners/VwNonAdaptiveLearner.h>
#include <shogun/classifier/vw/VwRegressor.h>

#include <shogun/features/StreamingVwFeatures.h>
#include <shogun/features/streaming/StreamingVwFeatures.h>
#include <shogun/machine/OnlineLinearMachine.h>

namespace shogun
Expand Down
4 changes: 2 additions & 2 deletions ...hogun/features/StreamingDenseFeatures.cpp → ...ures/streaming/StreamingDenseFeatures.cpp
View file
@@ -1,6 +1,6 @@
#include <shogun/mathematics/Math.h>
#include <shogun/features/StreamingDenseFeatures.h>
#include <shogun/io/StreamingFileFromDenseFeatures.h>
#include <shogun/features/streaming/StreamingDenseFeatures.h>
#include <shogun/io/streaming/StreamingFileFromDenseFeatures.h>

namespace shogun
{
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/features/StreamingDenseFeatures.h → ...atures/streaming/StreamingDenseFeatures.h
View file
Expand Up @@ -11,10 +11,10 @@
#define _STREAMINGDENSEFEATURES__H__

#include <shogun/lib/common.h>
#include <shogun/features/StreamingDotFeatures.h>
#include <shogun/features/streaming/StreamingDotFeatures.h>
#include <shogun/features/DenseFeatures.h>
#include <shogun/lib/DataType.h>
#include <shogun/io/InputParser.h>
#include <shogun/io/streaming/InputParser.h>

namespace shogun
{
Expand Down
11 changes: 10 additions & 1 deletion src/shogun/features/StreamingDotFeatures.cpp → ...atures/streaming/StreamingDotFeatures.cpp
View file
@@ -1,4 +1,13 @@
#include <shogun/features/StreamingDotFeatures.h>
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* Written (W) 2011 Shashwat Lal Das
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
*/
#include <shogun/features/streaming/StreamingDotFeatures.h>

using namespace shogun;

Expand Down
4 changes: 2 additions & 2 deletions src/shogun/features/StreamingDotFeatures.h → ...features/streaming/StreamingDotFeatures.h
View file
Expand Up @@ -11,9 +11,9 @@
#define _STREAMING_DOTFEATURES__H__

#include <shogun/lib/common.h>
#include <shogun/features/StreamingFeatures.h>
#include <shogun/features/streaming/StreamingFeatures.h>
#include <shogun/features/DotFeatures.h>
#include <shogun/io/StreamingFile.h>
#include <shogun/io/streaming/StreamingFile.h>

namespace shogun
{
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/features/StreamingFeatures.cpp → .../features/streaming/StreamingFeatures.cpp
View file
@@ -1,4 +1,4 @@
#include <shogun/features/StreamingFeatures.h>
#include <shogun/features/streaming/StreamingFeatures.h>

using namespace shogun;

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/features/StreamingFeatures.h → ...un/features/streaming/StreamingFeatures.h
View file
Expand Up @@ -12,7 +12,7 @@

#include <shogun/lib/common.h>
#include <shogun/features/Features.h>
#include <shogun/io/StreamingFile.h>
#include <shogun/io/streaming/StreamingFile.h>

namespace shogun
{
Expand Down
11 changes: 10 additions & 1 deletion ...ogun/features/StreamingSparseFeatures.cpp → ...res/streaming/StreamingSparseFeatures.cpp
View file
@@ -1,4 +1,13 @@
#include <shogun/features/StreamingSparseFeatures.h>
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* Written (W) 2011 Shashwat Lal Das
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
*/
#include <shogun/features/streaming/StreamingSparseFeatures.h>
namespace shogun
{

Expand Down
4 changes: 2 additions & 2 deletions ...shogun/features/StreamingSparseFeatures.h → ...tures/streaming/StreamingSparseFeatures.h
View file
Expand Up @@ -12,9 +12,9 @@

#include <shogun/lib/common.h>
#include <shogun/mathematics/Math.h>
#include <shogun/features/StreamingDotFeatures.h>
#include <shogun/features/streaming/StreamingDotFeatures.h>
#include <shogun/lib/DataType.h>
#include <shogun/io/InputParser.h>
#include <shogun/io/streaming/InputParser.h>

namespace shogun
{
Expand Down
2 changes: 1 addition & 1 deletion ...ogun/features/StreamingStringFeatures.cpp → ...res/streaming/StreamingStringFeatures.cpp
View file
@@ -1,4 +1,4 @@
#include <shogun/features/StreamingStringFeatures.h>
#include <shogun/features/streaming/StreamingStringFeatures.h>

namespace shogun
{
Expand Down
4 changes: 2 additions & 2 deletions ...shogun/features/StreamingStringFeatures.h → ...tures/streaming/StreamingStringFeatures.h
View file
Expand Up @@ -14,9 +14,9 @@
#include <shogun/mathematics/Math.h>
#include <shogun/base/Parameter.h>
#include <shogun/lib/DataType.h>
#include <shogun/io/InputParser.h>
#include <shogun/io/streaming/InputParser.h>

#include <shogun/features/StreamingFeatures.h>
#include <shogun/features/streaming/StreamingFeatures.h>
#include <shogun/features/Alphabet.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/features/StreamingVwFeatures.cpp → ...eatures/streaming/StreamingVwFeatures.cpp
View file
Expand Up @@ -13,7 +13,7 @@
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society.
*/

#include <shogun/features/StreamingVwFeatures.h>
#include <shogun/features/streaming/StreamingVwFeatures.h>

using namespace shogun;

Expand Down
8 changes: 4 additions & 4 deletions src/shogun/features/StreamingVwFeatures.h → .../features/streaming/StreamingVwFeatures.h
View file
Expand Up @@ -20,10 +20,10 @@
#include <shogun/lib/DataType.h>
#include <shogun/mathematics/Math.h>

#include <shogun/io/InputParser.h>
#include <shogun/io/StreamingVwFile.h>
#include <shogun/io/StreamingVwCacheFile.h>
#include <shogun/features/StreamingDotFeatures.h>
#include <shogun/io/streaming/InputParser.h>
#include <shogun/io/streaming/StreamingVwFile.h>
#include <shogun/io/streaming/StreamingVwCacheFile.h>
#include <shogun/features/streaming/StreamingDotFeatures.h>
#include <shogun/classifier/vw/vw_common.h>
#include <shogun/classifier/vw/vw_math.h>

Expand Down
4 changes: 2 additions & 2 deletions src/shogun/io/InputParser.h → src/shogun/io/streaming/InputParser.h
View file
Expand Up @@ -12,9 +12,9 @@
#define __INPUTPARSER_H__

#include <shogun/io/SGIO.h>
#include <shogun/io/StreamingFile.h>
#include <shogun/io/streaming/StreamingFile.h>
#include <shogun/lib/common.h>
#include <shogun/io/ParseBuffer.h>
#include <shogun/io/streaming/ParseBuffer.h>
#include <pthread.h>

#define PARSER_DEFAULT_BUFFSIZE 100
Expand Down
0 src/shogun/io/ParseBuffer.h → src/shogun/io/streaming/ParseBuffer.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingAsciiFile.cpp → ...hogun/io/streaming/StreamingAsciiFile.cpp
View file
Expand Up @@ -8,7 +8,7 @@
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
*/

#include <shogun/io/StreamingAsciiFile.h>
#include <shogun/io/streaming/StreamingAsciiFile.h>
#include <shogun/mathematics/Math.h>

#include <ctype.h>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingAsciiFile.h → src/shogun/io/streaming/StreamingAsciiFile.h
View file
Expand Up @@ -11,7 +11,7 @@
#define __STREAMING_ASCIIFILE_H__

#include <shogun/io/AsciiFile.h>
#include <shogun/io/StreamingFile.h>
#include <shogun/io/streaming/StreamingFile.h>
#include <shogun/features/SparseFeatures.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingFile.cpp → src/shogun/io/streaming/StreamingFile.cpp
View file
Expand Up @@ -8,7 +8,7 @@
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
*/

#include <shogun/io/StreamingFile.h>
#include <shogun/io/streaming/StreamingFile.h>

#include <ctype.h>

Expand Down
0 src/shogun/io/StreamingFile.h → src/shogun/io/streaming/StreamingFile.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...hogun/io/StreamingFileFromDenseFeatures.h → ...treaming/StreamingFileFromDenseFeatures.h
View file
Expand Up @@ -10,7 +10,7 @@
#ifndef __STREAMING_FILEFROMDENSE_H__
#define __STREAMING_FILEFROMDENSE_H__

#include <shogun/io/StreamingFileFromFeatures.h>
#include <shogun/io/streaming/StreamingFileFromFeatures.h>
#include <shogun/features/DenseFeatures.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingFileFromFeatures.cpp → ...o/streaming/StreamingFileFromFeatures.cpp
View file
Expand Up @@ -7,7 +7,7 @@
* Written (W) 2011 Shashwat Lal Das
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
*/
#include <shogun/io/StreamingFileFromFeatures.h>
#include <shogun/io/streaming/StreamingFileFromFeatures.h>

using namespace shogun;

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingFileFromFeatures.h → .../io/streaming/StreamingFileFromFeatures.h
View file
Expand Up @@ -10,7 +10,7 @@
#ifndef __STREAMING_FILEFROMFEATURES_H__
#define __STREAMING_FILEFROMFEATURES_H__

#include <shogun/io/StreamingFile.h>
#include <shogun/io/streaming/StreamingFile.h>
#include <shogun/features/Features.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion ...ogun/io/StreamingFileFromSparseFeatures.h → ...reaming/StreamingFileFromSparseFeatures.h
View file
Expand Up @@ -10,7 +10,7 @@
#ifndef __STREAMING_FILEFROMSPARSE_H__
#define __STREAMING_FILEFROMSPARSE_H__

#include <shogun/io/StreamingFileFromFeatures.h>
#include <shogun/io/streaming/StreamingFileFromFeatures.h>
#include <shogun/features/SparseFeatures.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion ...ogun/io/StreamingFileFromStringFeatures.h → ...reaming/StreamingFileFromStringFeatures.h
View file
Expand Up @@ -10,7 +10,7 @@
#ifndef __STREAMING_FILEFROMSTRING_H__
#define __STREAMING_FILEFROMSTRING_H__

#include <shogun/io/StreamingFileFromFeatures.h>
#include <shogun/io/streaming/StreamingFileFromFeatures.h>
#include <shogun/features/StringFeatures.h>

namespace shogun
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingVwCacheFile.cpp → ...gun/io/streaming/StreamingVwCacheFile.cpp
View file
Expand Up @@ -7,7 +7,7 @@
* Written (W) 2011 Shashwat Lal Das
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
*/
#include <shogun/io/StreamingVwCacheFile.h>
#include <shogun/io/streaming/StreamingVwCacheFile.h>

using namespace shogun;

Expand Down
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingVwCacheFile.h → ...hogun/io/streaming/StreamingVwCacheFile.h
View file
Expand Up @@ -10,7 +10,7 @@
#ifndef __STREAMING_VWCACHEFILE_H__
#define __STREAMING_VWCACHEFILE_H__

#include <shogun/io/StreamingFile.h>
#include <shogun/io/streaming/StreamingFile.h>
#include <shogun/classifier/vw/vw_common.h>
#include <shogun/classifier/vw/cache/VwCacheReader.h>
#include <shogun/classifier/vw/cache/VwNativeCacheReader.h>
Expand Down
2 changes: 1 addition & 1 deletion src/shogun/io/StreamingVwFile.cpp → src/shogun/io/streaming/StreamingVwFile.cpp
View file
Expand Up @@ -8,7 +8,7 @@
* Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society
*/

#include <shogun/io/StreamingVwFile.h>
#include <shogun/io/streaming/StreamingVwFile.h>

using namespace shogun;

Expand Down

0 comments on commit 6a311bd

Please sign in to comment.