Skip to content

modified: uroboros.py #4

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

Open
pajkossy wants to merge 3 commits into
base: master
Choose a base branch
from
Open

modified: uroboros.py #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11f345a
modified: uroboros.py
pajkossy Feb 27, 2015
d818acc
modified: uroboros.py
pajkossy Feb 27, 2015
e661ce6
modified: uroboros.py
pajkossy Feb 27, 2015
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
6 changes: 4 additions & 2 deletions uroboros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def create_uroboros(graph, mode, max_iter, freqs):
size = len(graph)
freqs = get_freqs(graph, mode)
skip = collect_skip(graph, freqs, sort_by)
for word, _ in sorted(freqs.iteritems(), key=sort_by):
for word, freq in sorted(freqs.iteritems(), key=lambda x: (sort_by(x), x[0])):
new_def = graph[word].copy()
for def_w in graph[word]:
if def_w in skip:
Expand Down Expand Up @@ -191,8 +191,10 @@ def main():
if args.definitions == "stdin":
def_graph = read_definition_graph(stdin, all_needed, needed_wds, args.filename)
else:
def_graph = read_definition_graph(args.definitions, all_needed,
def_fh = open(args.definitions)
def_graph = read_definition_graph(def_fh, all_needed,
needed_wds, args.filename)
def_fh.close()
logging.info('Definition graph read')
correct_integrity(def_graph, args.error_fn)
logging.info('Definition integrity corrected')
Expand Down