diff --git a/main.c b/main.c index be38ceb..ae7d234 100644 --- a/main.c +++ b/main.c @@ -8,7 +8,24 @@ int main(void) - + sq_list* L = init_sq_list(); + sq_list* N = init_sq_list(); + for (int i = 1; i <= 3; i++) + { + N->data[i - 1] = i; + } + for (int i = 1; i <= 10; i++) + { + L->data[i - 1] = i; + } + N->length = 3; + L->length = 10; + print_sq_list(N); + print_sq_list(L); + printf("----------------------------------"); + merge_sq_list(N,L); + print_sq_list(L); + printf("%d", L->length); printf("Hello World!\n"); return 0; } diff --git a/sq_list.c b/sq_list.c index 8a9c478..3068bb9 100644 --- a/sq_list.c +++ b/sq_list.c @@ -92,7 +92,9 @@ void merge_sq_list(sq_list* list_1, sq_list* list_2) { for (int j = 0; j < list_1->length; j++) { - if (list_1->data[j] == list_2->data[i]) + if (list_1->data[j] != list_2->data[i]) + continue; + else if (list_1->data[j] != list_2->data[i]) break; else { @@ -104,5 +106,10 @@ void merge_sq_list(sq_list* list_1, sq_list* list_2) } } - printf("有%d相同 有%d不相同\n", flog, list_2->length - flog); -} \ No newline at end of file + printf("有%d不相同 有%d相同\n", flog, list_2->length - flog); +} + +/*ist_1->data[list_1->length] = list_2->data[i]; +list_1->length++; +flog--; +break;*/ \ No newline at end of file