From a2b836f5926ccb9ebc14ecd718c45715a8470713 Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister Date: Sat, 2 Jan 2021 16:10:06 +0100 Subject: [PATCH] add header file for set --- Assignment_2/lib/CMakeLists.txt | 2 +- Assignment_2/lib/FineList.cpp | 2 +- Assignment_2/lib/LazyList.cpp | 4 +--- Assignment_2/lib/MultiSet.cpp | 4 +--- Assignment_2/lib/Node.cpp | 2 -- Assignment_2/lib/OptimisticList.cpp | 4 +--- Assignment_2/lib/Set.cpp | 19 +++++-------------- Assignment_2/lib/Set.h | 15 +++++++++++++++ 8 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 Assignment_2/lib/Set.h diff --git a/Assignment_2/lib/CMakeLists.txt b/Assignment_2/lib/CMakeLists.txt index af3ee6d..783c4a7 100644 --- a/Assignment_2/lib/CMakeLists.txt +++ b/Assignment_2/lib/CMakeLists.txt @@ -1 +1 @@ -add_library(sets STATIC Node.h Node.cpp Set.cpp FineList.cpp LazyList.cpp OptimisticList.cpp MultiSet.cpp ) +add_library(sets STATIC Node.h Node.cpp Set.h 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 9ab00fa..9aa44d4 100644 --- a/Assignment_2/lib/FineList.cpp +++ b/Assignment_2/lib/FineList.cpp @@ -3,7 +3,7 @@ #include #include"Node.h" -#include"Set.cpp" +#include"Set.h" class FineSet:public Set { Node* first; diff --git a/Assignment_2/lib/LazyList.cpp b/Assignment_2/lib/LazyList.cpp index 9b76e5e..624ade6 100644 --- a/Assignment_2/lib/LazyList.cpp +++ b/Assignment_2/lib/LazyList.cpp @@ -1,9 +1,7 @@ -#pragma once - #include #include"Node.h" -#include"Set.cpp" +#include"Set.h" class LazySet:public Set { protected: diff --git a/Assignment_2/lib/MultiSet.cpp b/Assignment_2/lib/MultiSet.cpp index e78f3f3..fb6de26 100644 --- a/Assignment_2/lib/MultiSet.cpp +++ b/Assignment_2/lib/MultiSet.cpp @@ -1,9 +1,7 @@ -#pragma once - #include #include"Node.h" -#include"Set.cpp" +#include"Set.h" class MultiSet:public Set { Node* first; diff --git a/Assignment_2/lib/Node.cpp b/Assignment_2/lib/Node.cpp index deda468..354c0c2 100644 --- a/Assignment_2/lib/Node.cpp +++ b/Assignment_2/lib/Node.cpp @@ -1,5 +1,3 @@ -#pragma once - #include #include diff --git a/Assignment_2/lib/OptimisticList.cpp b/Assignment_2/lib/OptimisticList.cpp index ef058d7..3a1535b 100644 --- a/Assignment_2/lib/OptimisticList.cpp +++ b/Assignment_2/lib/OptimisticList.cpp @@ -1,9 +1,7 @@ -#pragma once - #include #include"Node.h" -#include"Set.cpp" +#include"Set.h" class OptimisticSet:public Set { protected: diff --git a/Assignment_2/lib/Set.cpp b/Assignment_2/lib/Set.cpp index 4646078..ae23437 100644 --- a/Assignment_2/lib/Set.cpp +++ b/Assignment_2/lib/Set.cpp @@ -1,19 +1,6 @@ -#pragma once - +#include "Set.h" #include "Node.h" -class Set { - protected: - std::string name; - Set(std::string _name); - Node* first; - public: - bool add(int element) { return false; }; - bool rmv(int element) { return false; }; - bool ctn(int element) { return false; }; - std::string get_name() { return name; }; -}; - Set::Set(std::string _name){ name = _name; first = Node::Dummy(); @@ -21,3 +8,7 @@ Set::Set(std::string _name){ first->next = last; } +bool Set::add(int element) { return false; } +bool Set::rmv(int element) { return false; } +bool Set::ctn(int element) { return false; } +std::string Set::get_name() { return name; } diff --git a/Assignment_2/lib/Set.h b/Assignment_2/lib/Set.h new file mode 100644 index 0000000..48dc103 --- /dev/null +++ b/Assignment_2/lib/Set.h @@ -0,0 +1,15 @@ +#pragma once + +#include "Node.h" + +class Set { + protected: + std::string name; + Set(std::string _name); + Node* first; + public: + bool add(int element); + bool rmv(int element); + bool ctn(int element); + std::string get_name(); +}; \ No newline at end of file