refactor: clean up

This commit is contained in:
Michael Mandl 2024-03-23 11:48:23 +01:00
parent e4c643880a
commit 0288e8de9d
Signed by: mandlm
GPG key ID: 4AA25D647AA54CC7

View file

@ -1,7 +1,9 @@
#include "word_list.h" #include "word_list.h"
#include <algorithm> #include <algorithm>
#include <cmath>
#include <fstream> #include <fstream>
#include <initializer_list>
#include <random> #include <random>
WordList &WordList::multiply(size_t factor) { WordList &WordList::multiply(size_t factor) {
@ -26,12 +28,12 @@ WordList &WordList::shuffle() {
} }
WordList WordList::oneCap() { WordList WordList::oneCap() {
const static std::string charset_ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; const static std::string charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
WordList word_list; WordList word_list;
word_list.reserve(charset_.length()); word_list.reserve(charset.length());
for (auto char_1 : charset_) { for (const auto char_1 : charset) {
word_list.emplace_back(std::initializer_list<char>({char_1})); word_list.emplace_back(std::initializer_list<char>({char_1}));
} }
@ -39,15 +41,15 @@ WordList WordList::oneCap() {
}; };
WordList WordList::fourCaps() { WordList WordList::fourCaps() {
const static std::string charset_ = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; const static std::string charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
WordList word_list; WordList word_list;
word_list.reserve(std::pow(charset_.length(), 4)); word_list.reserve(std::pow(charset.length(), 4));
for (auto char_1 : charset_) { for (const auto char_1 : charset) {
for (auto char_2 : charset_) { for (const auto char_2 : charset) {
for (auto char_3 : charset_) { for (const auto char_3 : charset) {
for (auto char_4 : charset_) { for (const auto char_4 : charset) {
word_list.emplace_back( word_list.emplace_back(
std::initializer_list<char>({char_1, char_2, char_3, char_4})); std::initializer_list<char>({char_1, char_2, char_3, char_4}));
} }