Changeset 10769:8838c9b438d8 in orange


Ignore:
Timestamp:
04/05/12 17:30:49 (2 years ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Parents:
10768:1a4d7b4e8022 (diff), 10758:e712a3d58fa0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Orange/ensemble/forest.py

    r10758 r10769  
    215215        """ 
    216216        from operator import add 
    217          
     217 
     218        instance = Orange.data.Instance(self.domain, instance) 
    218219        # get results to avoid multiple calls 
    219220        res_both = [c(instance, orange.GetBoth) for c in self.classifiers] 
  • Orange/ensemble/forest.py

    r10766 r10769  
    272272       
    273273                    for val,prob in probs: 
    274                         if prob != None: #no probability output 
     274                        if prob[varn] != None: #no probability output 
    275275                            a = dict(prob[varn].items()) 
    276276                        else: 
    277                             ya = { val.value : 1. } 
     277                            a = { val[varn].value : 1. } 
    278278                        cprob = dict( (n, a.get(n, 0)+cprob.get(n, 0)) for n in set(a)|set(cprob) ) 
    279279                    cprob = Orange.statistics.distribution.Continuous(cprob) 
Note: See TracChangeset for help on using the changeset viewer.