diff options
author | Maximilian Szengel <gnunet@maxsz.de> | 2012-10-26 14:33:59 +0000 |
---|---|---|
committer | Maximilian Szengel <gnunet@maxsz.de> | 2012-10-26 14:33:59 +0000 |
commit | 7a741b2fa8c96076f8b05a2d08e4b6b3ba78360b (patch) | |
tree | bd6c9d2d20fe9fb8f405075e929b3056cdd67736 /src/regex/test_regex_eval_api.c | |
parent | 993a74c191842519ad6c82216fb7a0ee2bb09456 (diff) | |
download | gnunet-7a741b2fa8c96076f8b05a2d08e4b6b3ba78360b.tar.gz gnunet-7a741b2fa8c96076f8b05a2d08e4b6b3ba78360b.zip |
- Added path compression parameter to DFA construction API
- Moved NFA construction to internal header
- Added regex simulation profiler (for profiling the NFA, that results by merging
several DFAs in the DHT, in a database)
Diffstat (limited to 'src/regex/test_regex_eval_api.c')
-rw-r--r-- | src/regex/test_regex_eval_api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c index ffe6d74bf..02aa1d01c 100644 --- a/src/regex/test_regex_eval_api.c +++ b/src/regex/test_regex_eval_api.c | |||
@@ -92,7 +92,7 @@ test_random (unsigned int rx_length, unsigned int max_str_len, | |||
92 | } | 92 | } |
93 | 93 | ||
94 | /* Match string using DFA */ | 94 | /* Match string using DFA */ |
95 | dfa = GNUNET_REGEX_construct_dfa (rand_rx, strlen (rand_rx)); | 95 | dfa = GNUNET_REGEX_construct_dfa (rand_rx, strlen (rand_rx), 0); |
96 | if (NULL == dfa) | 96 | if (NULL == dfa) |
97 | { | 97 | { |
98 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constructing DFA failed\n"); | 98 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constructing DFA failed\n"); |
@@ -123,7 +123,7 @@ test_random (unsigned int rx_length, unsigned int max_str_len, | |||
123 | 123 | ||
124 | /* Match canonical regex */ | 124 | /* Match canonical regex */ |
125 | dfa = | 125 | dfa = |
126 | GNUNET_REGEX_construct_dfa (canonical_regex, strlen (canonical_regex)); | 126 | GNUNET_REGEX_construct_dfa (canonical_regex, strlen (canonical_regex), 0); |
127 | if (NULL == dfa) | 127 | if (NULL == dfa) |
128 | { | 128 | { |
129 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constructing DFA failed\n"); | 129 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Constructing DFA failed\n"); |
@@ -333,12 +333,12 @@ main (int argc, char *argv[]) | |||
333 | GNUNET_REGEX_automaton_destroy (a); | 333 | GNUNET_REGEX_automaton_destroy (a); |
334 | 334 | ||
335 | /* DFA test */ | 335 | /* DFA test */ |
336 | a = GNUNET_REGEX_construct_dfa (rxstr[i].regex, strlen (rxstr[i].regex)); | 336 | a = GNUNET_REGEX_construct_dfa (rxstr[i].regex, strlen (rxstr[i].regex), 0); |
337 | check_dfa += test_automaton (a, &rx, &rxstr[i]); | 337 | check_dfa += test_automaton (a, &rx, &rxstr[i]); |
338 | check_proof = GNUNET_strdup (GNUNET_REGEX_get_canonical_regex (a)); | 338 | check_proof = GNUNET_strdup (GNUNET_REGEX_get_canonical_regex (a)); |
339 | GNUNET_REGEX_automaton_destroy (a); | 339 | GNUNET_REGEX_automaton_destroy (a); |
340 | 340 | ||
341 | a = GNUNET_REGEX_construct_dfa (check_proof, strlen (check_proof)); | 341 | a = GNUNET_REGEX_construct_dfa (check_proof, strlen (check_proof), 0); |
342 | check_dfa += test_automaton (a, &rx, &rxstr[i]); | 342 | check_dfa += test_automaton (a, &rx, &rxstr[i]); |
343 | GNUNET_REGEX_automaton_destroy (a); | 343 | GNUNET_REGEX_automaton_destroy (a); |
344 | if (0 != check_dfa) | 344 | if (0 != check_dfa) |