lab3 Николаев Лев

CMakeLists.txt

@@ -10,9 +10,11 @@ else()
     add_compile_options(-Wall -Wextra -Wpedantic -Wno-gnu-empty-struct -Wno-unused-parameter)
 endif()
 
-add_subdirectory(LibraryC)
+#add_subdirectory(LibraryC)
 add_subdirectory(LibraryCPP)
-add_subdirectory(LibraryCPPClass)
-add_subdirectory(LibraryCPPTemplate)
+#add_subdirectory(LibraryCPPClass)
+#add_subdirectory(LibraryCPPTemplate)
 
-add_subdirectory(Lab1C)
+#add_subdirectory(Lab1C)
+
+add_subdirectory(lab3)

LibraryCPP/CMakeLists.txt

@@ -1,3 +1,3 @@
-add_library(LibraryCPP STATIC array.cpp list.cpp queue.cpp stack.cpp vector.cpp)
+add_library(LibraryCPP STATIC list.cpp queue.cpp vector.cpp)
 
 add_subdirectory(Tests)

LibraryCPP/Tests/CMakeLists.txt

@@ -3,24 +3,24 @@
 # target_link_libraries(TestArrayCPP LibraryCPP)
 # add_test(TestArrayCPP TestArrayCPP)
 
-# add_executable(TestListCPP list.cpp)
-# target_include_directories(TestListCPP PUBLIC ..)
-# target_link_libraries(TestListCPP LibraryCPP)
-# add_test(TestListCPP TestListCPP)
+add_executable(TestListCPP list.cpp)
+target_include_directories(TestListCPP PUBLIC ..)
+target_link_libraries(TestListCPP LibraryCPP)
+add_test(TestListCPP TestListCPP)
 
-# add_executable(TestQueueCPP queue.cpp)
-# target_include_directories(TestQueueCPP PUBLIC ..)
-# target_link_libraries(TestQueueCPP LibraryCPP)
-# add_test(TestQueueCPP TestQueueCPP)
-# set_tests_properties(TestQueueCPP PROPERTIES TIMEOUT 10)
+add_executable(TestQueueCPP queue.cpp)
+target_include_directories(TestQueueCPP PUBLIC ..)
+target_link_libraries(TestQueueCPP LibraryCPP)
+add_test(TestQueueCPP TestQueueCPP)
+set_tests_properties(TestQueueCPP PROPERTIES TIMEOUT 10)
 
 # add_executable(TestStackCPP stack.cpp)
 # target_include_directories(TestStackCPP PUBLIC ..)
 # target_link_libraries(TestStackCPP LibraryCPP)
 # add_test(TestStackCPP TestStackCPP)
 
-# add_executable(TestVectorCPP vector.cpp)
-# target_include_directories(TestVectorCPP PUBLIC ..)
-# target_link_libraries(TestVectorCPP LibraryCPP)
-# add_test(TestVectorCPP TestVectorCPP)
-# set_tests_properties(TestVectorCPP PROPERTIES TIMEOUT 10)
+add_executable(TestVectorCPP vector.cpp)
+target_include_directories(TestVectorCPP PUBLIC ..)
+target_link_libraries(TestVectorCPP LibraryCPP)
+add_test(TestVectorCPP TestVectorCPP)
+set_tests_properties(TestVectorCPP PROPERTIES TIMEOUT 10)

LibraryCPP/Tests/vector.cpp

@@ -1,4 +1,4 @@
 #include <iostream>
 #include "vector.h"
 
 int main()
@@ -12,8 +12,8 @@
         return 1;
     }
 
-    for (size_t i = 0 ; i < vector_size(vector) ; ++i)
-        vector_set(vector, i, i);
+    for (size_t i = 0; i < vector_size(vector); ++i)
+        vector_set(vector, i, static_cast<Data>(i));
 
     for (size_t i = 0 ; i < vector_size(vector) ; ++i)
     {

LibraryCPP/list.cpp

@@ -1,61 +1,75 @@
-#include <cstddef>
 #include "list.h"
+#include <cstddef> // äëÿ NULL
+#include <cstdlib> // äëÿ malloc/free
 
-struct ListItem
-{
-};
-
-struct List
-{
-};
-
-List *list_create()
-{
-    return new List;
+List* list_create() {
+    List* list = new List;
+    list->head = nullptr;
+    list->tail = nullptr;
+    return list;
 }
 
-void list_delete(List *list)
-{
-    // TODO: free items
+void list_delete(List* list) {
+    ListItem* current = list->head;
+    while (current) {
+        ListItem* next = current->next;
+        delete current;
+        current = next;
+    }
     delete list;
 }
 
-ListItem *list_first(List *list)
-{
-    return NULL;
+void list_insert(List* list, int data) {
+    ListItem* new_item = new ListItem{ data, nullptr, nullptr };
+    if (!list->head) {
+        list->head = new_item;
+        list->tail = new_item;
+    }
+    else {
+        new_item->next = list->head;
+        list->head->prev = new_item;
+        list->head = new_item;
+    }
 }
 
-Data list_item_data(const ListItem *item)
-{
-    return (Data)0;
-}
+void list_insert_after(List* list, ListItem* item, int data) {
+    if (!item) return;
+    ListItem* new_item = new ListItem{ data, nullptr, nullptr };
+    new_item->next = item->next;
+    new_item->prev = item;
 
-ListItem *list_item_next(ListItem *item)
-{
-    return NULL;
+    if (item->next) {
+        item->next->prev = new_item;
+    }
+    else {
+        list->tail = new_item;
+    }
+    item->next = new_item;
 }
 
-ListItem *list_item_prev(ListItem *item)
-{
-    return NULL;
-}
+void list_erase_first(List* list) {
+    if (!list->head) return;
 
-ListItem *list_insert(List *list, Data data)
-{
-    return NULL;
-}
+    ListItem* to_delete = list->head;
+    list->head = list->head->next;
 
-ListItem *list_insert_after(List *list, ListItem *item, Data data)
-{
-    return NULL;
+    if (list->head) {
+        list->head->prev = nullptr;
+    }
+    else {
+        list->tail = nullptr;
+    }
+    delete to_delete;
 }
 
-ListItem *list_erase_first(List *list)
-{
-    return NULL;
+ListItem* list_first(const List* list) {
+    return list->head;
 }
 
-ListItem *list_erase_next(List *list, ListItem *item)
-{
-    return NULL;
+int list_item_data(const ListItem* item) {
+    return item ? item->data : 0;
 }
+
+ListItem* list_item_next(const ListItem* item) {
+    return item ? item->next : nullptr;
+}

LibraryCPP/list.h

@@ -1,45 +1,39 @@
 #ifndef LIST_H
 #define LIST_H
 
-// List
-// Stores integer values inside
-typedef int Data;
+struct ListItem {
+    int data;
+    ListItem* next;
+    ListItem* prev;
+};
 
-struct List;
-struct ListItem;
+struct List {
+    ListItem* head;
+    ListItem* tail;
+};
 
-// Creates new list
-List *list_create();
+// Ñîçäàåò íîâûé ñïèñîê
+List* list_create();
 
-// Destroys the list and frees the memory
-void list_delete(List *list);
+// Óäàëÿåò ñïèñîê
+void list_delete(List* list);
 
-// Retrieves the first item from the list
-ListItem *list_first(List *list);
+// Âñòàâëÿåò ýëåìåíò â íà÷àëî ñïèñêà
+void list_insert(List* list, int data);
 
-// Extracts data from the list item
-Data list_item_data(const ListItem *item);
+// Âñòàâëÿåò ýëåìåíò ïîñëå óêàçàííîãî óçëà
+void list_insert_after(List* list, ListItem* item, int data);
 
-// Returns list item following after the specified one
-ListItem *list_item_next(ListItem *item);
+// Óäàëÿåò ïåðâûé ýëåìåíò ñïèñêà
+void list_erase_first(List* list);
 
-// Returns previous element for the specified item.
-// Not applicable for the singly linked lists.
-ListItem *list_item_prev(ListItem *item);
+// Âîçâðàùàåò ïåðâûé ýëåìåíò ñïèñêà
+ListItem* list_first(const List* list);
 
-// Inserts new list item into the beginning
-ListItem *list_insert(List *list, Data data);
+// Âîçâðàùàåò äàííûå èç ýëåìåíòà ñïèñêà
+int list_item_data(const ListItem* item);
 
-// Inserts new list item after the specified item
-ListItem *list_insert_after(List *list, ListItem *item, Data data);
+// Âîçâðàùàåò ñëåäóþùèé ýëåìåíò ñïèñêà
+ListItem* list_item_next(const ListItem* item);
 
-// Deletes the first list item.
-// Returns pointer to the item next to the deleted one.
-ListItem *list_erase_first(List *list);
-
-// Deletes the list item following the specified one.
-// Returns pointer to the item next to the deleted one.
-// Should be O(1)
-ListItem *list_erase_next(List *list, ListItem *item);
-
-#endif
+#endif // LIST_H

LibraryCPP/queue.cpp

@@ -1,34 +1,44 @@
 #include "queue.h"
+#include <cstddef> // äëÿ NULL
 
-struct Queue
-{
-};
-
-Queue *queue_create()
-{
-    return new Queue;
+Queue* queue_create() {
+    Queue* queue = new Queue;
+    queue->list = list_create();
+    return queue;
 }
 
-void queue_delete(Queue *queue)
-{
-    // TODO: free queue items
+void queue_delete(Queue* queue) {
+    list_delete(queue->list);
     delete queue;
 }
 
-void queue_insert(Queue *queue, Data data)
-{
-}
+void queue_insert(Queue* queue, int data) {
+    if (!queue->list) return;
 
-Data queue_get(const Queue *queue)
-{
-    return (Data)0;
+    // Äîáàâëÿåì ýëåìåíò â êîíåö î÷åðåäè
+    if (list_first(queue->list) == nullptr) {
+        list_insert(queue->list, data); // Åñëè î÷åðåäü ïóñòà, äîáàâëÿåì â íà÷àëî
+    }
+    else {
+        ListItem* tail = queue->list->tail;
+        list_insert_after(queue->list, tail, data);
+    }
 }
 
-void queue_remove(Queue *queue)
-{
+int queue_get(const Queue* queue) {
+    if (queue_empty(queue)) return 0;
+
+    // Âîçâðàùàåì äàííûå ïåðâîãî ýëåìåíòà
+    return list_item_data(list_first(queue->list));
 }
 
-bool queue_empty(const Queue *queue)
-{
-    return true;
+void queue_remove(Queue* queue) {
+    if (!queue->list || queue_empty(queue)) return;
+
+    // Óäàëÿåì ïåðâûé ýëåìåíò ñïèñêà
+    list_erase_first(queue->list);
 }
+
+bool queue_empty(const Queue* queue) {
+    return list_first(queue->list) == nullptr;
+}

LibraryCPP/queue.h

@@ -1,30 +1,28 @@
 #ifndef QUEUE_H
 #define QUEUE_H
 
-// Queue
-// Stores integer values inside
-typedef int Data;
+#include "list.h"
 
-struct Queue;
+struct Queue {
+    List* list;
+};
 
-// Create empty queue
-Queue *queue_create();
+// Ñîçäàåò íîâóþ î÷åðåäü
+Queue* queue_create();
 
-// Deletes queue
-void queue_delete(Queue *queue);
+// Óäàëÿåò î÷åðåäü
+void queue_delete(Queue* queue);
 
-// Includes new element into the queue
-// Should be O(1) on average
-void queue_insert(Queue *queue, Data data);
+// Äîáàâëÿåò ýëåìåíò â êîíåö î÷åðåäè
+void queue_insert(Queue* queue, int data);
 
-// Retrieves first element from the queue
-Data queue_get(const Queue *queue);
+// Âîçâðàùàåò ïåðâûé ýëåìåíò î÷åðåäè
+int queue_get(const Queue* queue);
 
-// Removes first element from the queue
-// Should be O(1) on average
-void queue_remove(Queue *queue);
+// Óäàëÿåò ïåðâûé ýëåìåíò î÷åðåäè
+void queue_remove(Queue* queue);
 
-// Returns true if the queue is empty
-bool queue_empty(const Queue *queue);
+// Ïðîâåðÿåò, ïóñòà ëè î÷åðåäü
+bool queue_empty(const Queue* queue);
 
-#endif
+#endif // QUEUE_H