made get_num_vectors() a const method

shogun-toolbox · Jul 22, 2011 · 3bb09d5 · 3bb09d5
1 parent c86e131
commit 3bb09d5
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -636,7 +636,8 @@ template<class ST> 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
@@ -885,7 +885,7 @@ template <class ST> 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
@@ -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
@@ -303,7 +303,7 @@ template <class T> 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
@@ -456,7 +456,7 @@ template <class T> 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
@@ -260,7 +260,7 @@ template <class T> 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
@@ -574,7 +574,7 @@ template <class ST> 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
@@ -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;
 		}