kenkeiras/lang-model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change prints into loggings.

Browse source
This commit is contained in:
kenkeiras 2017-09-17 21:28:25 -04:00
parent b16df096d7
commit fae11eb875
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

29
naive-nlu/tree_nlu/parsing.py
View file

@ -107,7 +107,7 @@ def integrate_language(knowledge_base, example):
logging.debug("-FRM- | {}".format(tokens))
logging.debug("-AFT- | {}".format(after_remix))
print()
logging.debug("--- TEMPLATE ---")
_, matcher, result = make_template(knowledge_base, after_remix, atom)
logging.debug("Tx: {}".format(after_remix))
@ -382,9 +382,9 @@ def get_fit(knowledge, tokens, remaining_recursions=parameters.MAX_RECURSIONS):
if result is not None:
results.append(result)
print("XXX", result)
logging.debug("XXX {}".format(result))
print(' - ' + '\n - '.join(map(str, results)))
logging.debug(' - ' + '\n - '.join(map(str, results)))
if len(results) > 0:
return results[0]
@ -414,14 +414,6 @@ def resolve_fit(knowledge, fit, remaining_recursions):
if remixed_tokens is None:
return None
# if len(tokens) == 3 and tokens[2] == 'electricity':
# logging.debug("--UNMIX--")
# logging.debug("-MIX- | {}".format(remixer))
# logging.debug("REMIX | {}".format(tokens))
# logging.debug(" T O | {}".format(remixed_tokens))
# if remixer != [0, 1, 2]:
# return None
minifit = get_fit(knowledge, remixed_tokens, remaining_recursions - 1)
if minifit is None:
return None
@ -437,27 +429,36 @@ def resolve_fit(knowledge, fit, remaining_recursions):
def match_fit(knowledge, tokens, matcher, ast, remaining_recursions):
segment_possibilities = [([], tokens)] # Matched tokens, remaining tokens
indent = ' ' * (parameters.MAX_RECURSIONS - remaining_recursions)
logging.debug(indent + 'T>', tokens)
logging.debug(indent + 'M>', matcher)
for minisegment in matcher:
possibilities_after_round = []
logging.debug(indent + "MS", minisegment)
for matched_tokens, remaining_tokens in segment_possibilities:
if len(remaining_tokens) < 1:
continue
logging.debug(indent + "RT", remaining_tokens[0])
logging.debug(indent + "DEF", is_definite_minisegment(minisegment))
if is_definite_minisegment(minisegment):
# What if not match -----<
if match_token(knowledge, remaining_tokens[0], minisegment):
possibilities_after_round.append((
matched_tokens + [remaining_tokens[0]],
remaining_tokens[1:]
))
else:
# What if not match!!!!!!-----<
# TODO: optimize this with a look ahead
for i in range(1, len(tokens)):
possibilities_after_round.append((
matched_tokens + [(minisegment, remaining_tokens[:i])],
remaining_tokens[i:]
))
logging.debug(indent + "## PA", len(possibilities_after_round))
else:
segment_possibilities = possibilities_after_round
logging.debug(">>>> {}".format(len(segment_possibilities)))
fully_matched_segments = [(matched, remaining)
for (matched, remaining)
@ -466,11 +467,11 @@ def match_fit(knowledge, tokens, matcher, ast, remaining_recursions):
resolved_fits = []
for fit, _ in fully_matched_segments:
print(indent + ":::", fit) # REMIXES HAVE TO BE APPLIED BEFORE!!!
logging.debug(indent + ":::", fit) # REMIXES HAVE TO BE APPLIED BEFORE!!!
print(indent + '*' * 20)
logging.debug(indent + '*' * 20)
for fit, _ in fully_matched_segments:
print(indent + ":::", fit) # REMIXES HAVE TO BE APPLIED BEFORE!!!
logging.debug(indent + ":::", fit) # REMIXES HAVE TO BE APPLIED BEFORE!!!
resolved_fit = resolve_fit(knowledge, fit, remaining_recursions)
if resolved_fit is not None:
resolved_fits.append(resolved_fit)