Changeset 7858:2c0463a063c1 in orange


Ignore:
Timestamp:
04/18/11 12:27:01 (3 years ago)
Author:
miha <miha.stajdohar@…>
Branch:
default
Convert:
90718f9b7486e3be347723ac734dbc332f947f1a
Message:
 
Location:
orange/Orange/network
Files:
2 edited

Legend:

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

    r7852 r7858  
    3737            if not isinstance(links, Orange.data.Table): 
    3838                raise TypeError('links must be of type \'Orange.data.Table\'') 
    39             if len(items) != self.number_of_edges(): 
     39            if len(links) != self.number_of_edges(): 
    4040                print "Warning: links length must match the number of edges." 
    4141         
     
    4747     
    4848    def __init__(self, data=None, name='', **attr):   
    49         nx.Graph.__init__(self, data=data, name=name, **attr) 
     49        nx.Graph.__init__(self, data, name, **attr) 
    5050        BaseGraph.__init__(self) 
    5151         
     
    5555     
    5656    def __init__(self, data=None, name='', **attr): 
    57         nx.DiGraph.__init__(self, data=data, name=name, **attr) 
     57        nx.DiGraph.__init__(self, data, name, **attr) 
    5858        BaseGraph.__init__(self) 
    5959         
     
    6363     
    6464    def __init__(self, data=None, name='', **attr): 
    65         nx.MultiGraph.__init__(self, data=data, name=name, **attr) 
     65        nx.MultiGraph.__init__(self, data, name, **attr) 
    6666        BaseGraph.__init__(self) 
    6767         
     
    7171     
    7272    def __init__(self, data=None, name='', **attr): 
    73         nx.MultiDiGraph.__init__(self, data=data, name=name, **attr) 
     73        nx.MultiDiGraph.__init__(self, data, name, **attr) 
    7474        BaseGraph.__init__(self) 
    7575         
  • orange/Orange/network/readwrite.py

    r7853 r7858  
     1import Orange 
    12import networkx as nx 
    23import networkx.readwrite as rw 
    3 from networkx.utils import _get_fh 
    44import warnings 
    55import itertools 
    66import Orange.network 
    77 
     8from networkx.utils import _get_fh 
     9 
    810__all__ = ['generate_pajek', 'write_pajek', 'read_pajek', 'parse_pajek'] 
    9  
    10 write_pajek = rw.write_pajek 
    1111 
    1212def _wrap(g): 
     
    177177    return parse_pajek_project(lines) 
    178178 
    179 read_pajek.__doc__ = rw.read_pajek.__doc__ 
    180 parse_pajek.__doc__ = rw.parse_pajek.__doc__ 
     179#read_pajek.__doc__ = rw.read_pajek.__doc__ 
     180#parse_pajek.__doc__ = rw.parse_pajek.__doc__ 
Note: See TracChangeset for help on using the changeset viewer.