Changeset 449

Show
Ignore:
Timestamp:
07/21/07 23:26:04 (3 years ago)
Author:
cdavid
Message:

Fixed online em tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/learn/scikits/learn/machine/em/__init__.py

    r447 r449  
    11#! /usr/bin/env python 
    2 # Last Change: Sat Jul 21 03:00 PM 2007 J 
     2# Last Change: Sun Jul 22 01:00 PM 2007 J 
    33 
    44from info import __doc__ 
    …… 
    66from gauss_mix import GmParamError, GM 
    77from gmm_em import GmmParamError, GMM, EM 
    8 #from online_em import OnGMM as _OnGMM 
     8from online_em import OnGMM as _OnGMM 
    99 
    1010__all__ = filter(lambda s:not s.startswith('_'), dir()) 

  • trunk/learn/scikits/learn/machine/em/tests/test_online_em.py

    r313 r449  
    11#! /usr/bin/env python 
    2 # Last Change: Mon May 28 01:00 PM 2007 J 
     2# Last Change: Sun Jul 22 01:00 PM 2007 J 
    33 
    44import copy 
    …… 
    1111 
    1212set_package_path() 
    13 from pyem import GM, GMM 
    14 from pyem.online_em import OnGMM, OnGMM1d 
     13from em import GM, GMM 
     14from em.online_em import OnGMM, OnGMM1d 
    1515restore_path() 
    1616 
    …… 
    4545        # The actual EM, with likelihood computation 
    4646        for i in range(emiter): 
    47             g, tgd  = gmm.sufficient_statistics(data) 
     47            g, tgd  = gmm.compute_responsabilities(data) 
    4848            gmm.update_em(data, g) 
    4949