[Scipy-svn] r3095 - trunk/Lib/sandbox/pyem/tests

[scipy-svn@scip...]

Author: cdavid
Date: 2007-06-11 04:32:17 -0500 (Mon, 11 Jun 2007)
New Revision: 3095

Modified:
   trunk/Lib/sandbox/pyem/tests/test_gmm_em.py
Log:
Reenable tests I forgot to uncomment in gmm_em tests

Modified: trunk/Lib/sandbox/pyem/tests/test_gmm_em.py
===================================================================
--- trunk/Lib/sandbox/pyem/tests/test_gmm_em.py	2007-06-11 09:18:57 UTC (rev 3094)
+++ trunk/Lib/sandbox/pyem/tests/test_gmm_em.py	2007-06-11 09:32:17 UTC (rev 3095)
@@ -40,66 +40,66 @@
         em  = EM()
         lk  = em.train(data, gmm)
 
-#class test_full_run(EmTest):
-#    """This class only tests whether the algorithms runs. Do not check the
-#    results."""
-#    def check_1d(self, level = 1):
-#        d       = 1
-#        k       = 2
-#        mode    = 'full'
-#        nframes = int(1e2)
-#
-#        #seed(1)
-#        self._create_model_and_run_em(d, k, mode, nframes)
-#
-#    def check_2d(self, level = 1):
-#        d       = 2
-#        k       = 2
-#        mode    = 'full'
-#        nframes = int(1e2)
-#
-#        #seed(1)
-#        self._create_model_and_run_em(d, k, mode, nframes)
-#
-#    def check_5d(self, level = 1):
-#        d       = 5
-#        k       = 3
-#        mode    = 'full'
-#        nframes = int(1e2)
-#
-#        #seed(1)
-#        self._create_model_and_run_em(d, k, mode, nframes)
-#
-#class test_diag_run(EmTest):
-#    """This class only tests whether the algorithms runs. Do not check the
-#    results."""
-#    def check_1d(self, level = 1):
-#        d       = 1
-#        k       = 2
-#        mode    = 'diag'
-#        nframes = int(1e2)
-#
-#        #seed(1)
-#        self._create_model_and_run_em(d, k, mode, nframes)
-#
-#    def check_2d(self, level = 1):
-#        d       = 2
-#        k       = 2
-#        mode    = 'diag'
-#        nframes = int(1e2)
-#
-#        #seed(1)
-#        self._create_model_and_run_em(d, k, mode, nframes)
-#
-#    def check_5d(self, level = 1):
-#        d       = 5
-#        k       = 3
-#        mode    = 'diag'
-#        nframes = int(1e2)
-#
-#        #seed(1)
-#        self._create_model_and_run_em(d, k, mode, nframes)
+class test_full_run(EmTest):
+    """This class only tests whether the algorithms runs. Do not check the
+    results."""
+    def check_1d(self, level = 1):
+        d       = 1
+        k       = 2
+        mode    = 'full'
+        nframes = int(1e2)
 
+        #seed(1)
+        self._create_model_and_run_em(d, k, mode, nframes)
+
+    def check_2d(self, level = 1):
+        d       = 2
+        k       = 2
+        mode    = 'full'
+        nframes = int(1e2)
+
+        #seed(1)
+        self._create_model_and_run_em(d, k, mode, nframes)
+
+    def check_5d(self, level = 1):
+        d       = 5
+        k       = 3
+        mode    = 'full'
+        nframes = int(1e2)
+
+        #seed(1)
+        self._create_model_and_run_em(d, k, mode, nframes)
+
+class test_diag_run(EmTest):
+    """This class only tests whether the algorithms runs. Do not check the
+    results."""
+    def check_1d(self, level = 1):
+        d       = 1
+        k       = 2
+        mode    = 'diag'
+        nframes = int(1e2)
+
+        #seed(1)
+        self._create_model_and_run_em(d, k, mode, nframes)
+
+    def check_2d(self, level = 1):
+        d       = 2
+        k       = 2
+        mode    = 'diag'
+        nframes = int(1e2)
+
+        #seed(1)
+        self._create_model_and_run_em(d, k, mode, nframes)
+
+    def check_5d(self, level = 1):
+        d       = 5
+        k       = 3
+        mode    = 'diag'
+        nframes = int(1e2)
+
+        #seed(1)
+        self._create_model_and_run_em(d, k, mode, nframes)
+
 class test_datasets(EmTest):
     """This class tests whether the EM algorithms works using pre-computed
     datasets."""