~ubuntu-branches/ubuntu/natty/python-cogent/natty

« back to all changes in this revision

Viewing changes to cogent/evolve/likelihood_calculation.py

  • Committer: Bazaar Package Importer
  • Author(s): Steffen Moeller
  • Date: 2010-12-04 22:30:35 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101204223035-j11kinhcrrdgg2p2
Tags: 1.5-1
* Bumped standard to 3.9.1, no changes required.
* New upstream version.
  - major additions to Cookbook
  - added AlleleFreqs attribute to ensembl Variation objects.
  - added getGeneByStableId method to genome objects.
  - added Introns attribute to Transcript objects and an Intron class.
  - added Mann-Whitney test and a Monte-Carlo version
  - exploratory and confirmatory period estimation techniques (suitable for
    symbolic and continuous data)
  - Information theoretic measures (AIC and BIC) added
  - drawing of trees with collapsed nodes
  - progress display indicator support for terminal and GUI apps
  - added parser for illumina HiSeq2000 and GAiix sequence files as 
    cogent.parse.illumina_sequence.MinimalIlluminaSequenceParser.
  - added parser to FASTQ files, one of the output options for illumina's
    workflow, also added cookbook demo.
  - added functionality for parsing of SFF files without the Roche tools in
    cogent.parse.binary_sff
  - thousand fold performance improvement to nmds
  - >10-fold performance improvements to some Table operations

Show diffs side-by-side

added added

removed removed

Lines of Context:
9
9
in addition to binary trees.
10
10
"""
11
11
import numpy
12
 
import logging
13
 
LOG = logging.getLogger('cogent.evolve')
14
12
 
15
13
Float = numpy.core.numerictypes.sctype2char(float)
16
14
 
26
24
__copyright__ = "Copyright 2007-2009, The Cogent Project"
27
25
__credits__ = ["Peter Maxwell", "Gavin Huttley"]
28
26
__license__ = "GPL"
29
 
__version__ = "1.4.1"
 
27
__version__ = "1.5.0"
30
28
__maintainer__ = "Peter Maxwell"
31
29
__email__ = "pm67nz@gmail.com"
32
30
__status__ = "Production"
120
118
        self.tree = tree
121
119
    
122
120
    def calc(self, leaves):
123
 
        lht = recursive_lht_build(self.tree, leaves)
124
 
        LOG.info('LT root length: %s/%s' % (len(lht.uniq),len(lht.index)))
125
 
        return lht
 
121
        return recursive_lht_build(self.tree, leaves)
126
122
    
127
123
 
128
124
class LikelihoodTreeAlignmentSplitterDefn(CalculationDefn):