Skip to content

Commit 1646641

Browse files
rcarcassesrcarcasses
committed
chore: more type alias replacements
1 parent 92f5088 commit 1646641

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+83
-83
lines changed

‎libs/api/include/rtbot/FactoryOp.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using namespace std;
1616

1717
class FactoryOp {
1818
map<string, Program> programs;
19-
map<string, map<string, vector<Message<uint64_t, double>>>> messageBuffer;
19+
OperatorPayload<uint64_t, double> messageBuffer;
2020

2121
public:
2222
FactoryOp();
@@ -66,7 +66,7 @@ class FactoryOp {
6666
return true;
6767
}
6868

69-
map<string, map<string, vector<Message<uint64_t, double>>>> processMessageBuffer(const string& apId) {
69+
OperatorPayload<uint64_t, double> processMessageBuffer(const string& apId) {
7070
if (this->programs.count(apId) == 0) throw runtime_error("Program " + apId + " was not found");
7171
if (this->messageBuffer.count(apId) > 0) {
7272
if (!this->messageBuffer.at(apId).empty()) {
@@ -79,7 +79,7 @@ class FactoryOp {
7979
return {};
8080
}
8181

82-
map<string, map<string, vector<Message<uint64_t, double>>>> processMessageBufferDebug(const string& apId) {
82+
OperatorPayload<uint64_t, double> processMessageBufferDebug(const string& apId) {
8383
if (this->programs.count(apId) == 0) throw runtime_error("Program " + apId + " was not found");
8484
if (this->messageBuffer.count(apId) > 0) {
8585
if (!this->messageBuffer.at(apId).empty()) {
@@ -107,15 +107,15 @@ class FactoryOp {
107107
return this->programs.at(apId).getProgramOutputFilter();
108108
}
109109

110-
map<string, map<string, vector<Message<uint64_t, double>>>> processMessageMap(
111-
string const& apId, const map<string, vector<Message<uint64_t, double>>>& messagesMap) {
110+
OperatorPayload<uint64_t, double> processMessageMap(string const& apId,
111+
const PortPayload<uint64_t, double>& messagesMap) {
112112
auto it = programs.find(apId);
113113
if (it == programs.end()) return {};
114114
return it->second.receive(messagesMap);
115115
}
116116

117-
map<string, map<string, vector<Message<uint64_t, double>>>> processMessageMapDebug(
118-
string const& apId, const map<string, vector<Message<uint64_t, double>>>& messagesMap) {
117+
OperatorPayload<uint64_t, double> processMessageMapDebug(string const& apId,
118+
const PortPayload<uint64_t, double>& messagesMap) {
119119
auto it = programs.find(apId);
120120
if (it == programs.end()) return {};
121121
return it->second.receiveDebug(messagesMap);

‎libs/api/include/rtbot/Program.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ struct Program {
3737
map<string, vector<string>> getProgramOutputFilter() { return this->outputFilter; }
3838

3939
/// return a list of output ports from the output operator that emitted: id, output message
40-
map<string, map<string, vector<Message<uint64_t, double>>>> receive(
41-
const map<string, vector<Message<uint64_t, double>>>& messagesMap) {
42-
map<string, map<string, vector<Message<uint64_t, double>>>> opResults;
43-
map<string, map<string, vector<Message<uint64_t, double>>>> toReturn;
40+
OperatorPayload<uint64_t, double> receive(const PortPayload<uint64_t, double>& messagesMap) {
41+
OperatorPayload<uint64_t, double> opResults;
42+
OperatorPayload<uint64_t, double> toReturn;
4443

4544
opResults = receiveDebug(messagesMap);
4645

@@ -49,7 +48,7 @@ struct Program {
4948
auto outResults = opResults.at(op->first);
5049
for (int i = 0; i < op->second.size(); i++) {
5150
if (outResults.count(op->second.at(i)) > 0) {
52-
map<string, vector<Message<uint64_t, double>>> opReturn;
51+
PortPayload<uint64_t, double> opReturn;
5352
opReturn.emplace(op->second.at(i), outResults.at(op->second.at(i)));
5453
if (toReturn.count(op->first) == 0)
5554
toReturn.emplace(op->first, opReturn);
@@ -68,12 +67,11 @@ struct Program {
6867
}
6968

7069
/// return a list of the operator that emitted: id, output message
71-
map<string, map<string, vector<Message<uint64_t, double>>>> receiveDebug(
72-
const map<string, vector<Message<uint64_t, double>>>& messagesMap) {
70+
OperatorPayload<uint64_t, double> receiveDebug(const PortPayload<uint64_t, double>& messagesMap) {
7371
if (this->all_op.count(this->entryOperator) == 0)
7472
throw runtime_error("Entry operator " + this->entryOperator + " was not found");
7573

76-
map<string, map<string, vector<Message<uint64_t, double>>>> opResults;
74+
OperatorPayload<uint64_t, double> opResults;
7775

7876
for (auto it = messagesMap.begin(); it != messagesMap.end(); ++it) {
7977
for (int j = 0; j < it->second.size(); j++) {

‎libs/api/include/rtbot/bindings.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ string getProgramEntryOperatorId(const string& programId);
2727
string getProgramEntryPorts(const string& programId);
2828
string getProgramOutputFilter(const string& programId);
2929

30-
string processMessageMap(string const& programId, const map<string, vector<Message<uint64_t, double>>>& messagesMap);
31-
string processMessageMapDebug(string const& programId,
32-
const map<string, vector<Message<uint64_t, double>>>& messagesMap);
30+
string processMessageMap(string const& programId, const PortPayload<uint64_t, double>& messagesMap);
31+
string processMessageMapDebug(string const& programId, const PortPayload<uint64_t, double>& messagesMap);
3332

3433
string processBatch(string const& programId, vector<uint64_t> times, vector<double> values,
3534
vector<string> const& ports);

‎libs/api/src/bindings.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "rtbot/bindings.h"
22

33
#include <algorithm>
4+
#include <chrono>
45
#include <nlohmann/json-schema.hpp>
56
#include <nlohmann/json.hpp>
67
#include <optional>
78
#include <ostream>
8-
#include <chrono>
99

1010
#include "rtbot/FactoryOp.h"
1111

@@ -134,13 +134,12 @@ string getProgramOutputFilter(const string& programId) {
134134
return nlohmann::json(result).dump();
135135
}
136136

137-
string processMessageMap(const string& programId, const map<string, vector<Message<uint64_t, double>>>& messagesMap) {
137+
string processMessageMap(const string& programId, const PortPayload<uint64_t, double>& messagesMap) {
138138
auto result = factory.processMessageMap(programId, messagesMap);
139139
return nlohmann::json(result).dump();
140140
}
141141

142-
string processMessageMapDebug(string const& programId,
143-
const map<string, vector<Message<uint64_t, double>>>& messagesMap) {
142+
string processMessageMapDebug(string const& programId, const PortPayload<uint64_t, double>& messagesMap) {
144143
auto result = factory.processMessageMapDebug(programId, messagesMap);
145144
return nlohmann::json(result).dump();
146145
}
@@ -166,7 +165,8 @@ string processBatch(string const& programId, vector<uint64_t> times, vector<doub
166165
addBatchToMessageBuffers(programId, times, values, ports);
167166
/* auto t2 = high_resolution_clock::now(); */
168167
/* auto dt1 = duration_cast<nanoseconds>(t2 - t1); */
169-
/* cout << "[processBatch][" << dt1.count() << " ns] Added " << times.size() << " entries to message buffers" << endl; */
168+
/* cout << "[processBatch][" << dt1.count() << " ns] Added " << times.size() << " entries to message buffers" << endl;
169+
*/
170170

171171
auto result = factory.processMessageBuffer(programId);
172172
/* auto t3 = high_resolution_clock::now(); */

‎libs/api/test/test_bollinger_bands_generated.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TEST_CASE("read pipeline test bollinger_bands") {
4444
v.push_back(end);
4545

4646
for (int i = 0; i < v.size(); i++) {
47-
map<string, vector<Message<uint64_t, double>>> messagesMap;
47+
PortPayload<uint64_t, double> messagesMap;
4848
vector<Message<uint64_t, double>> x;
4949
x.push_back(Message<uint64_t, double>(v.at(i), v.at(i) * v.at(i)));
5050
messagesMap.emplace("i1", x);

‎libs/api/test/test_demultiplexer_pipeline.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ TEST_CASE("read pipeline test demultiplexer") {
2222

2323
// process the data
2424
for (int i = 1; i <= 100; i++) {
25-
map<string, vector<Message<uint64_t, double>>> messagesMap;
25+
PortPayload<uint64_t, double> messagesMap;
2626
vector<Message<uint64_t, double>> v;
2727
v.push_back(Message<uint64_t, double>(i, (i < 20) ? 1 : 2));
2828
messagesMap.emplace("i1", v);

‎libs/api/test/test_misc_pipeline.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TEST_CASE("read ppg pipeline") {
2626

2727
// process the data
2828
for (auto i = 0u; i < s.ti.size(); i++) {
29-
map<string, vector<Message<uint64_t, double>>> messagesMap;
29+
PortPayload<uint64_t, double> messagesMap;
3030
vector<Message<uint64_t, double>> v;
3131
v.push_back(Message<uint64_t, double>(s.ti[i], s.ppg[i]));
3232
messagesMap.emplace("i1", v);
@@ -44,7 +44,7 @@ TEST_CASE("read ppg pipeline") {
4444
REQUIRE(entryPipe1 == "in1");
4545
// process the data
4646
for (auto i = 0u; i < s.ti.size(); i++) {
47-
map<string, vector<Message<uint64_t, double>>> messagesMap;
47+
PortPayload<uint64_t, double> messagesMap;
4848
vector<Message<uint64_t, double>> v;
4949
v.push_back(Message<uint64_t, double>(s.ti[i], s.ppg[i]));
5050
messagesMap.emplace("i1", v);
@@ -70,7 +70,7 @@ TEST_CASE("read pipeline test data basic data") {
7070

7171
// process the data
7272
for (int i = 0; i < 100; i++) {
73-
map<string, vector<Message<uint64_t, double>>> messagesMap;
73+
PortPayload<uint64_t, double> messagesMap;
7474
vector<Message<uint64_t, double>> v;
7575
v.push_back(Message<uint64_t, double>(i, i % 5));
7676
messagesMap.emplace("i1", v);
@@ -104,7 +104,7 @@ TEST_CASE("read pipeline test join port") {
104104

105105
// process the data
106106
for (int i = 1; i < 100; i++) {
107-
map<string, vector<Message<uint64_t, double>>> messagesMap;
107+
PortPayload<uint64_t, double> messagesMap;
108108
vector<Message<uint64_t, double>> v;
109109
v.push_back(Message<uint64_t, double>(i, i % 5));
110110
messagesMap.emplace("i1", v);

‎libs/api/test/test_rsi_generated.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TEST_CASE("read pipeline test rsi") {
3535
// process the data
3636
int firstTime = 15;
3737
for (int i = 1; i < values.size(); i++) {
38-
map<string, vector<Message<uint64_t, double>>> messagesMap;
38+
PortPayload<uint64_t, double> messagesMap;
3939
vector<Message<uint64_t, double>> v;
4040
v.push_back(Message<uint64_t, double>(i, values.at(i - 1)));
4141
messagesMap.emplace("i1", v);

‎libs/core/include/rtbot/Message.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef MESSAGE_H
22
#define MESSAGE_H
33

4+
#include <map>
5+
#include <vector>
6+
47
namespace rtbot {
58

69
template <class T, class V>
@@ -20,6 +23,15 @@ bool operator==(Message<T, V> const& a, Message<T, V> const& b) {
2023
return a.time == b.time && a.value == b.value;
2124
}
2225

26+
template <class T, class V>
27+
using Messages = std::vector<Message<T, V>>;
28+
29+
template <class T, class V>
30+
using PortPayload = std::map<std::string, Messages<T, V>>;
31+
32+
template <class T, class V>
33+
using OperatorPayload = std::map<std::string, PortPayload<T, V>>;
34+
2335
} // namespace rtbot
2436

2537
#endif // MESSAGE_H

‎libs/core/include/rtbot/Operator.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ class Operator;
3434
template <class T, class V>
3535
using Op_ptr = unique_ptr<Operator<T, V>>;
3636

37-
template <class T, class V>
38-
using Messages = vector<Message<T, V>>;
39-
40-
template <class T, class V>
41-
using PortPayload = map<string, Messages<T, V>>;
42-
43-
template <class T, class V>
44-
using OperatorPayload = map<string, PortPayload<T, V>>;
45-
4637
template <class T, class V>
4738
class Operator {
4839
/********************************/

0 commit comments

Comments
 (0)