Revision 27b1b922 util/UnitDiskGraph.py

View differences:

util/UnitDiskGraph.py
10 10

  
11 11
    def __init__(self, points, radius):
12 12
        self.G = nx.Graph()
13
        self.G.add_nodes_from(range(len(points)))
14
        '''
13
        #self.G.add_nodes_from(range(len(points)))
14
        
15 15
        self.G = gt.Graph(directed=False)
16 16
        self.G.add_vertex(len(points))
17
        self.edge_weights = self.G.new_edge_property('double')
18
        self.G.edge_properties['weight'] = self.edge_weights'''
17
        self.edge_weights = self.G.new_edge_property('float')
18
        #self.G.edge_properties['weight'] = self.edge_weights
19 19
        
20 20
        self.generateGraphCDIST(points, radius)
21 21
        
......
39 39
                if r==c:
40 40
                    continue
41 41
                if distM[r][c] <= radius:
42
                    edges.append((r,c,1.0))
43
        self.G.add_weighted_edges_from(edges, weight='weight')
44
        '''code.interact(local=dict(globals(), **locals()))
45
        for e in edges:
42
                    edges.append([r,c, 1.0])
43
        #self.G.add_weighted_edges_from(edges, weight='weight')
44
        #code.interact(local=dict(globals(), **locals()))
45
        self.G.ep["weight"] = self.G.new_edge_property("float")
46
        eprops = [self.G.ep["weight"]]
47
        self.G.add_edge_list(edges, hashed=True, eprops=eprops)
48
        #self.G.add_edge_list(edges, eprops=self.edge_weights)
49
        '''for e in edges:
46 50
            e = self.G.add_edge(e[0],e[1])
47 51
            self.edge_weights[e] = 1.0'''
48 52

  

Also available in: Unified diff