Skip to content
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

Prune speedup #845

Merged
merged 17 commits into from
Nov 6, 2018
Merged

Prune speedup #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3f7139d
prune.c: clean_table(): Delete in-place
ampli Nov 2, 2018
af84685
Avoid zero_connector_table() also here, if nothing deleted
ampli Oct 24, 2018
06c44b1
Allocate prune_context on the stack
ampli Oct 31, 2018
09daa77
prune.c: Matching shallow connectors: Stop earlier
ampli Nov 3, 2018
d018ad5
power_table_new(): Add a comment on the hash table construction
ampli Nov 3, 2018
180cee0
prune.c ALT_*_CONSISTENCY: Add missing include file
ampli Nov 3, 2018
3cbcac2
prune.c ALT_*_CONSISTENCY: Add OPTIMIZE_EN code
ampli Nov 3, 2018
8971db9
power_prune(): Move total_deleted accumulation out of inner loop
ampli Nov 5, 2018
03f845c
power_prune(): Unify the disjunct scan and delete loops
ampli Nov 5, 2018
1cdb63c
power_prune(): Localize word loop variables
ampli Nov 5, 2018
8690304
power_prune(): Use initializations
ampli Nov 5, 2018
5e9f175
power_prune(): Rearrange prune_context initialization
ampli Nov 5, 2018
f812041
possible_connection(): Add DEBUG assert for BAD_WORD
ampli Nov 5, 2018
9ea3e61
rule_satisfiable(): Use strdupa() instead of strncpy()
ampli Nov 5, 2018
067ca68
power_prune(): Make it static
ampli Nov 5, 2018
f9e8741
connectors.h: Define lc_easy_match() as inline
ampli Nov 5, 2018
0b9a5f7
power_table_new(): Consolidate the connector insert loops
ampli Nov 5, 2018
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
2 changes: 1 addition & 1 deletion link-grammar/connectors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static inline bool easy_match(const char * s, const char * t)
* When this function is called, it is assumed that the upper-case
* parts are equal, and thus do not need to be checked again.
*/
static bool lc_easy_match(const condesc_t *c1, const condesc_t *c2)
static inline bool lc_easy_match(const condesc_t *c1, const condesc_t *c2)
{
return (((c1->lc_letters ^ c2->lc_letters) & c1->lc_mask & c2->lc_mask) ==
(c1->lc_mask & c2->lc_mask & 1));
Expand Down
Loading