Search and Evaluation

[hansonhl]

I found it quite hard to separate the search and evaluation part for my code. Though the two parts do not interact with each other, I have made changes to both parts along the way. I have also merged in the latest version of the master branch from your repo to mine before making this pull request so I think there shouldn't be any merge conflicts.

[JohnAGoldsmith]

Sure, that's fine (that the two things are mixed). I'll figure out how to accept the pull request. John

…

On Fri, Jul 6, 2018 at 3:08 PM, hansonhl ***@***.***> wrote: I found it quite hard to separate the search and evaluation part for my code. Though the two parts do not interact with each other, I have made changes to both parts along the way. ------------------------------ You can view, comment on, or merge this pull request online at: #7 Commit Summary - moving goldstandard class to this branch - implementing menu andn toolbar option for evaluation - removing temporary files - created new MainMenu class and transferred code from mainwindow, made comments in Crab1 for better understanding - adding comments to undertand Crab1 better - Tested and fixed bugs for gold standard evaluation - moved openXML functionality from GoldStandard class into mainwindow - added treeView item for goldstandard, revised algorithm to include overlapping morphemes - adding .pro.user - Merge remote-tracking branch 'upstream/master' into gold-standard - finishing model and table view of gold standard - Merge remote-tracking branch 'upstream/master' into gold-standard - starting on json output - finishing Morfessor parse file input, starting modification of tree view - adding handler class for old GSMap structure - starting on parsemap class - finishing table view of Morfessor parse evaluation - finishing eval parses object - committing pro.user - Merge branch 'gold-standard' into parsemap - cleaning evaluation code - finishing gui and signal connections for find functionality - finishing dock widget for search - cleaning up code and correcting bugs in search function - finishing search - Merge remote-tracking branch 'upstream/master' into search - adding documentation comments - adding documentation comments File Changes - *M* QtLing/Lexicon.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-0> (83) - *M* QtLing/Lexicon.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-1> (31) - *M* QtLing/QtLing.pro <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-2> (13) - *M* QtLing/QtLing.pro.user <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-3> (28) - *M* QtLing/Signature.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-4> (4) - *M* QtLing/SignatureCollection.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-5> (7) - *M* QtLing/Word.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-6> (4) - *M* QtLing/WordCollection.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-7> (10) - *M* QtLing/WordCollection.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-8> (2) - *A* QtLing/evaluation.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-9> (33) - *A* QtLing/evaluation.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-10> (199) - *A* QtLing/evaluation_evalparses.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-11> (71) - *A* QtLing/evaluation_goldstandard.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-12> (911) - *A* QtLing/evaluation_parsemap.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-13> (82) - *M* QtLing/generaldefinitions.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-14> (7) - *A* QtLing/lexicon_json.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-15> (1) - *M* QtLing/lxamodels.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-16> (151) - *M* QtLing/lxamodels.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-17> (4) - *M* QtLing/mainwindow.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-18> (247) - *M* QtLing/mainwindow.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-19> (47) - *A* QtLing/mainwindow_actions.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-20> (127) - *A* QtLing/mainwindow_find.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-21> (242) - *A* QtLing/mainwindow_find.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-22> (99) - *A* QtLing/mainwindow_finddockwidget.h.autosave <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-23> (17) - *A* QtLing/mainwindow_findwidget.cpp.autosave <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-24> (11) - *A* QtLing/mainwindow_menu_copy.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-25> (186) - *A* QtLing/mainwindow_menu_copy.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-26> (56) - *A* QtLing/mainwindow_menubar.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-27> (80) - *A* QtLing/mainwindow_menubar.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-28> (36) - *A* QtLing/mainwindow_search.cpp.autosave <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-29> (11) - *M* QtLing/table_views.h <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-30> (18) - *M* QtLing/table_views_lower.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-31> (1) - *M* QtLing/table_views_upper.cpp <https://github.com/JohnAGoldsmith/QtLing/pull/7/files#diff-32> (377) Patch Links: - https://github.com/JohnAGoldsmith/QtLing/pull/7.patch - https://github.com/JohnAGoldsmith/QtLing/pull/7.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#7>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABiqlx5IMed1ALGu6TXdPiPK6VjT69VMks5uD8O4gaJpZM4VF919> .