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/testing/unit/tests/test_distance.py

    r9679 r9724  
    33from Orange.misc.testing import datasets_driven, test_on_data 
    44 
    5 from Orange.distance import instances 
     5from Orange.distance import * 
    66 
    77@datasets_driven 
    88class TestEuclideanDistance(testing.DistanceTestCase): 
    9     DISTANCE_CONSTRUCTOR = instances.EuclideanConstructor() 
     9    DISTANCE_CONSTRUCTOR = Euclidean() 
    1010 
    1111@datasets_driven     
    1212class TestMannhatanDistance(testing.DistanceTestCase): 
    13     DISTANCE_CONSTRUCTOR = instances.ManhattanConstructor() 
     13    DISTANCE_CONSTRUCTOR = Manhattan() 
    1414     
    1515@datasets_driven 
    1616class TestHammingDistance(testing.DistanceTestCase): 
    17     DISTANCE_CONSTRUCTOR = instances.HammingConstructor() 
     17    DISTANCE_CONSTRUCTOR = Hamming() 
    1818     
    1919@datasets_driven 
    2020class TestReliefDistance(testing.DistanceTestCase): 
    21     DISTANCE_CONSTRUCTOR = instances.ReliefConstructor() 
     21    DISTANCE_CONSTRUCTOR = Relief() 
    2222 
    2323@datasets_driven 
    2424class TestPearsonRDistance(testing.DistanceTestCase): 
    25     DISTANCE_CONSTRUCTOR = instances.PearsonRConstructor() 
     25    DISTANCE_CONSTRUCTOR = PearsonR() 
    2626 
    2727@datasets_driven 
    2828class TestSpearmanRDistance(testing.DistanceTestCase): 
    29     DISTANCE_CONSTRUCTOR = instances.SpearmanRConstructor() 
     29    DISTANCE_CONSTRUCTOR = SpearmanR() 
    3030     
    3131@datasets_driven 
    3232class TestPearsonRAbsoluteDistance(testing.DistanceTestCase): 
    33     DISTANCE_CONSTRUCTOR = instances.PearsonRAbsoluteConstructor() 
     33    DISTANCE_CONSTRUCTOR = PearsonRAbsolute() 
    3434     
    3535@datasets_driven 
    3636class TestSpearmanRAbsoluteDistance(testing.DistanceTestCase): 
    37     DISTANCE_CONSTRUCTOR = instances.SpearmanRAbsoluteConstructor() 
     37    DISTANCE_CONSTRUCTOR = SpearmanRAbsolute() 
    3838     
    3939@datasets_driven 
    4040class TestMahalanobisDistance(testing.DistanceTestCase): 
    41     DISTANCE_CONSTRUCTOR = instances.MahalanobisConstructor() 
     41    DISTANCE_CONSTRUCTOR = Mahalanobis() 
    4242     
    4343if __name__ == "__main__": 
Note: See TracChangeset for help on using the changeset viewer.