Implements List collection type for safe access to vector.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-03-22 17:09:25 +01:00
parent e6d58723fc
commit 5e9ffa0d69
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
3 changed files with 112 additions and 2 deletions

View File

@ -8,8 +8,7 @@ namespace Arbutils::Collections {
private: private:
std::unordered_map<KeyT, ValueT> _map; std::unordered_map<KeyT, ValueT> _map;
using iterator = typename std::unordered_map<KeyT, ValueT, std::hash<KeyT>, std::equal_to<KeyT>, using iterator = typename std::unordered_map<KeyT, ValueT>::iterator;
std::allocator<std::pair<const KeyT, ValueT>>>::iterator;
public: public:
Dictionary() : _map() {} Dictionary() : _map() {}
explicit Dictionary(size_t capacity) : _map(capacity) {} explicit Dictionary(size_t capacity) : _map(capacity) {}

62
src/Collections/List.hpp Normal file
View File

@ -0,0 +1,62 @@
#ifndef ARBUTILS_LIST_HPP
#define ARBUTILS_LIST_HPP
#include <sstream>
#include <stdexcept>
#include <vector>
#include <algorithm>
namespace Arbutils::Collections {
template <class ValueT> class List {
private:
std::vector<ValueT> _vector;
using iterator = typename std::vector<ValueT>::iterator;
public:
List() : _vector() {}
explicit List(size_t capacity) : _vector(capacity) {}
List(const std::initializer_list<ValueT>& l) : _vector(l) {}
inline const ValueT& At(size_t index) const {
#ifndef NO_ASSERT
if (index >= _vector.size()) {
std::stringstream ss;
ss << "Index " << index << " is out of bounds.";
throw std::logic_error(ss.str());
}
#endif
return _vector.at(index);
}
inline ValueT& At(size_t index) {
#ifndef NO_ASSERT
if (index >= _vector.size()) {
std::stringstream ss;
ss << "Index " << index << " is out of bounds.";
throw std::logic_error(ss.str());
}
#endif
return _vector.at(index);
}
inline bool Contains(ValueT value){
return std::find(_vector.begin(), _vector.end(), value) != _vector.end();
}
inline void Append(ValueT value) { _vector.push_back(value); }
inline void Insert(size_t index, ValueT value) { _vector.insert(index, value); }
inline ValueT& operator[](size_t index) { return At(index); }
inline const ValueT& operator[](size_t index) const { return At(index); }
inline size_t Count() { return _vector.size(); }
iterator begin() { return _vector.begin(); }
iterator begin() const { return _vector.begin(); }
iterator end() { return _vector.end(); }
iterator end() const { return _vector.end(); }
};
}
#endif // ARBUTILS_LIST_HPP

49
tests/ListTests.cpp Normal file
View File

@ -0,0 +1,49 @@
#ifdef TESTS_BUILD
#include "../extern/catch.hpp"
#include "../src/Collections/List.hpp"
using namespace Arbutils::Collections;
TEST_CASE("Create List, insert values", "[Utilities]") {
auto ls = List<int>();
ls.Append(5);
ls.Append(100);
ls.Append(200);
ls.Append(500);
}
TEST_CASE("Create List from initializer list", "[Utilities]") {
auto ls = List<int>({5, 200, 1500, -500});
CHECK(ls.At(0) == 5);
CHECK(ls.At(1) == 200);
CHECK(ls.At(2) == 1500);
CHECK(ls.At(3) == -500);
}
TEST_CASE("Create List, insert values, retrieve values", "[Utilities]") {
auto ls = List<int>();
ls.Append(5);
ls.Append(100);
ls.Append(200);
ls.Append(500);
CHECK(ls.At(0) == 5);
CHECK(ls.At(1) == 100);
CHECK(ls.At(2) == 200);
CHECK(ls.At(3) == 500);
}
TEST_CASE("Create List, insert values, iterate over values", "[Utilities]") {
auto ls = List<int>();
ls.Append(5);
ls.Append(100);
ls.Append(200);
ls.Append(500);
for (auto v: ls){
CHECK(ls.Contains(v));
}
}
#endif