From 4c9ad7e81ee1ac7f5287747e1447402b648362cf Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister Date: Fri, 1 Jan 2021 18:06:04 +0100 Subject: [PATCH] names of sets are now displayed properly --- Assignment_2/FineList.cpp | 2 +- Assignment_2/LazyList.cpp | 2 +- Assignment_2/OptimisticList.cpp | 2 +- Assignment_2/Set.cpp | 10 +++++++--- Assignment_2/main.cpp | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Assignment_2/FineList.cpp b/Assignment_2/FineList.cpp index 2d0be09..2521a71 100644 --- a/Assignment_2/FineList.cpp +++ b/Assignment_2/FineList.cpp @@ -14,7 +14,7 @@ class FineSet:public Set { bool ctn(int element); }; -FineSet::FineSet() : Set() { } +FineSet::FineSet() : Set("FineSet") { } bool FineSet::add(int element) { this->first->lock(); diff --git a/Assignment_2/LazyList.cpp b/Assignment_2/LazyList.cpp index 1dcad98..b8f57ea 100644 --- a/Assignment_2/LazyList.cpp +++ b/Assignment_2/LazyList.cpp @@ -17,7 +17,7 @@ class LazySet:public Set { bool ctn(int element); }; -LazySet::LazySet() : Set() { } +LazySet::LazySet() : Set("LazySet") { } bool LazySet::add(int element) { Node* p; diff --git a/Assignment_2/OptimisticList.cpp b/Assignment_2/OptimisticList.cpp index 6d1c198..11c3e83 100644 --- a/Assignment_2/OptimisticList.cpp +++ b/Assignment_2/OptimisticList.cpp @@ -17,7 +17,7 @@ class OptimisticSet:public Set { }; -OptimisticSet::OptimisticSet() : Set() { } +OptimisticSet::OptimisticSet() : Set("OptimisticSet") { } bool OptimisticSet::add(int element) { Node* p; diff --git a/Assignment_2/Set.cpp b/Assignment_2/Set.cpp index 3b70de4..9e3981c 100644 --- a/Assignment_2/Set.cpp +++ b/Assignment_2/Set.cpp @@ -4,16 +4,20 @@ class Set { protected: - Set(); + 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(){ +Set::Set(std::string _name){ + name = _name; first = Node::Dummy(); Node* last = Node::Dummy(); first->next = last; -} \ No newline at end of file +} + diff --git a/Assignment_2/main.cpp b/Assignment_2/main.cpp index d9e0acd..25e3297 100644 --- a/Assignment_2/main.cpp +++ b/Assignment_2/main.cpp @@ -183,7 +183,7 @@ void benchmark(int minVal, int maxVal, benchmark_type b_type, int i){ std::cout << std::endl; for (Set* set : sets) { - std::cout << typeid(set).name(); + std::cout << set->get_name(); for (int thread_count : thread_counts) {