From 3bb09d5aee7ac6f12f0b393e70f8bdf3d9ee9b66 Mon Sep 17 00:00:00 2001 From: Heiko Strathmann Date: Fri, 22 Jul 2011 10:54:05 +0200 Subject: [PATCH] made get_num_vectors() a const method --- src/shogun/features/CombinedDotFeatures.h | 2 +- src/shogun/features/CombinedFeatures.h | 2 +- src/shogun/features/DummyFeatures.h | 2 +- src/shogun/features/ExplicitSpecFeatures.h | 2 +- src/shogun/features/Features.h | 2 +- src/shogun/features/HashedWDFeatures.h | 2 +- src/shogun/features/HashedWDFeaturesTransposed.h | 2 +- src/shogun/features/ImplicitWeightedSpecFeatures.h | 2 +- src/shogun/features/LBPPyrDotFeatures.h | 2 +- src/shogun/features/PolyFeatures.h | 2 +- src/shogun/features/SNPFeatures.h | 2 +- src/shogun/features/SimpleFeatures.h | 3 ++- src/shogun/features/SparseFeatures.h | 2 +- src/shogun/features/SparsePolyFeatures.h | 2 +- src/shogun/features/StreamingSimpleFeatures.h | 2 +- src/shogun/features/StreamingSparseFeatures.h | 2 +- src/shogun/features/StreamingStringFeatures.h | 2 +- src/shogun/features/StringFeatures.h | 2 +- src/shogun/features/WDFeatures.h | 2 +- 19 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/shogun/features/CombinedDotFeatures.h b/src/shogun/features/CombinedDotFeatures.h index f5edd2fe777..4800369a8bd 100644 --- a/src/shogun/features/CombinedDotFeatures.h +++ b/src/shogun/features/CombinedDotFeatures.h @@ -60,7 +60,7 @@ class CCombinedDotFeatures : public CDotFeatures * * @return number of vectors */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_vectors; } diff --git a/src/shogun/features/CombinedFeatures.h b/src/shogun/features/CombinedFeatures.h index b3d4ca2138d..110a8910355 100644 --- a/src/shogun/features/CombinedFeatures.h +++ b/src/shogun/features/CombinedFeatures.h @@ -69,7 +69,7 @@ class CCombinedFeatures : public CFeatures * * @return number of feature vectors */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_vec; } diff --git a/src/shogun/features/DummyFeatures.h b/src/shogun/features/DummyFeatures.h index b5b6d8ea92f..7fa89792595 100644 --- a/src/shogun/features/DummyFeatures.h +++ b/src/shogun/features/DummyFeatures.h @@ -58,7 +58,7 @@ class CDummyFeatures : public CFeatures } /** get number of feature vectors */ - virtual int32_t get_num_vectors() + virtual int32_t get_num_vectors() const { return num_vectors; } diff --git a/src/shogun/features/ExplicitSpecFeatures.h b/src/shogun/features/ExplicitSpecFeatures.h index e3d17b3eaa4..3c6898a275c 100644 --- a/src/shogun/features/ExplicitSpecFeatures.h +++ b/src/shogun/features/ExplicitSpecFeatures.h @@ -179,7 +179,7 @@ class CExplicitSpecFeatures : public CDotFeatures * * @return number of strings */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_strings; } diff --git a/src/shogun/features/Features.h b/src/shogun/features/Features.h index 46314ae9e1e..6b5cb32a44b 100644 --- a/src/shogun/features/Features.h +++ b/src/shogun/features/Features.h @@ -161,7 +161,7 @@ class CFeatures : public CSGObject * * @return number of examples/vectors (possibly of subset, if implemented) */ - virtual int32_t get_num_vectors()=0; + virtual int32_t get_num_vectors() const=0; /** in case there is a feature matrix allow for reshaping * diff --git a/src/shogun/features/HashedWDFeatures.h b/src/shogun/features/HashedWDFeatures.h index 8b87701b9f5..6a6aa2af7b1 100644 --- a/src/shogun/features/HashedWDFeatures.h +++ b/src/shogun/features/HashedWDFeatures.h @@ -183,7 +183,7 @@ class CHashedWDFeatures : public CDotFeatures return C_WD; } - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_strings; } diff --git a/src/shogun/features/HashedWDFeaturesTransposed.h b/src/shogun/features/HashedWDFeaturesTransposed.h index 9ddb3cea2ba..a5efe68d0a7 100644 --- a/src/shogun/features/HashedWDFeaturesTransposed.h +++ b/src/shogun/features/HashedWDFeaturesTransposed.h @@ -148,7 +148,7 @@ class CHashedWDFeaturesTransposed : public CDotFeatures return C_WD; } - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_strings; } diff --git a/src/shogun/features/ImplicitWeightedSpecFeatures.h b/src/shogun/features/ImplicitWeightedSpecFeatures.h index 6a6ff52546d..36f32bc0604 100644 --- a/src/shogun/features/ImplicitWeightedSpecFeatures.h +++ b/src/shogun/features/ImplicitWeightedSpecFeatures.h @@ -129,7 +129,7 @@ class CImplicitWeightedSpecFeatures : public CDotFeatures * * @return number of strings */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_strings; } diff --git a/src/shogun/features/LBPPyrDotFeatures.h b/src/shogun/features/LBPPyrDotFeatures.h index 84017029b25..1632d1f7fed 100644 --- a/src/shogun/features/LBPPyrDotFeatures.h +++ b/src/shogun/features/LBPPyrDotFeatures.h @@ -87,7 +87,7 @@ class CLBPPyrDotFeatures : public CDotFeatures * * @return number of vectors */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { if (m_feat) return m_feat->get_num_vectors(); diff --git a/src/shogun/features/PolyFeatures.h b/src/shogun/features/PolyFeatures.h index 8f5a1f72564..2dae7214226 100644 --- a/src/shogun/features/PolyFeatures.h +++ b/src/shogun/features/PolyFeatures.h @@ -89,7 +89,7 @@ class CPolyFeatures : public CDotFeatures * * @return number of vectors */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { if (m_feat) return m_feat->get_num_vectors(); diff --git a/src/shogun/features/SNPFeatures.h b/src/shogun/features/SNPFeatures.h index 1b31f3f9c3d..0255c9e35a8 100644 --- a/src/shogun/features/SNPFeatures.h +++ b/src/shogun/features/SNPFeatures.h @@ -149,7 +149,7 @@ class CSNPFeatures : public CDotFeatures * * @return number of vectors */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_strings; } diff --git a/src/shogun/features/SimpleFeatures.h b/src/shogun/features/SimpleFeatures.h index 3ca8a3dc83d..6142d928392 100644 --- a/src/shogun/features/SimpleFeatures.h +++ b/src/shogun/features/SimpleFeatures.h @@ -636,7 +636,8 @@ template class CSimpleFeatures: public CDotFeatures { * * @return number of feature vectors */ - virtual inline int32_t get_num_vectors() { + virtual inline int32_t get_num_vectors() const + { return m_subset ? m_subset->get_size() : num_vectors; } diff --git a/src/shogun/features/SparseFeatures.h b/src/shogun/features/SparseFeatures.h index f5313f0a91d..8526aeee843 100644 --- a/src/shogun/features/SparseFeatures.h +++ b/src/shogun/features/SparseFeatures.h @@ -885,7 +885,7 @@ template class CSparseFeatures : public CDotFeatures * * @return number of feature vectors */ - virtual inline int32_t get_num_vectors() + virtual inline int32_t get_num_vectors() const { return m_subset ? m_subset->get_size() : num_vectors; } diff --git a/src/shogun/features/SparsePolyFeatures.h b/src/shogun/features/SparsePolyFeatures.h index 77237595f6c..0ac2d804ac6 100644 --- a/src/shogun/features/SparsePolyFeatures.h +++ b/src/shogun/features/SparsePolyFeatures.h @@ -94,7 +94,7 @@ class CSparsePolyFeatures : public CDotFeatures * * @return number of vectors */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { if (m_feat) return m_feat->get_num_vectors(); diff --git a/src/shogun/features/StreamingSimpleFeatures.h b/src/shogun/features/StreamingSimpleFeatures.h index 82e21fb040e..2d8ef040a7b 100644 --- a/src/shogun/features/StreamingSimpleFeatures.h +++ b/src/shogun/features/StreamingSimpleFeatures.h @@ -303,7 +303,7 @@ template class CStreamingSimpleFeatures : public CStreamingDotFeatures * * @return 1 if current_vector exists, else 0. */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { if (current_vector) return 1; diff --git a/src/shogun/features/StreamingSparseFeatures.h b/src/shogun/features/StreamingSparseFeatures.h index d9fa38a35a4..533d7a79ffe 100644 --- a/src/shogun/features/StreamingSparseFeatures.h +++ b/src/shogun/features/StreamingSparseFeatures.h @@ -456,7 +456,7 @@ template class CStreamingSparseFeatures : public CStreamingDotFeatures * * @return 1 if current_vector exists, else 0. */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { if (current_vector) return 1; diff --git a/src/shogun/features/StreamingStringFeatures.h b/src/shogun/features/StreamingStringFeatures.h index bd3e7dac0dd..16b3306fc65 100644 --- a/src/shogun/features/StreamingStringFeatures.h +++ b/src/shogun/features/StreamingStringFeatures.h @@ -260,7 +260,7 @@ template class CStreamingStringFeatures : public CStreamingFeatures * * @return 1 if current_vector exists, else 0. */ - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { if (current_string) return 1; diff --git a/src/shogun/features/StringFeatures.h b/src/shogun/features/StringFeatures.h index e05000698bf..1b1366b69c1 100644 --- a/src/shogun/features/StringFeatures.h +++ b/src/shogun/features/StringFeatures.h @@ -574,7 +574,7 @@ template class CStringFeatures : public CFeatures } /** @return number of vectors, possibly of subset */ - virtual inline int32_t get_num_vectors() + virtual inline int32_t get_num_vectors() const { return m_subset ? m_subset->get_size() : num_vectors; } diff --git a/src/shogun/features/WDFeatures.h b/src/shogun/features/WDFeatures.h index b6b134068aa..0bec4a4d393 100644 --- a/src/shogun/features/WDFeatures.h +++ b/src/shogun/features/WDFeatures.h @@ -179,7 +179,7 @@ class CWDFeatures : public CDotFeatures return C_WD; } - inline virtual int32_t get_num_vectors() + inline virtual int32_t get_num_vectors() const { return num_strings; }