Skip to content

Commit eb37900

Browse files
committed
Remove leaky abstraction
1 parent c0aa073 commit eb37900

File tree

10 files changed

+201
-350
lines changed

10 files changed

+201
-350
lines changed

include/queryosity.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,4 @@
2828
#include "queryosity/todo.h"
2929
#include "queryosity/todo_varied.h"
3030

31-
#include "queryosity/systematic_vary.h"
32-
3331
namespace qty = queryosity;

include/queryosity/action.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace queryosity {
66

7-
class action : public systematic::mode {
7+
class action {
88

99
public:
1010
action() = default;

include/queryosity/dataflow.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,7 @@ class dataflow::node {
397397
#include "column_variation.h"
398398
#include "query_output.h"
399399

400-
#include "systematic_nominal.h"
401400
#include "systematic_resolver.h"
402-
#include "systematic_variation.h"
403401

404402
inline queryosity::dataflow::dataflow()
405403
: m_processor(multithread::disable()), m_weight(1.0), m_nrows(-1),

include/queryosity/dataset_loaded.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ template <typename DS> class loaded {
4141
#include "dataset_column.h"
4242
#include "lazy.h"
4343
#include "lazy_varied.h"
44-
#include "systematic_variation.h"
4544

4645
template <typename DS>
4746
queryosity::dataset::loaded<DS>::loaded(queryosity::dataflow &df, DS &ds)

include/queryosity/lazy_varied.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ queryosity::varied<queryosity::lazy<Act>>::operator=(
161161
template <typename Act>
162162
void queryosity::varied<queryosity::lazy<Act>>::set_variation(
163163
const std::string &var_name, queryosity::lazy<Act> var) {
164-
ensemble::invoke(
165-
[var_name](action *act) { act->set_variation_name(var_name); },
166-
var.get_slots());
167164
m_var_map.insert(std::make_pair(var_name, std::move(var)));
168165
m_var_names.insert(var_name);
169166
}

include/queryosity/systematic.h

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,6 @@ auto get_variation_names(Nodes const &...nodes) -> std::set<std::string>;
1515

1616
template <typename Node> class resolver;
1717

18-
template <typename Lzy> class variation;
19-
20-
template <typename Lzy> class nominal;
21-
22-
class mode {
23-
public:
24-
mode();
25-
~mode() = default;
26-
27-
void set_variation_name(const std::string &var_name);
28-
29-
bool is_nominal() const;
30-
std::string variation_name() const;
31-
32-
protected:
33-
bool m_is_nominal;
34-
std::string m_variation_name;
35-
};
36-
3718
} // namespace systematic
3819

3920
} // namespace queryosity
@@ -44,21 +25,4 @@ auto queryosity::systematic::get_variation_names(Nodes const &...nodes)
4425
std::set<std::string> variation_names;
4526
(variation_names.merge(nodes.get_variation_names()), ...);
4627
return variation_names;
47-
}
48-
49-
inline queryosity::systematic::mode::mode()
50-
: m_is_nominal(true), m_variation_name("") {}
51-
52-
inline void
53-
queryosity::systematic::mode::set_variation_name(const std::string &var_name) {
54-
m_is_nominal = false;
55-
;
56-
m_variation_name = var_name;
57-
}
58-
59-
inline bool queryosity::systematic::mode::is_nominal() const {
60-
return m_variation_name.empty();
61-
}
62-
inline std::string queryosity::systematic::mode::variation_name() const {
63-
return m_variation_name;
6428
}

include/queryosity/systematic_nominal.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

include/queryosity/systematic_variation.h

Lines changed: 0 additions & 44 deletions
This file was deleted.

include/queryosity/systematic_vary.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)