odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] crazy direct calls to dunder methods 

bzr revid: xmo@openerp.com-20121214124111-xk1wq0xh0gzgx8oh
This commit is contained in:
Xavier Morel 2012-12-14 13:41:11 +01:00
parent c6079dd6bb
commit a34a167037
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openerp/tools/graph.py
View File

@ -51,7 +51,7 @@ class graph(object):
for link in self.links:
self.edge_wt[link] = self.result[link[1]]['x'] - self.result[link[0]]['x']
tot_node = self.partial_order.__len__()
tot_node = len(self.partial_order)
#do until all the nodes in the component are searched
while self.tight_tree()<tot_node:
list_node = []
@ -68,8 +68,8 @@ class graph(object):
slack = 100
for edge in list_edge:
if ((self.reachable_nodes.__contains__(edge[0]) and edge[1] not in self.reachable_nodes) or
(self.reachable_nodes.__contains__(edge[1]) and edge[0] not in self.reachable_nodes)):
if ((edge[0] in self.reachable_nodes and edge[1] not in self.reachable_nodes) or
(edge[1] in self.reachable_nodes and edge[0] not in self.reachable_nodes)):
if slack > self.edge_wt[edge]-1:
slack = self.edge_wt[edge]-1
new_edge = edge
@ -93,7 +93,7 @@ class graph(object):
self.reachable_nodes = []
self.tree_edges = []
self.reachable_node(self.start)
return self.reachable_nodes.__len__()
return len(self.reachable_nodes)
def reachable_node(self, node):
@ -123,7 +123,7 @@ class graph(object):
self.head_nodes = []
rest_edges = []
rest_edges += self.tree_edges
rest_edges.__delitem__(i)
del rest_edges[i]
self.head_component(self.start, rest_edges)
i+=1
positive = 0
@ -197,7 +197,7 @@ class graph(object):
des = link[1]
edge_len = self.partial_order[des]['level'] - self.partial_order[src]['level']
if edge_len < 0:
self.links.__delitem__(i)
del self.links[i]
self.links.insert(i, (des, src))
self.transitions[src].remove(des)
self.transitions.setdefault(des, []).append(src)
@ -213,7 +213,7 @@ class graph(object):
@param edge edge with negative cut-value
@param edge new edge with minimum slack-value
"""
self.tree_edges.__delitem__(self.tree_edges.index(e))
del self.tree_edges[self.tree_edges.index(e)]
self.tree_edges.append(f)
self.init_cutvalues()
@ -227,13 +227,13 @@ class graph(object):
self.head_nodes = []
rest_edges = []
rest_edges += self.tree_edges
rest_edges.__delitem__(rest_edges.index(edge))
del rest_edges[rest_edges.index(edge)]
self.head_component(self.start, rest_edges)
if self.head_nodes.__contains__(edge[1]):
if edge[1] in self.head_nodes:
l = []
for node in self.result:
if not self.head_nodes.__contains__(node):
if node not in self.head_nodes:
l.append(node)
self.head_nodes = l
@ -377,7 +377,7 @@ class graph(object):
if pre_level_nodes:
for src in pre_level_nodes:
if self.transitions.get(src) and self.transitions[src].__contains__(node):
if self.transitions.get(src) and node in self.transitions[src]:
adj_nodes.append(self.result[src]['y'])
return adj_nodes
@ -511,7 +511,7 @@ class graph(object):
for start in self.start_nodes[:index]:
same = True
for edge in self.tree_list[start][1:]:
if self.tree_list[self.start].__contains__(edge):
if edge in self.tree_list[self.start]:
continue
else:
same = False
@ -590,9 +590,9 @@ class graph(object):
for edge in largest_tree:
if rem_nodes.__contains__(edge[0]):
if edge[0] in rem_nodes:
rem_nodes.remove(edge[0])
if rem_nodes.__contains__(edge[1]):
if edge[1] in rem_nodes:
rem_nodes.remove(edge[1])
if not rem_nodes: