[mlpack-svn] r11829 - mlpack/trunk/src/mlpack

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2012-03-12 15:18:17 -0400 (Mon, 12 Mar 2012)
New Revision: 11829

Modified:
   mlpack/trunk/src/mlpack/core.hpp
Log:
Windows #defines min and max; undo these defines so we can use std::min() and std::max().

Modified: mlpack/trunk/src/mlpack/core.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core.hpp	2012-03-12 19:16:30 UTC (rev 11828)
+++ mlpack/trunk/src/mlpack/core.hpp	2012-03-12 19:18:17 UTC (rev 11829)
@@ -78,12 +78,14 @@
  *  - Kernel PCA - mlpack::kpca::KernelPCA
  *  - K-Means Clustering - mlpack::kmeans::KMeans
  *  - Least-Angle Regression (LARS/LASSO) - mlpack::regression::LARS
+ *  - Local Coordinate Coding - mlpack::lcc::LocalCoordinateCoding
  *  - Naive Bayes Classifier - mlpack::naive_bayes::NaiveBayesClassifier
  *  - Neighborhood Components Analysis (NCA) - mlpack::nca::NCA
  *  - Principal Components Analysis (PCA) - mlpack::pca::PCA
  *  - RADICAL (ICA) - mlpack::radical::Radical
  *  - Simple Least-Squares Linear Regression -
  *      mlpack::regression::LinearRegression
+ *  - Sparse Coding - mlpack::sparse_coding::SparseCoding
  *  - Tree-based neighbor search (AllkNN, AllkFN) -
  *      mlpack::neighbor::NeighborSearch
  *  - Tree-based range search - mlpack::range::RangeSearch
@@ -149,4 +151,16 @@
 #include <mlpack/core/dists/discrete_distribution.hpp>
 #include <mlpack/core/dists/gaussian_distribution.hpp>
 
+// Clean up unfortunate Windows preprocessor definitions.
+// Use std::min and std::max!
+#ifdef _WIN32
+  #ifdef min
+    #undef min
+  #endif
+
+  #ifdef max
+    #undef max
+  #endif
 #endif
+
+#endif