From 6485a3b3d63ccbeaa2969405adf5463720a11ef6 Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister Date: Fri, 8 Jan 2021 17:17:32 +0100 Subject: [PATCH] update filenames --- Assignment_3/lib/ADT_Stack.cpp | 5 +++++ Assignment_3/lib/CMakeLists.txt | 2 +- Assignment_3/lib/Set.h | 16 ---------------- Assignment_3/lib/{Set.cpp => Stack.cpp} | 14 ++++++-------- Assignment_3/lib/Stack.h | 15 +++++++++++++++ Assignment_3/main.cpp | 15 ++++++--------- 6 files changed, 33 insertions(+), 34 deletions(-) create mode 100644 Assignment_3/lib/ADT_Stack.cpp delete mode 100644 Assignment_3/lib/Set.h rename Assignment_3/lib/{Set.cpp => Stack.cpp} (51%) create mode 100644 Assignment_3/lib/Stack.h diff --git a/Assignment_3/lib/ADT_Stack.cpp b/Assignment_3/lib/ADT_Stack.cpp new file mode 100644 index 0000000..1e0e258 --- /dev/null +++ b/Assignment_3/lib/ADT_Stack.cpp @@ -0,0 +1,5 @@ +class Stack { + void push(int element, bool output); + void pop(int element, bool output); + void size(int element, bool output); +}; \ No newline at end of file diff --git a/Assignment_3/lib/CMakeLists.txt b/Assignment_3/lib/CMakeLists.txt index 025fcda..be8e6f8 100644 --- a/Assignment_3/lib/CMakeLists.txt +++ b/Assignment_3/lib/CMakeLists.txt @@ -1 +1 @@ -add_library(sets STATIC Node.h Node.cpp Set.h Set.cpp ) +add_library(sets STATIC Node.h Node.cpp Stack.h Stack.cpp ADT_Stack.cpp ) diff --git a/Assignment_3/lib/Set.h b/Assignment_3/lib/Set.h deleted file mode 100644 index 356d46c..0000000 --- a/Assignment_3/lib/Set.h +++ /dev/null @@ -1,16 +0,0 @@ -#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(); - std::string print_set(); -}; \ No newline at end of file diff --git a/Assignment_3/lib/Set.cpp b/Assignment_3/lib/Stack.cpp similarity index 51% rename from Assignment_3/lib/Set.cpp rename to Assignment_3/lib/Stack.cpp index 18fab2d..f67c011 100644 --- a/Assignment_3/lib/Set.cpp +++ b/Assignment_3/lib/Stack.cpp @@ -1,21 +1,19 @@ -#include "Set.h" +#include "Stack.h" #include "Node.h" #include #include -Set::Set(std::string _name){ - name = _name; +Stack::Stack(std::string _name){ first = Node::Dummy(); first->next = Node::Dummy(); } -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; } +bool Stack::push(int element) { return false; } +bool Stack::pop(int element) { return false; } +bool Stack::size(int element) { return false; } -std::string Set::print_set(){ +std::string Stack::print_stack(){ Node* c = this->first->next; std::stringstream ss; while (!c->is_dummy()) { diff --git a/Assignment_3/lib/Stack.h b/Assignment_3/lib/Stack.h new file mode 100644 index 0000000..e3b95b9 --- /dev/null +++ b/Assignment_3/lib/Stack.h @@ -0,0 +1,15 @@ +#pragma once + +#include "Node.h" + +class Stack { + protected: + std::string name; + Stack(std::string _name); + Node* first; + public: + bool push(int element); + bool pop(int element); + bool size(int element); + std::string print_stack(); +}; \ No newline at end of file diff --git a/Assignment_3/main.cpp b/Assignment_3/main.cpp index ebc4f54..400dd74 100644 --- a/Assignment_3/main.cpp +++ b/Assignment_3/main.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include using namespace std::chrono; @@ -16,22 +16,19 @@ using namespace std::chrono; #define OP_COUNT 100000 -enum methodname {add, rmv, ctn, noop}; +enum methodname {push, pop, size, noop}; typedef struct _operation{ methodname method; int input; } operation; -void do_operation(operation* op, Set* set) { +void do_operation(operation* op, Stack* set) { switch (op->method) { - case methodname::ctn: - set->ctn(op->input); + case methodname::push: break; - case methodname::add: - set->add(op->input); + case methodname::pop: break; - case methodname::rmv: - set->rmv(op->input); + case methodname::size: break; default: break;