Ignore:
Timestamp:
02/06/12 13:52:55 (2 years ago)
Author:
markotoplak
Branch:
default
Children:
9725:6c16952df555, 9752:cbd6f6f10f06
rebase_source:
be8730bf9f2e7e771332dfc8b3876c8a62826bd1
Message:

Renames in Orange.distance.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Orange/evaluation/reliability.py

    r9697 r9724  
    400400    def __call__(self, instances, learner): 
    401401        nearest_neighbours_constructor = Orange.classification.knn.FindNearestConstructor() 
    402         nearest_neighbours_constructor.distanceConstructor = Orange.distance.EuclideanConstructor() 
     402        nearest_neighbours_constructor.distanceConstructor = Orange.distance.Euclidean() 
    403403         
    404404        distance_id = Orange.data.new_meta_id() 
     
    467467    def __call__(self, instances, learner): 
    468468        nearest_neighbours_constructor = Orange.classification.knn.FindNearestConstructor() 
    469         nearest_neighbours_constructor.distanceConstructor = Orange.distance.EuclideanConstructor() 
     469        nearest_neighbours_constructor.distanceConstructor = Orange.distance.Euclidean() 
    470470         
    471471        distance_id = Orange.data.new_meta_id() 
     
    514514    def __call__(self, instances, *args): 
    515515        nnm = Orange.classification.knn.FindNearestConstructor() 
    516         nnm.distanceConstructor = Orange.distance.MahalanobisConstructor() 
     516        nnm.distanceConstructor = Orange.distance.Mahalanobis() 
    517517         
    518518        mid = Orange.data.new_meta_id() 
     
    558558        instance_avg = numpy.average(X, 0) 
    559559         
    560         distance_constructor = Orange.distance.MahalanobisConstructor() 
     560        distance_constructor = Orange.distance.Mahalanobis() 
    561561        distance = distance_constructor(new_instances) 
    562562         
Note: See TracChangeset for help on using the changeset viewer.