Skip to content

Commit fc17e99

Browse files
schlangsterschlangster
committed
refactor
1 parent b7ec9da commit fc17e99

14 files changed

Lines changed: 138 additions & 203 deletions

File tree

‎benchmarks/src/BenchmarkGrid.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class GridGraphGenerator
4040

4141
std::vector<size_t> widths;
4242

43-
void Generate(const ReactiveGroupBase& group)
43+
void Generate(const GroupBase& group)
4444
{
4545
assert(inputSignals.size() >= 1);
4646
assert(widths.size() >= 1);
@@ -132,7 +132,7 @@ struct BenchmarkParams_Grid
132132

133133
struct Benchmark_Grid
134134
{
135-
double Run(const BenchmarkParams_Grid& params, const ReactiveGroupBase& group)
135+
double Run(const BenchmarkParams_Grid& params, const GroupBase& group)
136136
{
137137
VarSignal<int, shared> in{ group, 1 };
138138
Signal<int, shared> in2 = in;

‎examples/src/BasicAlgorithms.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace example1
2222
using namespace std;
2323
using namespace react;
2424

25-
ReactiveGroup group;
25+
Group group;
2626

2727
struct Sensor
2828
{
@@ -62,7 +62,7 @@ namespace example2
6262
using namespace std;
6363
using namespace react;
6464

65-
ReactiveGroup group;
65+
Group group;
6666

6767
struct Employee
6868
{
@@ -96,7 +96,7 @@ namespace example3
9696
using namespace std;
9797
using namespace react;
9898

99-
ReactiveGroup group;
99+
Group group;
100100

101101
struct Counter
102102
{
@@ -137,7 +137,7 @@ namespace example4
137137
using namespace std;
138138
using namespace react;
139139

140-
ReactiveGroup group;
140+
Group group;
141141

142142
struct Sensor
143143
{
@@ -188,7 +188,7 @@ namespace example5
188188
using namespace std;
189189
using namespace react;
190190

191-
ReactiveGroup group;
191+
Group group;
192192

193193
enum ECmd { increment, decrement, reset };
194194

@@ -255,7 +255,7 @@ namespace example6
255255
using namespace std;
256256
using namespace react;
257257

258-
ReactiveGroup group;
258+
Group group;
259259

260260
class Sensor
261261
{

‎examples/src/BasicEvents.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace example1
2222
// Defines a group.
2323
// Each group represents a separate dependency graph.
2424
// Reactives from different groups can not be mixed.
25-
ReactiveGroup group;
25+
Group group;
2626

2727
// An event source that emits values of type string
2828
namespace v1
@@ -87,7 +87,7 @@ namespace example2
8787
using namespace std;
8888
using namespace react;
8989

90-
ReactiveGroup group;
90+
Group group;
9191

9292
// An event stream that merges both sources
9393
EventSource<> leftClick( group );
@@ -124,7 +124,7 @@ namespace example3
124124
using namespace std;
125125
using namespace react;
126126

127-
ReactiveGroup group;
127+
Group group;
128128

129129
EventSource<int> numbers( group );
130130

@@ -156,7 +156,7 @@ namespace example4
156156
using namespace std;
157157
using namespace react;
158158

159-
ReactiveGroup group;
159+
Group group;
160160

161161
// Data types
162162
enum class Tag { normal, critical };
@@ -206,7 +206,7 @@ namespace example5
206206
using namespace std;
207207
using namespace react;
208208

209-
ReactiveGroup group;
209+
Group group;
210210

211211
EventSource<int> src( group );
212212

‎examples/src/BasicObservers.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace example1
2020
using namespace std;
2121
using namespace react;
2222

23-
ReactiveGroup group;
23+
Group group;
2424

2525
VarSignal<int> x( group, 1 );
2626

@@ -50,7 +50,7 @@ namespace example2
5050
using namespace std;
5151
using namespace react;
5252

53-
ReactiveGroup group;
53+
Group group;
5454

5555
EventSource<> trigger( group );
5656

‎examples/src/BasicSignals.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace example1
2929
// Defines a group.
3030
// Each group represents a separate dependency graph.
3131
// Reactives from different groups can not be mixed.
32-
ReactiveGroup group;
32+
Group group;
3333

3434
// The two words
3535
VarSignal<string> firstWord( group, string("Change") );
@@ -64,7 +64,7 @@ namespace example2
6464
using namespace std;
6565
using namespace react;
6666

67-
ReactiveGroup group;
67+
Group group;
6868

6969
VarSignal<int> x( group, 1 );
7070

@@ -98,7 +98,7 @@ namespace example3
9898
int sumFunc(int a, int b)
9999
{ return a + b; }
100100

101-
ReactiveGroup group;
101+
Group group;
102102

103103
VarSignal<int> a( group, 1 );
104104
VarSignal<int> b( group, 1 );
@@ -136,7 +136,7 @@ namespace example4
136136
using namespace std;
137137
using namespace react;
138138

139-
ReactiveGroup group;
139+
Group group;
140140

141141
VarSignal<vector<string>> data( group );
142142

@@ -167,7 +167,7 @@ namespace example5
167167
using namespace std;
168168
using namespace react;
169169

170-
ReactiveGroup group;
170+
Group group;
171171

172172
// Helpers
173173
using ExprPairType = pair<string, int>;

‎examples/src/BasicSynchronization.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace example1
2121
using namespace react;
2222
using namespace std;
2323

24-
ReactiveGroup<> group;
24+
Group<> group;
2525

2626
class Sensor
2727
{
@@ -31,7 +31,7 @@ namespace example1
3131
Sensor(Sensor&&) = default;
3232
Sensor& operator=(Sensor&&) = default;
3333

34-
explicit Sensor(const ReactiveGroup<>& group) :
34+
explicit Sensor(const Group<>& group) :
3535
Samples( group )
3636
{ }
3737

‎examples/src/Main.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class GridGraphGenerator
3737

3838
std::vector<size_t> widths;
3939

40-
void Generate(const ReactiveGroup& group)
40+
void Generate(const Group& group)
4141
{
4242
assert(inputSignals.size() >= 1);
4343
assert(widths.size() >= 1);
@@ -162,7 +162,7 @@ template <typename T> T IterFunc2(EventRange<T> evts, T v, T a1, T a2)
162162

163163
int main2()
164164
{
165-
ReactiveGroup group;
165+
Group group;
166166

167167
{
168168
// Signals
@@ -228,8 +228,8 @@ int main2()
228228

229229
// Links
230230
{
231-
ReactiveGroup group1;
232-
ReactiveGroup group2;
231+
Group group1;
232+
Group group2;
233233

234234
VarSignal<int> s1{ group1, 10 };
235235
VarSignal<int> s2{ group2, 11 };
@@ -244,8 +244,8 @@ int main2()
244244
}
245245

246246
{
247-
ReactiveGroup group1;
248-
ReactiveGroup group2;
247+
Group group1;
248+
Group group2;
249249

250250
VarSignal<int> s1{ group1, 10 };
251251
VarSignal<int> s2{ group2, 11 };
@@ -269,8 +269,8 @@ int main2()
269269
}
270270

271271
{
272-
ReactiveGroup group1;
273-
ReactiveGroup group2;
272+
Group group1;
273+
Group group2;
274274

275275
VarSignal<int> s1{ group1, 10 };
276276
VarSignal<int> s2{ group2, 11 };
@@ -326,7 +326,7 @@ int main2()
326326

327327
int main()
328328
{
329-
ReactiveGroup group;
329+
Group group;
330330

331331
VarSignal<int> in{ group, 1 };
332332
Signal<int> in2 = in;
@@ -376,9 +376,9 @@ int main()
376376

377377
/*int main2()
378378
{
379-
ReactiveGroup group1;
380-
ReactiveGroup group2;
381-
ReactiveGroup group3;
379+
Group group1;
380+
Group group2;
381+
Group group3;
382382
383383
VarSignal<int> x{ 0, group1 };
384384
VarSignal<int> y{ 0, group2 };
@@ -420,8 +420,8 @@ int main3()
420420
using namespace std;
421421
using namespace react;
422422
423-
ReactiveGroup group1;
424-
ReactiveGroup group2;
423+
Group group1;
424+
Group group2;
425425
426426
auto sig1 = VarSignal<int>( 10, group1 );
427427

‎include/react/API.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ REACT_DEFINE_BITMASK_OPERATORS(TransactionFlags)
3737
///////////////////////////////////////////////////////////////////////////////////////////////////
3838

3939
// Groups
40-
class ReactiveGroup;
40+
class Group;
4141

4242
// Signals
4343
template <typename S>

0 commit comments

Comments
 (0)