Changeset 7767:7c7bb7f87392 in orange


Ignore:
Timestamp:
03/22/11 13:12:42 (3 years ago)
Author:
ales_erjavec <ales.erjavec@…>
Branch:
default
Convert:
6affd456eb07310c6eec9f6a98ccb80707d6d695
Message:

Renamed the use of 'testWithIndices' to 'test_with_indices'.

Location:
orange/Orange
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • orange/Orange/classification/wrappers.py

    r7632 r7767  
    3333    domain = Orange.data.Domain([], classVar) 
    3434 
    35     res = Orange.evaluation.testing.testWithIndices([self.learner], Orange.data.Table(domain, examples), indices) 
     35    res = Orange.evaluation.testing.test_with_indices([self.learner], Orange.data.Table(domain, examples), indices) 
    3636     
    3737    oldStat = self.stat(res)[0] 
     
    4545            for attr in domain.attributes: 
    4646                newdomain = Orange.data.Domain(filter(lambda x: x!=attr, domain.attributes), classVar) 
    47                 res = Orange.evaluation.testing.testWithIndices([self.learner], (Orange.data.Table(newdomain, examples), weightID), indices) 
     47                res = Orange.evaluation.testing.test_with_indices([self.learner], (Orange.data.Table(newdomain, examples), weightID), indices) 
    4848                 
    4949                newStat = self.stat(res)[0] 
     
    6666            if not attr in domain.attributes: 
    6767                newdomain = Orange.data.Domain(domain.attributes + [attr], classVar) 
    68                 res = Orange.evaluation.testing.testWithIndices([self.learner], (Orange.data.Table(newdomain, examples), weightID), indices) 
     68                res = Orange.evaluation.testing.test_with_indices([self.learner], (Orange.data.Table(newdomain, examples), weightID), indices) 
    6969                 
    7070                newStat = self.stat(res)[0] 
  • orange/Orange/optimization/__init__.py

    r7616 r7767  
    273273            for i in to_set: 
    274274                setattr(i[0], i[1], par) 
    275             res = evaluate(Orange.evaluation.testing.testWithIndices( 
     275            res = evaluate(Orange.evaluation.testing.test_with_indices( 
    276276                                        [self.object], tableAndWeight, cvind)) 
    277277            findBest.candidate((res, par)) 
     
    358358                        print "%s: %s" % (parnames[pi][i], value) 
    359359                         
    360             res = evaluate(Orange.evaluation.testing.testWithIndices( 
     360            res = evaluate(Orange.evaluation.testing.test_with_indices( 
    361361                                        [self.object], tableAndWeight, cvind)) 
    362362            if itercount in milestones: 
Note: See TracChangeset for help on using the changeset viewer.