Merge pull request #1314 from iglesias/feature/fix_matrixlist

Fix crashers occurring with SGMatrixList.
shogun-toolbox · Jul 25, 2013 · 86f58e3 · 86f58e3
2 parents ff18c6c + 7c35471
commit 86f58e3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/src/shogun/features/MatrixFeatures.cpp b/src/shogun/features/MatrixFeatures.cpp
@@ -133,7 +133,7 @@ template< class ST > void CMatrixFeatures< ST >::set_feature_vector(
 			 "(get_num_features())\n", get_num_features());
 	}
 
-	m_features[num] = vec;
+	m_features.set_matrix(num, vec);
 }
 
 template< class ST > void CMatrixFeatures< ST >::set_features(

diff --git a/src/shogun/lib/SGMatrixList.cpp b/src/shogun/lib/SGMatrixList.cpp
@@ -43,6 +43,24 @@ SGMatrixList<T>::~SGMatrixList()
 	unref();
 }
 
+template <class T>
+SGMatrix<T> SGMatrixList<T>::get_matrix(index_t index) const
+{
+	return matrix_list[index];
+}
+
+template <class T>
+SGMatrix<T> SGMatrixList<T>::operator[](index_t index) const
+{
+	return matrix_list[index];
+}
+
+template <class T>
+void SGMatrixList<T>::set_matrix(index_t index, const SGMatrix<T> matrix)
+{
+	matrix_list[index] = matrix;
+}
+
 template <class T>
 void SGMatrixList<T>::copy_data(const SGReferencedData &orig)
 {

diff --git a/src/shogun/lib/SGMatrixList.h b/src/shogun/lib/SGMatrixList.h
@@ -44,10 +44,7 @@ template<class T> class SGMatrixList : public SGReferencedData
 		 *
 		 * @return the matrix at position index of the list
 		 */
-		inline SGMatrix<T>& get_matrix(index_t index) const
-		{
-			return matrix_list[index];
-		}
+		SGMatrix<T> get_matrix(index_t index) const;
 
 		/** operator overload to get a matrix for read & write access
 		 *
@@ -56,10 +53,15 @@ template<class T> class SGMatrixList : public SGReferencedData
 		 *
 		 * @return the matrix at position index of the list
 		 */
-		inline SGMatrix<T>& operator[](index_t index) const
-		{
-			return matrix_list[index];
-		}
+		SGMatrix<T> operator[](index_t index) const;
+
+		/** set a matrix of the list
+		 *
+		 * @param index matrix index, index must be less than
+		 * num_matrices although no check is performed in the method
+		 * @param matrix matrix to set at index
+		 */
+		void set_matrix(index_t index, const SGMatrix<T> matrix);
 
 		/**
 		 * divide the matrix into a list of matrices. Each of the new