Changeset 8067:e32d040a8940 in orange


Ignore:
Timestamp:
07/04/11 13:39:17 (3 years ago)
Author:
markotoplak
Branch:
default
Convert:
8038f084174ff5640ad84702ab9af727cd2060c1
Message:

Fixed a hierarchical clustering example. Changed two camelCase attributes into underscore_separated.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orange/Orange/clustering/hierarchical.py

    r8059 r8067  
    5555            4. ``HierarchicalClustering.Ward`` uses Ward's distance. 
    5656             
    57     .. attribute:: overwriteMatrix 
    58          
     57    .. attribute:: overwrite_matrix 
     58 
    5959        If true (default is false), the algorithm will work on the original 
    6060        distance matrix, destroying it in the process. The benefit is that it 
     
    6262        the tree of clusters). 
    6363         
    64     .. attribute:: progressCallback 
     64    .. attribute:: progress_callback 
    6565         
    6666        A callback function (None by default). It can be any function or 
     
    317317    import Orange 
    318318    from Orange.clustering import hierarchical 
    319     from Orange import distances 
    320      
     319 
    321320    data = Orange.data.Table("iris") 
    322321    matrix = Orange.core.SymMatrix(len(data)) 
    323322    matrix.setattr("objects", data) 
    324     distance = distances.ExamplesDistanceConstructor_Euclidean(data) 
     323    distance = Orange.distance.instances.EuclideanConstructor(data) 
    325324    for i1, instance1 in enumerate(data): 
    326325        for i2 in range(i1+1, len(data)): 
Note: See TracChangeset for help on using the changeset viewer.