Skip to content

Fix for #515 - dependency graph issue #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2015
Merged

Fix for #515 - dependency graph issue #521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions pythonforandroid/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,15 +575,22 @@ def __init__(self):
def remove_redundant_graphs(self):
'''Removes possible graphs if they are equivalent to others.'''
graphs = self.graphs
initial_num_graphs = len(graphs)
# Walk the list backwards so that popping elements doesn't
# mess up indexing
for i in range(len(graphs) - 1):
graph = graphs[initial_num_graphs - 1 - i]
for j in range(1, len(graphs)):
comparison_graph = graphs[initial_num_graphs - 1 - j]
# mess up indexing.

# n.b. no need to test graph 0 as it will have been tested against
# all others by the time we get to it
for i in range(len(graphs) - 1, 0, -1):
graph = graphs[i]

#test graph i against all graphs 0 to i-1
for j in range(0, i):
comparison_graph = graphs[j]

if set(comparison_graph.keys()) == set(graph.keys()):
graphs.pop(initial_num_graphs - 1 - i)
#graph[i] == graph[j]
#so remove graph[i] and continue on to testing graph[i-1]
graphs.pop(i)
break

def add(self, dependent, dependency):
Expand Down