kristjan/cjvt-valency
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fixed the sentence duplication bug. todo: functors

Browse Source
This commit is contained in:
voje 2019-04-11 07:49:31 +02:00
parent 4a9a9cca12
commit d135cc7f2b
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend_flask/app.py
View File

@ -302,6 +302,9 @@ def api_get_functor_frames():
for ent in cur: for ent in cur:
frames += frames_from_db_entry(ent) # pre-process this step for prod TODO frames += frames_from_db_entry(ent) # pre-process this step for prod TODO
for f in frames:
print(f.to_json())
# raw_frames = vallex.functors_index[functor] # TODO # raw_frames = vallex.functors_index[functor] # TODO
ret_frames = RF(frames, valdb[SENSEMAP_COLL]) ret_frames = RF(frames, valdb[SENSEMAP_COLL])
return prepare_frames(ret_frames) return prepare_frames(ret_frames)

2
src/pkg/valency/valency/Frame.py
View File

@ -30,7 +30,7 @@ def frames_from_db_entry(dbent):
], ],
# sentences=[(dbent["sid"], dbent["tokens"])], # sentences=[(dbent["sid"], dbent["tokens"])],
sentences=[ sentences=[
[(_full_tid(t["tid"]), t)for t in dbent["tokens"]], [(_full_tid(t["tid"]), t) for t in dbent["tokens"]],
] ]
)] )]
return frames return frames

10
src/pkg/valency/valency/reduce_functions.py
View File

@ -24,12 +24,14 @@ def sorted_by_len_tids(frames):
def reduce_0(frames, valdb_sensemap=None): def reduce_0(frames, valdb_sensemap=None):
# new request... frames should be sorded by # new request... frames should be sorded by
# functors list (basically reduce_1, just each # functors list
# sentence gets its own frame)
r1_frames = reduce_1(frames) # return frames # simplify code...
# frames = reduce_1(frames)
sorting_strings = [] sorting_strings = []
separated_frames = [] separated_frames = []
for frame in r1_frames: for frame in frames:
for tid in frame.tids: for tid in frame.tids:
tmp_frame = DC(frame) tmp_frame = DC(frame)
tmp_frame.tids = [tid] tmp_frame.tids = [tid]