Changeset 2223 for trunk/yat/classifier/MatrixLookup.h

Timestamp:

Mar 19, 2010, 4:30:02 AM (13 years ago)

Author:

Peter

Message:

fixes #543

File:

• trunk/yat/classifier/MatrixLookup.h (modified) (5 diffs)

trunk/yat/classifier/MatrixLookup.h

@@ -8 +8 @@
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -27 +27 @@
 
 #include "yat/utility/Container2DIterator.h"
+#include "yat/utility/deprecate.h"
 #include "yat/utility/Index.h"
 #include "yat/utility/iterator_traits.h"
@@ -150 +151 @@
     /// undefined.
     ///
+    /// \deprecated Provided for backgroundColor compatibility with
+    /// the 0.6 API. Use MatrixLookup(const utility::Matrix&, const
+    /// utility::Index&, const utility::Index&)
+    ///
     MatrixLookup(const utility::Matrix& matrix, 
                  const utility::Index& index, 
-                 const bool row_vectors);
+                 const bool row_vectors) YAT_DEPRECATE;
 
     ///
@@ -215 +220 @@
     /// undefined.
     ///
+    /// \deprecated Provided for backgroundColor compatibility with
+    /// the 0.6 API. Use MatrixLookup(const MatrixLookup&, const
+    /// utility::Index&, const utility::Index&)
+    ///
     MatrixLookup(const MatrixLookup& ml, const utility::Index&, 
                  const bool row_vectors);
@@ -228 +237 @@
     /// @brief The istream constructor.
     ///
-    /// In construction the underlying matrix is created from
-    /// stream. The MatrixLookup will be owner of the underlying
+    /// In construction the underlying utility::Matrix is created from
+    /// the stream using utility::Matrix(std::istream&). The
+    /// constructed MatrixLookup will be owner of the underlying
     /// matrix.
     ///
-    /// @see matrix(istream&) for details.
+    /// @see Matrix(istream&) for details.
     ///
     MatrixLookup(std::istream&, char sep='\0');