From 189f9250c33958c79cfdaef2cfb3f742b2b74ad5 Mon Sep 17 00:00:00 2001 From: Didnelpsun <2675350965@qq.com> Date: Mon, 13 Sep 2021 23:34:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=93=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Code/CPP-Code/head/link_list.h | 10 +++++++--- Code/CPP-Code/source/test.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Code/CPP-Code/head/link_list.h b/Code/CPP-Code/head/link_list.h index 7f57886..ff0d44a 100644 --- a/Code/CPP-Code/head/link_list.h +++ b/Code/CPP-Code/head/link_list.h @@ -419,7 +419,7 @@ element_type* LinkListWithHead::Delete(int index, int length) { // 如果此时i小于index-1,表示遍历完还没有到达对应的索引 if (i < index - 1) { cout << "Delete:删除索引值" << index << "过大!" << endl; - return false; + return data; } // 此时i==index-1,start到达,求end end = start; @@ -427,7 +427,7 @@ element_type* LinkListWithHead::Delete(int index, int length) { data[i] = end->GetData(); end = end->GetNext(); if (end == nullptr) { - cout << "Delete:删除索引最大值" << index + length - 1 << "大于链表最大索引" << length << endl; + cout << "Delete:删除索引最大值" << index + length - 1 << "大于链表最大索引" << length << "!" << endl; return data; } } @@ -438,6 +438,8 @@ element_type* LinkListWithHead::Delete(int index, int length) { start->SetNext(end->GetNext()); } this->SetLength(this->GetLength() - length); + free(start); + free(end); return data; } @@ -483,7 +485,7 @@ element_type* LinkListWithoutHead::Delete(int index, int length) { } end = end->GetNext(); if (end == nullptr) { - cout << "Delete:删除索引最大值" << index + length - 1 << "大于链表最大索引" << length << endl; + cout << "Delete:删除索引最大值" << index + length - 1 << "大于链表最大索引" << length << "!" << endl; return data; } } @@ -498,5 +500,7 @@ element_type* LinkListWithoutHead::Delete(int index, int length) { start->SetNext(end->GetNext()); } this->SetLength(this->GetLength() - length); + free(start); + free(end); return data; } \ No newline at end of file diff --git a/Code/CPP-Code/source/test.cpp b/Code/CPP-Code/source/test.cpp index 065bcfa..4475dda 100644 --- a/Code/CPP-Code/source/test.cpp +++ b/Code/CPP-Code/source/test.cpp @@ -3,7 +3,7 @@ #include "../head/sequence_list.h" #include "../head/link_list.h" -int SequenceListTest() { +bool SequenceListTest() { DynamicSequenceList list; element_type a[6] = {'1','2','3','4','5','6'}; list.LoopInsert(a, 0, 6); @@ -14,10 +14,10 @@ int SequenceListTest() { cout << b[i] << endl; } list.Destroy(); - return 0; + return true; } -int LinkListTest() { +bool LinkListTest() { element_type a[6] = {'0', '1','2','3','4','5' }; // LinkListWithHead list; // list.NextInsert(a, 0, 5); @@ -38,5 +38,5 @@ int LinkListTest() { cout << b[i] << endl; } list->Print(); - return 0; + return true; } \ No newline at end of file