[mlpack-svn] r10880 - in mlpack/trunk/src/mlpack: . core methods/hmm tests

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

Author: rcurtin
Date: 2011-12-17 02:19:43 -0500 (Sat, 17 Dec 2011)
New Revision: 10880

Added:
   mlpack/trunk/src/mlpack/core/dists/
Removed:
   mlpack/trunk/src/mlpack/methods/hmm/distributions/
Modified:
   mlpack/trunk/src/mlpack/core.hpp
   mlpack/trunk/src/mlpack/core/CMakeLists.txt
   mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt
   mlpack/trunk/src/mlpack/methods/hmm/hmm.hpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp
   mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
   mlpack/trunk/src/mlpack/tests/distribution_test.cpp
   mlpack/trunk/src/mlpack/tests/gmm_test.cpp
   mlpack/trunk/src/mlpack/tests/hmm_test.cpp
Log:
Move distributions to core/dists/.


Modified: mlpack/trunk/src/mlpack/core/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/core/CMakeLists.txt	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/core/CMakeLists.txt	2011-12-17 07:19:43 UTC (rev 10880)
@@ -2,6 +2,7 @@
 set(DIRS
   arma_extend
   data
+  dists
   kernels
   math
   metrics

Modified: mlpack/trunk/src/mlpack/core.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core.hpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/core.hpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -137,5 +137,7 @@
 #include <mlpack/core/math/random.hpp>
 #include <mlpack/core/math/range.hpp>
 #include <mlpack/core/util/save_restore_utility.hpp>
+#include <mlpack/core/dists/discrete_distribution.hpp>
+#include <mlpack/core/dists/gaussian_distribution.hpp>
 
 #endif

Modified: mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/methods/hmm/CMakeLists.txt	2011-12-17 07:19:43 UTC (rev 10880)
@@ -7,10 +7,6 @@
   hmm_impl.hpp
   hmm_util.hpp
   hmm_util_impl.hpp
-  distributions/discrete_distribution.hpp
-  distributions/discrete_distribution.cpp
-  distributions/gaussian_distribution.hpp
-  distributions/gaussian_distribution.cpp
 )
 
 # Add directory name to sources.

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm.hpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm.hpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -9,7 +9,6 @@
 #define __MLPACK_METHODS_HMM_HMM_HPP
 
 #include <mlpack/core.hpp>
-#include "distributions/discrete_distribution.hpp"
 
 namespace mlpack {
 namespace hmm /** Hidden Markov Models. */ {

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_generate_main.cpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -10,7 +10,6 @@
 #include "hmm.hpp"
 #include "hmm_util.hpp"
 
-#include "distributions/gaussian_distribution.hpp"
 #include <mlpack/methods/gmm/gmm.hpp>
 
 PROGRAM_INFO("Hidden Markov Model (HMM) Sequence Generator", "This "

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_loglik_main.cpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -9,7 +9,6 @@
 #include "hmm.hpp"
 #include "hmm_util.hpp"
 
-#include "distributions/gaussian_distribution.hpp"
 #include <mlpack/methods/gmm/gmm.hpp>
 
 PROGRAM_INFO("Hidden Markov Model (HMM) Sequence Log-Likelihood", "This "

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_train_main.cpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -9,7 +9,6 @@
 #include "hmm.hpp"
 #include "hmm_util.hpp"
 
-#include "distributions/gaussian_distribution.hpp"
 #include <mlpack/methods/gmm/gmm.hpp>
 
 PROGRAM_INFO("Hidden Markov Model (HMM) Training", "This program allows a "

Modified: mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/methods/hmm/hmm_viterbi_main.cpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -10,7 +10,6 @@
 #include "hmm.hpp"
 #include "hmm_util.hpp"
 
-#include "distributions/gaussian_distribution.hpp"
 #include <mlpack/methods/gmm/gmm.hpp>
 
 PROGRAM_INFO("Hidden Markov Model (HMM) Viterbi State Prediction", "This "

Modified: mlpack/trunk/src/mlpack/tests/distribution_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/distribution_test.cpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/tests/distribution_test.cpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -5,8 +5,6 @@
  * Test for the mlpack::distribution::DiscreteDistribution class.
  */
 #include <mlpack/core.hpp>
-#include <mlpack/methods/hmm/distributions/discrete_distribution.hpp>
-#include <mlpack/methods/hmm/distributions/gaussian_distribution.hpp>
 
 #include <boost/test/unit_test.hpp>
 

Modified: mlpack/trunk/src/mlpack/tests/gmm_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/gmm_test.cpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/tests/gmm_test.cpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -8,7 +8,6 @@
 
 #include <mlpack/methods/gmm/gmm.hpp>
 #include <mlpack/methods/gmm/phi.hpp>
-#include <mlpack/methods/hmm/distributions/gaussian_distribution.hpp>
 
 #include <boost/test/unit_test.hpp>
 

Modified: mlpack/trunk/src/mlpack/tests/hmm_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/hmm_test.cpp	2011-12-17 07:19:01 UTC (rev 10879)
+++ mlpack/trunk/src/mlpack/tests/hmm_test.cpp	2011-12-17 07:19:43 UTC (rev 10880)
@@ -5,8 +5,6 @@
  */
 #include <mlpack/core.hpp>
 #include <mlpack/methods/hmm/hmm.hpp>
-#include <mlpack/methods/hmm/distributions/discrete_distribution.hpp>
-#include <mlpack/methods/hmm/distributions/gaussian_distribution.hpp>
 #include <mlpack/methods/gmm/gmm.hpp>
 
 #include <boost/test/unit_test.hpp>