Changeset 7458:548b794817bd in orange


Ignore:
Timestamp:
02/04/11 15:57:52 (3 years ago)
Author:
miha <miha.stajdohar@…>
Branch:
default
Convert:
dff928e458c998d1776551dceedf3bf689c59456
Message:

replaced orangeom with Orange.core

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orange/Orange/network/__init__.py

    r7457 r7458  
    558558import os 
    559559 
    560 import orangeom 
    561560import Orange.core 
    562561import Orange.data 
     
    572571MdsType = MdsTypeClass() 
    573572 
    574 class Network(orangeom.Network): 
     573class Network(Orange.core.Network): 
    575574     
    576575    """Bases: :obj:`Orange.network.GraphAsList`, :obj:`Orange.network.Graph`  
     
    582581    :obj:`Orange.network.GraphAsList`. Refer to 
    583582    :obj:`Orange.network.GraphAsList` for more graph analysis tools. See the 
    584     orangeom.Pathfinder class for a way to simplify your network. 
     583    Orange.core.Pathfinder class for a way to simplify your network. 
    585584     
    586585    .. attribute:: coors 
     
    837836            return net  
    838837 
    839 class NetworkOptimization(orangeom.NetworkOptimization): 
     838class NetworkOptimization(Orange.core.NetworkOptimization): 
    840839     
    841840    """Perform network layout optimization. Network structure is defined in  
     
    895894    def __init__(self, network=None, name="None"): 
    896895        if network is None: 
    897             network = orangeom.Network(2, 0) 
     896            network = Orange.core.Network(2, 0) 
    898897             
    899898        self.setGraph(network) 
     
    966965                 
    967966            if len(nodes) > 0: 
    968                 subgraph = orangeom.Network(self.graph.getSubGraph(nodes)) 
     967                subgraph = Orange.core.Network(self.graph.getSubGraph(nodes)) 
    969968                oldcoors = self.coors 
    970969                self.setGraph(subgraph) 
     
    992991                #print graphstomerge 
    993992                #print used 
    994                 subgraph = orangeom.Network( 
     993                subgraph = Orange.core.Network( 
    995994                            subgraph.getSubGraphMergeClusters(graphstomerge)) 
    996995                                    
Note: See TracChangeset for help on using the changeset viewer.