Changeset 9916:b31e223d233b in orange


Ignore:
Timestamp:
02/07/12 12:36:32 (2 years ago)
Author:
lanumek
Branch:
default
rebase_source:
49c44c40121bb3fcbe67296d4aa5377715dd8379
Message:

Changed Orange.core.SymMatrix -> Orange.misc.SymMatrix

Location:
Orange
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Orange/distance/__init__.py

    r9805 r9916  
    247247    
    248248def distance_matrix(data, distance_constructor=Euclidean, progress_callback=None): 
    249     """ A helper function that computes an :obj:`Orange.data.SymMatrix` of all 
     249    """ A helper function that computes an :obj:`Orange.misc.SymMatrix` of all 
    250250    pairwise distances between instances in `data`. 
    251251     
     
    260260    :type progress_callback: function 
    261261     
    262     :rtype: :class:`Orange.data.SymMatrix` 
    263      
    264     """ 
    265     matrix = Orange.data.SymMatrix(len(data)) 
     262    :rtype: :class:`Orange.misc.SymMatrix` 
     263     
     264    """ 
     265    matrix = Orange.misc.SymMatrix(len(data)) 
    266266    dist = distance_constructor(data) 
    267267 
  • Orange/network/deprecated.py

    r9671 r9916  
    616616        :param matrix: number of objects in a matrix must match the number  
    617617            of vertices in a network. 
    618         :type matrix: Orange.core.SymMatrix 
     618        :type matrix: Orange.misc.SymMatrix 
    619619        :param lower: lower distance bound. 
    620620        :type lower: float 
     
    14541454        self.mdsStep = 0 
    14551455        self.stopMDS = 0 
    1456         self.vertexDistance.matrixType = Orange.core.SymMatrix.Symmetric 
     1456        self.vertexDistance.matrixType = Orange.misc.SymMatrix.Symmetric 
    14571457        self.diag_coors = math.sqrt((min(self.graph.coors[0]) -  \ 
    14581458                                     max(self.graph.coors[0]))**2 + \ 
  • Orange/network/network.py

    r9671 r9916  
    797797        self.mdsStep = 0 
    798798        self.stopMDS = 0 
    799         self.items_matrix.matrixType = Orange.core.SymMatrix.Symmetric 
     799        self.items_matrix.matrixType = Orange.misc.SymMatrix.Symmetric 
    800800        self.diag_coors = math.sqrt((min(self.coors[0]) - \ 
    801801                                     max(self.coors[0])) ** 2 + \ 
  • Orange/projection/linear.py

    r9880 r9916  
    397397        if distances: 
    398398            if n_valid != len(valid_data): 
    399                 classes = Orange.core.SymMatrix(n_valid) 
     399                classes = Orange.misc.SymMatrix(n_valid) 
    400400                r = 0 
    401401                for ro, vr in enumerate(valid_data): 
  • Orange/projection/mds.py

    r9725 r9916  
    177177     
    178178    :param distances: original dissimilarity - a distance matrix to operate on. 
    179     :type distances: :class:`Orange.core.SymMatrix` 
     179    :type distances: :class:`Orange.misc.SymMatrix` 
    180180     
    181181    :param dim: dimension of the projected space. 
     
    194194    .. attribute:: distances 
    195195     
    196        An :class:`Orange.core.SymMatrix` containing the distances that we 
     196       An :class:`Orange.misc.SymMatrix` containing the distances that we 
    197197       want to achieve (lsmt changes these). 
    198198        
    199199    .. attribute:: projected_distances 
    200200 
    201        An :class:`Orange.core.SymMatrix` containing the distances between 
     201       An :class:`Orange.misc.SymMatrix` containing the distances between 
    202202       projected points. 
    203203        
    204204    .. attribute:: original_distances 
    205205 
    206        An :class:`Orange.core.SymMatrix` containing the original distances 
     206       An :class:`Orange.misc.SymMatrix` containing the original distances 
    207207       between points. 
    208208        
    209209    .. attribute:: stress 
    210210        
    211        An :class:`Orange.core.SymMatrix` holding the stress. 
     211       An :class:`Orange.misc.SymMatrix` holding the stress. 
    212212     
    213213    .. attribute:: dim 
     
    232232    def __init__(self, distances=None, dim=2, **kwargs): 
    233233        self.mds=orangemds.MDS(distances, dim, **kwargs) 
    234         self.original_distances=Orange.core.SymMatrix([m for m in self.distances]) 
     234        self.original_distances=Orange.misc.SymMatrix([m for m in self.distances]) 
    235235 
    236236    def __getattr__(self, name): 
Note: See TracChangeset for help on using the changeset viewer.