From 004e7a9cd68fa69a8bd060a5822d9f587689e98a Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister Date: Sat, 2 Jan 2021 15:37:05 +0100 Subject: [PATCH] Create header file for Node --- Assignment_2/lib/CMakeLists.txt | 2 +- Assignment_2/lib/FineList.cpp | 2 +- Assignment_2/lib/LazyList.cpp | 2 +- Assignment_2/lib/MultiSet.cpp | 2 +- Assignment_2/lib/Node.cpp | 23 +---------------------- Assignment_2/lib/Node.h | 24 ++++++++++++++++++++++++ Assignment_2/lib/OptimisticList.cpp | 2 +- Assignment_2/lib/Set.cpp | 2 +- 8 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 Assignment_2/lib/Node.h diff --git a/Assignment_2/lib/CMakeLists.txt b/Assignment_2/lib/CMakeLists.txt index ae08c07..af3ee6d 100644 --- a/Assignment_2/lib/CMakeLists.txt +++ b/Assignment_2/lib/CMakeLists.txt @@ -1 +1 @@ -add_library(sets STATIC FineList.cpp LazyList.cpp OptimisticList.cpp MultiSet.cpp Node.cpp Set.cpp) +add_library(sets STATIC Node.h Node.cpp Set.cpp FineList.cpp LazyList.cpp OptimisticList.cpp MultiSet.cpp ) diff --git a/Assignment_2/lib/FineList.cpp b/Assignment_2/lib/FineList.cpp index 2521a71..9ab00fa 100644 --- a/Assignment_2/lib/FineList.cpp +++ b/Assignment_2/lib/FineList.cpp @@ -2,7 +2,7 @@ #include -#include"Node.cpp" +#include"Node.h" #include"Set.cpp" class FineSet:public Set { diff --git a/Assignment_2/lib/LazyList.cpp b/Assignment_2/lib/LazyList.cpp index b8f57ea..9b76e5e 100644 --- a/Assignment_2/lib/LazyList.cpp +++ b/Assignment_2/lib/LazyList.cpp @@ -2,7 +2,7 @@ #include -#include"Node.cpp" +#include"Node.h" #include"Set.cpp" class LazySet:public Set { diff --git a/Assignment_2/lib/MultiSet.cpp b/Assignment_2/lib/MultiSet.cpp index 2fe537f..e78f3f3 100644 --- a/Assignment_2/lib/MultiSet.cpp +++ b/Assignment_2/lib/MultiSet.cpp @@ -2,7 +2,7 @@ #include -#include"Node.cpp" +#include"Node.h" #include"Set.cpp" class MultiSet:public Set { diff --git a/Assignment_2/lib/Node.cpp b/Assignment_2/lib/Node.cpp index 0e21df6..deda468 100644 --- a/Assignment_2/lib/Node.cpp +++ b/Assignment_2/lib/Node.cpp @@ -1,28 +1,7 @@ #pragma once #include - -class Node { - protected: - int data; - bool is_dummy; - std::mutex mut; - - public: - Node* next; - bool deleted; - - Node(int element); - static Node* Dummy(); - // Dummy(); - - void lock(); - void unlock(); - bool is_smaller_than(int n); - bool is_smaller_than(Node* n); - bool is_equal(int n); -}; - +#include Node::Node(int element){ data = element; diff --git a/Assignment_2/lib/Node.h b/Assignment_2/lib/Node.h new file mode 100644 index 0000000..03f8aa3 --- /dev/null +++ b/Assignment_2/lib/Node.h @@ -0,0 +1,24 @@ +#pragma once + +#include + +class Node { + protected: + int data; + bool is_dummy; + std::mutex mut; + + public: + Node* next; + bool deleted; + + Node(int element); + static Node* Dummy(); + // Dummy(); + + void lock(); + void unlock(); + bool is_smaller_than(int n); + bool is_smaller_than(Node* n); + bool is_equal(int n); +}; \ No newline at end of file diff --git a/Assignment_2/lib/OptimisticList.cpp b/Assignment_2/lib/OptimisticList.cpp index 11c3e83..ef058d7 100644 --- a/Assignment_2/lib/OptimisticList.cpp +++ b/Assignment_2/lib/OptimisticList.cpp @@ -2,7 +2,7 @@ #include -#include"Node.cpp" +#include"Node.h" #include"Set.cpp" class OptimisticSet:public Set { diff --git a/Assignment_2/lib/Set.cpp b/Assignment_2/lib/Set.cpp index 9e3981c..4646078 100644 --- a/Assignment_2/lib/Set.cpp +++ b/Assignment_2/lib/Set.cpp @@ -1,6 +1,6 @@ #pragma once -#include "Node.cpp" +#include "Node.h" class Set { protected: