Mercurial > hg > Game > Cerium
diff example/regex_mas/ppe/Exec.cc @ 1662:d865530672fa draft
fix regex_mas
author | Masa <e085726@ie.u-ryukyu.ac.jp> |
---|---|
date | Tue, 16 Jul 2013 16:42:31 +0900 |
parents | 8b50b1ee068e |
children | 99f8130793b4 |
line wrap: on
line diff
--- a/example/regex_mas/ppe/Exec.cc Tue Jul 16 14:46:50 2013 +0900 +++ b/example/regex_mas/ppe/Exec.cc Tue Jul 16 16:42:31 2013 +0900 @@ -10,13 +10,13 @@ //ボイヤームーア法による文字列検索アルゴリズム int BM_method(unsigned char *text,int *offset,int *text_length, - unsigned char *pattern,int *sw_len) + unsigned char *pattern,unsigned long long *match_string) { int skip[256]; int text_len = (long int)text_length; - int pattern_len = (long int)sw_len; + int pattern_len = strlen((char *)pattern); int i = 0; - int match_num = 0; + int match_counter = 0; for (i = 0; i < 256; ++i){ skip[i] = pattern_len; @@ -32,38 +32,30 @@ int j = pattern_len - 1; while (text[i] == pattern[j]){ if (j == 0){ - - match_num++; - + match_counter++; } --i; --j; } i = i + max((int)skip[(int)text[i]],pattern_len - j); } - return match_num; + return match_counter; } static int run(SchedTask *s, void *rbuf, void *wbuf) { - unsigned char *search_word = (unsigned char *)s->get_input(rbuf, 0); - unsigned char *i_data = (unsigned char *)s->get_input(rbuf, 1); - //unsigned char *search_word = (unsigned char *)s->get_inputAddr(0); - //unsigned char *i_data = (unsigned char *)s->get_inputAddr(1); - s->printf("input word : %s\n",search_word); - unsigned long long *o_data = (unsigned long long*)s->get_output(wbuf,0); - s->printf("in(1):%d in(2):%d\n",s->get_inputSize(0),s->get_inputSize(1)); - - + unsigned char *i_data = (unsigned char *)rbuf; + unsigned long long *o_data = (unsigned long long*)wbuf; int *length = (int*)s->get_param(0); int *offset = (int*)s->get_param(1); - int *sw_len = (int*)s->get_param(2); - //unsigned char search_word[] = "doing"; - s->printf("length:%ld,offset:%ld,sw_len:%d,search_word:%s,i_data:%s\n",length,offset,sw_len,search_word,i_data); + unsigned char search_word[] = "aba"; - o_data[0] = BM_method(i_data,offset,length,search_word); + o_data[0] = BM_method(i_data,offset,length,search_word,o_data); + + s->printf("%d\n",o_data[0]); //s->printf("in Exec.cc\n"); + return 0; }