Skip to content

Commit 46f73cf

Browse files
schlangsterschlangster
committed
Consistent naming scheme for engines.
1 parent ee88bc7 commit 46f73cf

14 files changed

Lines changed: 56 additions & 56 deletions

‎include/react/engine/PulseCountEngine.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,24 +134,24 @@ struct parallel;
134134
struct parallel_queue;
135135

136136
template <typename TMode>
137-
class PulseCountEngine;
137+
class PulsecountEngine;
138138

139-
template <> class PulseCountEngine<parallel> :
139+
template <> class PulsecountEngine<parallel> :
140140
public REACT_IMPL::pulsecount::BasicEngine {};
141141

142-
template <> class PulseCountEngine<parallel_queue> :
142+
template <> class PulsecountEngine<parallel_queue> :
143143
public REACT_IMPL::pulsecount::QueuingEngine {};
144144

145145
/******************************************/ REACT_END /******************************************/
146146

147147
/***************************************/ REACT_IMPL_BEGIN /**************************************/
148148

149149
template <typename> struct EnableNodeUpdateTimer;
150-
template <> struct EnableNodeUpdateTimer<PulseCountEngine<parallel>> : std::true_type {};
151-
template <> struct EnableNodeUpdateTimer<PulseCountEngine<parallel_queue>> : std::true_type {};
150+
template <> struct EnableNodeUpdateTimer<PulsecountEngine<parallel>> : std::true_type {};
151+
template <> struct EnableNodeUpdateTimer<PulsecountEngine<parallel_queue>> : std::true_type {};
152152

153153
template <typename> struct EnableParallelUpdating;
154-
template <> struct EnableParallelUpdating<PulseCountEngine<parallel>> : std::true_type {};
155-
template <> struct EnableParallelUpdating<PulseCountEngine<parallel_queue>> : std::true_type {};
154+
template <> struct EnableParallelUpdating<PulsecountEngine<parallel>> : std::true_type {};
155+
template <> struct EnableParallelUpdating<PulsecountEngine<parallel_queue>> : std::true_type {};
156156

157157
/****************************************/ REACT_IMPL_END /***************************************/

‎src/benchmark/Main.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "react/logging/EventLog.h"
2525

2626
#include "react/engine/ToposortEngine.h"
27-
#include "react/engine/PulseCountEngine.h"
27+
#include "react/engine/PulsecountEngine.h"
2828
#include "react/engine/SubtreeEngine.h"
2929

3030
///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -34,22 +34,22 @@ using namespace react;
3434

3535
REACTIVE_DOMAIN(ToposortSTDomain, ToposortEngine<sequential>);
3636
REACTIVE_DOMAIN(ToposortDomain, ToposortEngine<parallel>);
37-
REACTIVE_DOMAIN(PulseCountDomain, PulseCountEngine<parallel>);
37+
REACTIVE_DOMAIN(PulsecountDomain, PulsecountEngine<parallel>);
3838
REACTIVE_DOMAIN(SubtreeDomain, SubtreeEngine<parallel>);
3939

4040
void runBenchmarkGrid(std::ostream& out)
4141
{
4242
RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(20, 10000),
43-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
43+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
4444

4545
RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(30, 10000),
46-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
46+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
4747

4848
RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(40, 10000),
49-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
49+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
5050

5151
RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(50, 10000),
52-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
52+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
5353
}
5454

5555
void runBenchmarkRandom(std::ostream& out)
@@ -68,7 +68,7 @@ void runBenchmarkRandom(std::ostream& out)
6868
{
6969
int x = (slowPercent * (w*(h-1))) / 100;
7070
//RUN_BENCHMARK(out, 5, Benchmark_Random, BenchmarkParams_Random(w, h, 20, 0, 10, 40, x, true, seed1, seed2),
71-
// ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
71+
// ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
7272

7373
RUN_BENCHMARK(out, 5, Benchmark_Random, BenchmarkParams_Random(w, h, 20, 0, 10, 40, x, true, seed1, seed2),
7474
ToposortSTDomain);
@@ -82,43 +82,43 @@ void runBenchmarkRandom(std::ostream& out)
8282
void runBenchmarkFanout(std::ostream& out)
8383
{
8484
//RUN_BENCHMARK(out, 5, Benchmark_Fanout, BenchmarkParams_Fanout(10, 10000, 0),
85-
// ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
85+
// ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
8686

8787
//RUN_BENCHMARK(out, 5, Benchmark_Fanout, BenchmarkParams_Fanout(100, 10000, 0),
88-
// ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
88+
// ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
8989

9090
//RUN_BENCHMARK(out, 5, Benchmark_Fanout, BenchmarkParams_Fanout(1000, 10000, 0),
91-
// ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
91+
// ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
9292

9393
RUN_BENCHMARK(out, 3, Benchmark_Fanout, BenchmarkParams_Fanout(10, 10, 10),
94-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
94+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
9595

9696
RUN_BENCHMARK(out, 3, Benchmark_Fanout, BenchmarkParams_Fanout(100, 10, 10),
97-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
97+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
9898

9999
RUN_BENCHMARK(out, 3, Benchmark_Fanout, BenchmarkParams_Fanout(1000, 10, 10),
100-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
100+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
101101
}
102102

103103
void runBenchmarkSequence(std::ostream& out)
104104
{
105105
//RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(10, 10000, 0),
106-
// ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
106+
// ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
107107

108108
//RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(100, 10000, 0),
109-
// ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
109+
// ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
110110

111111
//RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(1000, 10000, 0),
112-
// ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
112+
// ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
113113

114114
RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(10, 10, 10),
115-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
115+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
116116

117117
RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(100, 10, 10),
118-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
118+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
119119

120120
RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(1000, 10, 10),
121-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
121+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
122122
}
123123

124124
void runBenchmarkLifeSim(std::ostream& out)
@@ -127,13 +127,13 @@ void runBenchmarkLifeSim(std::ostream& out)
127127
// ELMDomain);
128128

129129
//RUN_BENCHMARK(std::cout, 1, Benchmark_LifeSim, BenchmarkParams_LifeSim(250, 30, 10000),
130-
// SourceSetDomain, PulseCountDomain);
130+
// SourceSetDomain, PulsecountDomain);
131131

132132
RUN_BENCHMARK(out, 1, Benchmark_LifeSim, BenchmarkParams_LifeSim(100, 15, 10000),
133-
ToposortSTDomain, ToposortDomain, PulseCountDomain);
133+
ToposortSTDomain, ToposortDomain, PulsecountDomain);
134134

135135
//RUN_BENCHMARK(out, 3, Benchmark_LifeSim, BenchmarkParams_LifeSim(100, 50, 100),
136-
// PulseCountDomain, PulseCountDomain);
136+
// PulsecountDomain, PulsecountDomain);
137137
}
138138

139139
void runBenchmarks()
@@ -165,10 +165,10 @@ void runBenchmarks()
165165

166166
void debugBenchmarks()
167167
{
168-
using TestDomain = PulseCountDomain;
168+
using TestDomain = PulsecountDomain;
169169

170170
RUN_BENCHMARK(std::cout, 3, Benchmark_Grid, BenchmarkParams_Grid(30, 1),
171-
PulseCountDomain);
171+
PulsecountDomain);
172172

173173
//RUN_BENCHMARK(std::cout, 1, Benchmark_Fanout, BenchmarkParams_Fanout(1000, 5, 0),
174174
// TestDomain);
@@ -215,14 +215,14 @@ void profileBenchmark()
215215
{
216216
RUN_BENCHMARK(std::cout, 3, Benchmark_Grid, BenchmarkParams_Grid(30, 10000),
217217
ToposortSTDomain);
218-
//ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SubtreeDomain, SourceSetDomain);
218+
//ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SubtreeDomain, SourceSetDomain);
219219

220220
//RUN_BENCHMARK(std::cout, 1, Benchmark_Grid, BenchmarkParams_Grid(30, 10000),
221221
// SourceSetDomain);
222222

223223
//RUN_BENCHMARK(std::cout, 1, Benchmark_Random, BenchmarkParams_Random(20, 11, 100, 0, 5, 80, 20, false, 41556, 21624),
224224
//SubtreeDomain);
225-
//ToposortSTDomain, ToposortDomain, PulseCountDomain, SubtreeDomain);
225+
//ToposortSTDomain, ToposortDomain, PulsecountDomain, SubtreeDomain);
226226

227227
//RUN_BENCHMARK(std::cout, 1, Benchmark_LifeSim, BenchmarkParams_LifeSim(100, 15, 10000),
228228
// ToposortDomain);

src/engine/PulseCountEngine.cpp renamed to src/engine/PulseCountEngine_.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// (See accompanying file LICENSE_1_0.txt or copy at
55
// http://www.boost.org/LICENSE_1_0.txt)
66

7-
#include "react/engine/PulseCountEngine.h"
7+
#include "react/engine/PulsecountEngine.h"
88

99
#include <cstdint>
1010
#include <utility>
@@ -182,7 +182,7 @@ Turn::Turn(TurnIdT id, TurnFlagsT flags) :
182182
}
183183

184184
///////////////////////////////////////////////////////////////////////////////////////////////////
185-
/// PulseCountEngine
185+
/// PulsecountEngine
186186
///////////////////////////////////////////////////////////////////////////////////////////////////
187187

188188
template <typename TTurn>

‎src/engine/SubtreeEngine.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Turn::Turn(TurnIdT id, TurnFlagsT flags) :
3030
}
3131

3232
///////////////////////////////////////////////////////////////////////////////////////////////////
33-
/// PulseCountEngine
33+
/// PulsecountEngine
3434
///////////////////////////////////////////////////////////////////////////////////////////////////
3535

3636
template <typename TTurn>

‎src/sandbox/Main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ REACTIVE_DOMAIN(D);
3131

3232
// Explicit engine:
3333
//#include "react/engine/SubtreeEngine.h"
34-
//#include "react/engine/PulseCountEngine.h"
34+
//#include "react/engine/PulsecountEngine.h"
3535

36-
//REACTIVE_DOMAIN(D, PulseCountEngine<parallel>);
36+
//REACTIVE_DOMAIN(D, PulsecountEngine<parallel>);
3737

3838
void SignalExample0()
3939
{

‎src/test/EventStreamTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "EventStreamTest.h"
88

9-
#include "react/engine/PulseCountEngine.h"
9+
#include "react/engine/PulsecountEngine.h"
1010
#include "react/engine/ToposortEngine.h"
1111
#include "react/engine/SubtreeEngine.h"
1212

@@ -17,7 +17,7 @@ using namespace react;
1717

1818
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, EventStreamTest, ToposortEngine<sequential>);
1919
INSTANTIATE_TYPED_TEST_CASE_P(ParToposort, EventStreamTest, ToposortEngine<parallel>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, EventStreamTest, PulseCountEngine<parallel>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(Pulsecount, EventStreamTest, PulsecountEngine<parallel>);
2121
INSTANTIATE_TYPED_TEST_CASE_P(Subtree, EventStreamTest, SubtreeEngine<parallel>);
2222

2323
} // ~namespace

‎src/test/EventStreamTestQ.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "EventStreamTest.h"
88

9-
#include "react/engine/PulseCountEngine.h"
9+
#include "react/engine/PulsecountEngine.h"
1010
#include "react/engine/ToposortEngine.h"
1111
#include "react/engine/SubtreeEngine.h"
1212

@@ -17,7 +17,7 @@ using namespace react;
1717

1818
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, EventStreamTest, ToposortEngine<sequential_queue>);
1919
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, EventStreamTest, ToposortEngine<parallel_queue>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, EventStreamTest, PulseCountEngine<parallel_queue>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, EventStreamTest, PulsecountEngine<parallel_queue>);
2121
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortP, EventStreamTest, ToposortEngine<parallel_pipeline>);
2222
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, EventStreamTest, SubtreeEngine<parallel_queue>);
2323

‎src/test/ObserverTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "ObserverTest.h"
88

9-
#include "react/engine/PulseCountEngine.h"
9+
#include "react/engine/PulsecountEngine.h"
1010
#include "react/engine/ToposortEngine.h"
1111
#include "react/engine/SubtreeEngine.h"
1212

@@ -17,7 +17,7 @@ using namespace react;
1717

1818
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, ObserverTest, ToposortEngine<sequential>);
1919
INSTANTIATE_TYPED_TEST_CASE_P(ParToposort, ObserverTest, ToposortEngine<parallel>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, ObserverTest, PulseCountEngine<parallel>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(Pulsecount, ObserverTest, PulsecountEngine<parallel>);
2121
INSTANTIATE_TYPED_TEST_CASE_P(Subtree, ObserverTest, SubtreeEngine<parallel>);
2222

2323
} // ~namespace

‎src/test/ObserverTestQ.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "ObserverTest.h"
88

9-
#include "react/engine/PulseCountEngine.h"
9+
#include "react/engine/PulsecountEngine.h"
1010
#include "react/engine/ToposortEngine.h"
1111
#include "react/engine/SubtreeEngine.h"
1212

@@ -17,7 +17,7 @@ using namespace react;
1717

1818
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, ObserverTest, ToposortEngine<sequential_queue>);
1919
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortQ, ObserverTest, ToposortEngine<parallel_queue>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, ObserverTest, PulseCountEngine<parallel_queue>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(PulsecountQ, ObserverTest, PulsecountEngine<parallel_queue>);
2121
INSTANTIATE_TYPED_TEST_CASE_P(ParToposortP, ObserverTest, ToposortEngine<parallel_pipeline>);
2222
INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, ObserverTest, SubtreeEngine<parallel_queue>);
2323

‎src/test/OperationsTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "OperationsTest.h"
88

9-
#include "react/engine/PulseCountEngine.h"
9+
#include "react/engine/PulsecountEngine.h"
1010
#include "react/engine/ToposortEngine.h"
1111
#include "react/engine/SubtreeEngine.h"
1212

@@ -17,7 +17,7 @@ using namespace react;
1717

1818
INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, OperationsTest, ToposortEngine<sequential>);
1919
INSTANTIATE_TYPED_TEST_CASE_P(ParToposort, OperationsTest, ToposortEngine<parallel>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, OperationsTest, PulseCountEngine<parallel>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(Pulsecount, OperationsTest, PulsecountEngine<parallel>);
2121
INSTANTIATE_TYPED_TEST_CASE_P(Subtree, OperationsTest, SubtreeEngine<parallel>);
2222

2323
} // ~namespace

0 commit comments

Comments
 (0)