[mlpack-svn] r10215 - mlpack/trunk/src/mlpack/core/arma_extend

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Nov 9 14:25:25 EST 2011


Author: rcurtin
Date: 2011-11-09 14:25:24 -0500 (Wed, 09 Nov 2011)
New Revision: 10215

Removed:
   mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
   mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
Modified:
   mlpack/trunk/src/mlpack/core/arma_extend/CMakeLists.txt
   mlpack/trunk/src/mlpack/core/arma_extend/arma_extend.h
Log:
Remove the extra load() stuff that was not the right choice in the end.


Modified: mlpack/trunk/src/mlpack/core/arma_extend/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/CMakeLists.txt	2011-11-09 18:58:32 UTC (rev 10214)
+++ mlpack/trunk/src/mlpack/core/arma_extend/CMakeLists.txt	2011-11-09 19:25:24 UTC (rev 10215)
@@ -3,8 +3,6 @@
 # Define the files we need to compile.
 # Anything not in this list will not be compiled into MLPACK.
 set(SOURCES
-  Mat_extra_bones.hpp
-  Mat_extra_meat.hpp
   arma_extend.h
   fn_ccov.hpp
   glue_ccov_meat.hpp

Deleted: mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp	2011-11-09 18:58:32 UTC (rev 10214)
+++ mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_bones.hpp	2011-11-09 19:25:24 UTC (rev 10215)
@@ -1,15 +0,0 @@
-/**
- * @file Mat_extra_bones.hpp
- * @author Ryan Curtin
- *
- * Extra overload of load() and save() to allow transposition of matrix at load
- * time and save time.
- */
-
-inline bool load(const std::string   name, const file_type type, const bool print_status, const bool transpose);
-
-inline bool load(      std::istream& is,   const file_type type, const bool print_status, const bool transpose);
-
-inline bool save(const std::string   name, const file_type type, const bool print_status, const bool transpose);
-
-inline bool save(      std::ostream& os,   const file_type type, const bool print_status, const bool transpose);

Deleted: mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp	2011-11-09 18:58:32 UTC (rev 10214)
+++ mlpack/trunk/src/mlpack/core/arma_extend/Mat_extra_meat.hpp	2011-11-09 19:25:24 UTC (rev 10215)
@@ -1,74 +0,0 @@
-/**
- * @file Mat_extra_meat.hpp
- * @author Ryan Curtin
- *
- * Extra overload of load() to allow transposition of matrix at load time.
- */
-
-template<typename eT>
-inline
-bool
-Mat<eT>::load(const std::string name, const file_type type, const bool print_status, const bool transpose)
-  {
-  bool result = load(name, type, print_status);
-
-  if (transpose)
-    {
-    // Now transpose the matrix.
-    *this = trans(*this);
-    }
-
-  return result;
-  }
-
-template<typename eT>
-inline
-bool
-Mat<eT>::load(std::istream& is, const file_type type, const bool print_status, const bool transpose)
-  {
-  bool result = load(is, type, print_status);
-
-  if (transpose)
-    {
-    // Now transpose the matrix.
-    *this = trans(*this);
-    }
-
-  return result;
-  }
-
-template<typename eT>
-inline
-bool
-Mat<eT>::save(const std::string name, const file_type type, const bool print_status, const bool transpose)
-  {
-  if (transpose)
-    {
-    // Save a temporary matrix.
-    Mat<eT> tmp = trans(*this);
-
-    return tmp.save(name, type, print_status);
-    }
-  else
-    {
-    return save(name, type, print_status);
-    }
-  }
-
-template<typename eT>
-inline
-bool
-Mat<eT>::save(std::ostream& os, const file_type type, const bool print_status, const bool transpose)
-  {
-  if (transpose)
-    {
-    // Save a temporary matrix.
-    Mat<eT> tmp = trans(*this);
-
-    return tmp.save(os, type, print_status);
-    }
-  else
-    {
-    return save(os, type, print_status);
-    }
-  }

Modified: mlpack/trunk/src/mlpack/core/arma_extend/arma_extend.h
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/arma_extend.h	2011-11-09 18:58:32 UTC (rev 10214)
+++ mlpack/trunk/src/mlpack/core/arma_extend/arma_extend.h	2011-11-09 19:25:24 UTC (rev 10215)
@@ -10,11 +10,6 @@
 #ifndef __ARMA_EXTEND_H
 #define __ARMA_EXTEND_H
 
-// Define our own extensions.  These will be included in Cube_bones.hpp (or
-// Cube_proto.hpp) and Mat_bones.hpp (or Mat_meat.hpp).
-#define ARMA_EXTRA_MAT_PROTO mlpack/core/arma_extend/Mat_extra_bones.hpp
-#define ARMA_EXTRA_MAT_PROTO mlpack/core/arma_extend/Mat_extra_bones.hpp
-
 #include <armadillo>
 
 // To get CSV support on versions of Armadillo prior to 2.0.0, we'll do this.  I
@@ -35,9 +30,6 @@
   #include "glue_ccov_proto.hpp"
   #include "glue_ccov_meat.hpp"
   #include "fn_ccov.hpp"
-
-  // Implementation of load and save functions allowing transposes.
-  #include "Mat_extra_meat.hpp"
 };
 
 #endif




More information about the mlpack-svn mailing list