Changeset 9723:d0c9015bc73a in orange


Ignore:
Timestamp:
02/06/12 12:45:13 (2 years ago)
Author:
markotoplak
Branch:
default
rebase_source:
36364d6e7c4ac3bb6a85125732748c8d4fd33f78
Message:

Orange.distance renames.

Location:
Orange
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Orange/clustering/hierarchical.py

    r9671 r9723  
    15201520     
    15211521    :param distance_constructor: An ExamplesDistance_Constructor instance. 
    1522     :type distance_constructor: :class:`Orange.distance.ExampleDistConstructor` 
     1522    :type distance_constructor: :class:`Orange.distance.DistanceConstructor` 
    15231523     
    15241524    :param progress_callback: A function (taking one argument) to use for 
  • Orange/distance/__init__.py

    r9722 r9723  
    2424 
    2525from Orange.core import \ 
    26     AlignmentList, \ 
    2726    DistanceMap, \ 
    2827    DistanceMapConstructor, \ 
    29     ExampleDistConstructor, \ 
    30     ExampleDistBySorting, \ 
    31     ExampleDistVector, \ 
    3228    ExamplesDistance as Distance, \ 
    3329    ExamplesDistance_Normalized as DistanceNormalized, \ 
  • Orange/orng/orngClustering.py

    r9671 r9723  
    22# from Orange.cluster.hierarchical import *  
    33 
    4 from Orange.distance import \ 
    5      AlignmentList, \ 
     4from Orange.core import \ 
    65     DistanceMap, \ 
    76     DistanceMapConstructor, \ 
    8      ExampleDistConstructor, \ 
    9      ExampleDistBySorting, \ 
    10      ExampleDistVector, \ 
    117     ExamplesDistance, \ 
    128     ExamplesDistance_Normalized, \ 
    139     ExamplesDistanceConstructor 
    1410 
    15 from 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 
    31  
     11from Orange.distance import HammingDistance as ExamplesDistance_Hamming, \ 
     12    DTWDistance as ExamplesDistance_DTW, \ 
     13    EuclideanDistance as ExamplesDistance_Euclidean, \ 
     14    ManhattanDistance as ExamplesDistance_Manhattan, \ 
     15    MaximalDistance as ExamplesDistance_Maximal, \ 
     16    ReliefDistance as ExamplesDistance_Relief, \ 
     17    DTW as ExamplesDistanceConstructor_DTW, \ 
     18    Euclidean as ExamplesDistanceConstructor_Euclidean, \ 
     19    Hamming as ExamplesDistanceConstructor_Hamming, \ 
     20    Manhattan as ExamplesDistanceConstructor_Manhattan, \ 
     21    Maximal as ExamplesDistanceConstructor_Maximal, \ 
     22    Relief as ExamplesDistanceConstructor_Relief, \ 
     23    PearsonR as ExamplesDistanceConstructor_PearsonR, \ 
     24    PearsonRDistance as ExamplesDistance_PearsonR, \ 
     25    SpearmanR as ExamplesDistanceConstructor_SpearmanR, \ 
     26    SpearmanRDistance as ExamplesDistance_SpearmanR 
    3227 
    3328from Orange.clustering.kmeans import Clustering as KMeans 
Note: See TracChangeset for help on using the changeset viewer.