Changeset 8:4295fbc71fb2 in orange-reliability for _reliability/__init__.py


Ignore:
Timestamp:
07/03/12 13:53:23 (22 months ago)
Author:
Matija Polajnar <matija.polajnar@…>
Branch:
default
Message:

Fix incorrect (incomplete) merge.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • _reliability/__init__.py

    r5 r8  
    424424 
    425425class BaggingVarianceClassifier: 
    426     def __init__(self, classifiers): 
     426    def __init__(self, classifiers, classifier=None): 
    427427        self.classifiers = classifiers 
    428  
    429     def __call__(self, instance, *args): 
    430         def __init__(self, classifiers, classifier=None): 
    431             self.classifiers = classifiers 
    432             self.classifier = classifier 
     428        self.classifier = classifier 
    433429 
    434430    def __call__(self, instance, *args): 
     
    592588 
    593589class CNeighboursClassifier: 
    594     def __init__(self, nearest_neighbours, k): 
     590    def __init__(self, nearest_neighbours, k, distance): 
    595591        self.nearest_neighbours = nearest_neighbours 
    596592        self.k = k 
     593        self.distance = distance 
    597594 
    598595    def __call__(self, instance, predicted, probabilities): 
Note: See TracChangeset for help on using the changeset viewer.