Merge branch 'master' into main_dyc

This commit is contained in:
蒋东桓 2025-03-21 01:45:33 +08:00 committed by GitHub
commit ec4ebfc16c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 26 deletions

View File

@ -1,8 +0,0 @@
 sq_list.c
C:\code\lencode\Project2\sq_list.c(94,37): warning C4028: 形参 2 与声明不同
C:\code\lencode\Project2\sq_list.c(100,9): warning C4033: “locate_list”必须返回值
C:\code\lencode\Project2\sq_list.c(104,27): warning C4047: “==”:“int”与“int *”的间接级别不同
C:\code\lencode\Project2\sq_list.c(110,9): warning C4033: “locate_list”必须返回值
C:\code\lencode\Project2\sq_list.c(164,34): warning C4133: “函数”: 从“sq_list *”到“int *”的类型不兼容
C:\code\lencode\Project2\sq_list.c(114,1): warning C4715: “locate_list”: 不是所有的控件路径都返回值
Project2.vcxproj -> C:\code\lencode\Project2\Debug\Project2.exe

16
main.c
View File

@ -10,10 +10,10 @@ int main(void)
sq_list* L = init_sq_list();
sq_list* N = init_sq_list();
N->data[0] = 11;
N->data[1] = 12;
N->data[2] = 13;
for (int i = 1; i <= 3; i++)
{
N->data[i - 1] = i+10;
}
for (int i = 1; i <= 10; i++)
{
L->data[i - 1] = i;
@ -22,10 +22,10 @@ int main(void)
L->length = 10;
print_sq_list(N);
print_sq_list(L);
printf("----------------------------------");
mer_ge_sq_list(L,N);
print_sq_list(L);
printf("%d", L->length);
merge_sq_list(N,L);
print_sq_list(N);
printf("L->length:[%d]\n", N->length);
printf("Hello World!\n");
system("pause");
return 0;
}

View File

@ -73,8 +73,10 @@ void insert_sq_list(sq_list* list, int pos, int value)
// ´òÓ¡
void print_sq_list(sq_list* list)
{
printf("[");
for (int i = 0; i < list->length; i++)
printf("%d ", list->data[i]);
printf("]");
printf("\n");
}
@ -132,20 +134,22 @@ 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])
continue;
else if (list_1->data[j] == list_2->data[i])
{
flog++; break;
}
else
{
list_1->data[list_1->length] = list_2->data[i];
list_1->length++;
if (j == list_1->length -1)
{
list_1->data[list_1->length] = list_2->data[i];
list_1->length++;
flog++;
}
else
continue;
}
}
}
printf("有%d相同 有%d不相同\n", flog, list_2->length - flog);
printf("----------------------------------\n");
printf("有%d不相同 有%d相同\n", flog, list_2->length - flog);
printf("----------------------------------\n");
}
//if (list_1->data[j] != list_2->data[i])