Ignore:
Timestamp:
02/06/12 09:42:50 (2 years ago)
Author:
markotoplak
Branch:
default
Children:
9664:6638cc93015a, 9719:782cfec5fe88
rebase_source:
a78d1d75a2cac951721701298920fd6faa82902a
Message:

Orange.distance.instances -> Orange.distance

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orange/orngClustering.py

    r8059 r9663  
    22# from Orange.cluster.hierarchical import *  
    33 
    4 from Orange.distance.instances import \ 
     4from Orange.distance import \ 
    55     AlignmentList, \ 
    66     DistanceMap, \ 
     
    1313     ExamplesDistanceConstructor 
    1414 
    15 from Orange.distance.instances import Hamming as ExamplesDistance_Hamming 
    16 from Orange.distance.instances import DTW as ExamplesDistance_DTW 
    17 from Orange.distance.instances import Euclidean as ExamplesDistance_Euclidean 
    18 from Orange.distance.instances import Manhattan as ExamplesDistance_Manhattan 
    19 from Orange.distance.instances import Maximal as ExamplesDistance_Maximal 
    20 from Orange.distance.instances import Relief as ExamplesDistance_Relief 
    21  
    22 from Orange.distance.instances import DTWConstructor as ExamplesDistanceConstructor_DTW 
    23 from Orange.distance.instances import EuclideanConstructor as ExamplesDistanceConstructor_Euclidean 
    24 from Orange.distance.instances import HammingConstructor as ExamplesDistanceConstructor_Hamming 
    25 from Orange.distance.instances import ManhattanConstructor as ExamplesDistanceConstructor_Manhattan 
    26 from Orange.distance.instances import MaximalConstructor as ExamplesDistanceConstructor_Maximal  
    27 from Orange.distance.instances import ReliefConstructor as ExamplesDistanceConstructor_Relief 
    28  
    29 from Orange.distance.instances import PearsonRConstructor as ExamplesDistanceConstructor_PearsonR 
    30 from Orange.distance.instances import PearsonR as ExamplesDistance_PearsonR 
    31 from Orange.distance.instances import SpearmanRConstructor as ExamplesDistanceConstructor_SpearmanR 
    32 from Orange.distance.instances import SpearmanR as ExamplesDistance_SpearmanR 
     15from Orange.distance import Hamming as ExamplesDistance_Hamming, \ 
     16    DTW as ExamplesDistance_DTW, \ 
     17    Euclidean as ExamplesDistance_Euclidean, \ 
     18    Manhattan as ExamplesDistance_Manhattan, \ 
     19    Maximal as ExamplesDistance_Maximal, \ 
     20    Relief as ExamplesDistance_Relief, \ 
     21    DTWConstructor as ExamplesDistanceConstructor_DTW, \ 
     22    EuclideanConstructor as ExamplesDistanceConstructor_Euclidean, \ 
     23    HammingConstructor as ExamplesDistanceConstructor_Hamming, \ 
     24    ManhattanConstructor as ExamplesDistanceConstructor_Manhattan, \ 
     25    MaximalConstructor as ExamplesDistanceConstructor_Maximal, \ 
     26    ReliefConstructor as ExamplesDistanceConstructor_Relief, \ 
     27    PearsonRConstructor as ExamplesDistanceConstructor_PearsonR, \ 
     28    PearsonR as ExamplesDistance_PearsonR, \ 
     29    SpearmanRConstructor as ExamplesDistanceConstructor_SpearmanR, \ 
     30    SpearmanR as ExamplesDistance_SpearmanR 
    3331 
    3432 
Note: See TracChangeset for help on using the changeset viewer.