Consistent naming scheme for engines. · stdgregwar/cpp.react@46f73cf · GitHub

stdgregwar / cpp.react Public

forked from snakster/cpp.react

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 46f73cf

Browse filesBrowse the repository at this point in the historyBrowse files

schlangster

committed

Consistent naming scheme for engines.

1 parent ee88bc7 commit 46f73cf
Copy full SHA for 46f73cf

14 files changed

+56-56Lines changed: 56 additions & 56 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• include/react/engine
  • PulseCountEngine.h
• src
  • benchmark
    • Main.cpp
  • engine
    • PulseCountEngine_.cpp
    • SubtreeEngine.cpp
  • sandbox
    • Main.cpp
  • test
    • EventStreamTest.cpp
    • EventStreamTestQ.cpp
    • ObserverTest.cpp
    • ObserverTestQ.cpp
    • OperationsTest.cpp
    • OperationsTestQ.cpp
    • SignalTest.cpp
    • SignalTestQ.cpp
    • TransactionTest.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎include/react/engine/PulseCountEngine.h‎

Copy file name to clipboardExpand all lines: include/react/engine/PulseCountEngine.h

+7-7Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
@@ -134,24 +134,24 @@ struct parallel;
134	134	struct parallel_queue;
135	135
136	136	template <typename TMode>
137		- class PulseCountEngine;
	137	+ class PulsecountEngine;
138	138
139		- template <> class PulseCountEngine<parallel> :
	139	+ template <> class PulsecountEngine<parallel> :
140	140	public REACT_IMPL::pulsecount::BasicEngine {};
141	141
142		- template <> class PulseCountEngine<parallel_queue> :
	142	+ template <> class PulsecountEngine<parallel_queue> :
143	143	public REACT_IMPL::pulsecount::QueuingEngine {};
144	144
145	145	/******************************************/ REACT_END /******************************************/
146	146
147	147	/***************************************/ REACT_IMPL_BEGIN /**************************************/
148	148
149	149	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 {};
152	152
153	153	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 {};
156	156
157	157	/****************************************/ REACT_IMPL_END /***************************************/

Collapse file

‎src/benchmark/Main.cpp‎

Copy file name to clipboardExpand all lines: src/benchmark/Main.cpp

+26-26Lines changed: 26 additions & 26 deletions

Original file line number	Diff line number	Diff line change
@@ -24,7 +24,7 @@
24	24	#include "react/logging/EventLog.h"
25	25
26	26	#include "react/engine/ToposortEngine.h"
27		- #include "react/engine/PulseCountEngine.h"
	27	+ #include "react/engine/PulsecountEngine.h"
28	28	#include "react/engine/SubtreeEngine.h"
29	29
30	30	///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -34,22 +34,22 @@ using namespace react;
34	34
35	35	REACTIVE_DOMAIN(ToposortSTDomain, ToposortEngine<sequential>);
36	36	REACTIVE_DOMAIN(ToposortDomain, ToposortEngine<parallel>);
37		- REACTIVE_DOMAIN(PulseCountDomain, PulseCountEngine<parallel>);
	37	+ REACTIVE_DOMAIN(PulsecountDomain, PulsecountEngine<parallel>);
38	38	REACTIVE_DOMAIN(SubtreeDomain, SubtreeEngine<parallel>);
39	39
40	40	void runBenchmarkGrid(std::ostream& out)
41	41	{
42	42	RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(20, 10000),
43		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	43	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
44	44
45	45	RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(30, 10000),
46		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	46	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
47	47
48	48	RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(40, 10000),
49		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	49	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
50	50
51	51	RUN_BENCHMARK(out, 5, Benchmark_Grid, BenchmarkParams_Grid(50, 10000),
52		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	52	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
53	53	}
54	54
55	55	void runBenchmarkRandom(std::ostream& out)
@@ -68,7 +68,7 @@ void runBenchmarkRandom(std::ostream& out)
68	68	{
69	69	int x = (slowPercent * (w*(h-1))) / 100;
70	70	//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);
72	72
73	73	RUN_BENCHMARK(out, 5, Benchmark_Random, BenchmarkParams_Random(w, h, 20, 0, 10, 40, x, true, seed1, seed2),
74	74	ToposortSTDomain);
@@ -82,43 +82,43 @@ void runBenchmarkRandom(std::ostream& out)
82	82	void runBenchmarkFanout(std::ostream& out)
83	83	{
84	84	//RUN_BENCHMARK(out, 5, Benchmark_Fanout, BenchmarkParams_Fanout(10, 10000, 0),
85		- // ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
	85	+ // ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
86	86
87	87	//RUN_BENCHMARK(out, 5, Benchmark_Fanout, BenchmarkParams_Fanout(100, 10000, 0),
88		- // ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
	88	+ // ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
89	89
90	90	//RUN_BENCHMARK(out, 5, Benchmark_Fanout, BenchmarkParams_Fanout(1000, 10000, 0),
91		- // ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
	91	+ // ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
92	92
93	93	RUN_BENCHMARK(out, 3, Benchmark_Fanout, BenchmarkParams_Fanout(10, 10, 10),
94		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	94	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
95	95
96	96	RUN_BENCHMARK(out, 3, Benchmark_Fanout, BenchmarkParams_Fanout(100, 10, 10),
97		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	97	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
98	98
99	99	RUN_BENCHMARK(out, 3, Benchmark_Fanout, BenchmarkParams_Fanout(1000, 10, 10),
100		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	100	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
101	101	}
102	102
103	103	void runBenchmarkSequence(std::ostream& out)
104	104	{
105	105	//RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(10, 10000, 0),
106		- // ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
	106	+ // ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
107	107
108	108	//RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(100, 10000, 0),
109		- // ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
	109	+ // ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
110	110
111	111	//RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(1000, 10000, 0),
112		- // ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SourceSetDomain);
	112	+ // ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SourceSetDomain);
113	113
114	114	RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(10, 10, 10),
115		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	115	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
116	116
117	117	RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(100, 10, 10),
118		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	118	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
119	119
120	120	RUN_BENCHMARK(out, 3, Benchmark_Sequence, BenchmarkParams_Sequence(1000, 10, 10),
121		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	121	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
122	122	}
123	123
124	124	void runBenchmarkLifeSim(std::ostream& out)
@@ -127,13 +127,13 @@ void runBenchmarkLifeSim(std::ostream& out)
127	127	// ELMDomain);
128	128
129	129	//RUN_BENCHMARK(std::cout, 1, Benchmark_LifeSim, BenchmarkParams_LifeSim(250, 30, 10000),
130		- // SourceSetDomain, PulseCountDomain);
	130	+ // SourceSetDomain, PulsecountDomain);
131	131
132	132	RUN_BENCHMARK(out, 1, Benchmark_LifeSim, BenchmarkParams_LifeSim(100, 15, 10000),
133		- ToposortSTDomain, ToposortDomain, PulseCountDomain);
	133	+ ToposortSTDomain, ToposortDomain, PulsecountDomain);
134	134
135	135	//RUN_BENCHMARK(out, 3, Benchmark_LifeSim, BenchmarkParams_LifeSim(100, 50, 100),
136		- // PulseCountDomain, PulseCountDomain);
	136	+ // PulsecountDomain, PulsecountDomain);
137	137	}
138	138
139	139	void runBenchmarks()
@@ -165,10 +165,10 @@ void runBenchmarks()
165	165
166	166	void debugBenchmarks()
167	167	{
168		- using TestDomain = PulseCountDomain;
	168	+ using TestDomain = PulsecountDomain;
169	169
170	170	RUN_BENCHMARK(std::cout, 3, Benchmark_Grid, BenchmarkParams_Grid(30, 1),
171		- PulseCountDomain);
	171	+ PulsecountDomain);
172	172
173	173	//RUN_BENCHMARK(std::cout, 1, Benchmark_Fanout, BenchmarkParams_Fanout(1000, 5, 0),
174	174	// TestDomain);
@@ -215,14 +215,14 @@ void profileBenchmark()
215	215	{
216	216	RUN_BENCHMARK(std::cout, 3, Benchmark_Grid, BenchmarkParams_Grid(30, 10000),
217	217	ToposortSTDomain);
218		- //ToposortSTDomain, ToposortDomain, ELMDomain, PulseCountDomain, SubtreeDomain, SourceSetDomain);
	218	+ //ToposortSTDomain, ToposortDomain, ELMDomain, PulsecountDomain, SubtreeDomain, SourceSetDomain);
219	219
220	220	//RUN_BENCHMARK(std::cout, 1, Benchmark_Grid, BenchmarkParams_Grid(30, 10000),
221	221	// SourceSetDomain);
222	222
223	223	//RUN_BENCHMARK(std::cout, 1, Benchmark_Random, BenchmarkParams_Random(20, 11, 100, 0, 5, 80, 20, false, 41556, 21624),
224	224	//SubtreeDomain);
225		- //ToposortSTDomain, ToposortDomain, PulseCountDomain, SubtreeDomain);
	225	+ //ToposortSTDomain, ToposortDomain, PulsecountDomain, SubtreeDomain);
226	226
227	227	//RUN_BENCHMARK(std::cout, 1, Benchmark_LifeSim, BenchmarkParams_LifeSim(100, 15, 10000),
228	228	// ToposortDomain);

Collapse file

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

Copy file name to clipboardExpand all lines: src/engine/PulseCountEngine_.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@
4	4	// (See accompanying file LICENSE_1_0.txt or copy at
5	5	// http://www.boost.org/LICENSE_1_0.txt)
6	6
7		- #include "react/engine/PulseCountEngine.h"
	7	+ #include "react/engine/PulsecountEngine.h"
8	8
9	9	#include <cstdint>
10	10	#include <utility>
@@ -182,7 +182,7 @@ Turn::Turn(TurnIdT id, TurnFlagsT flags) :
182	182	}
183	183
184	184	///////////////////////////////////////////////////////////////////////////////////////////////////
185		- /// PulseCountEngine
	185	+ /// PulsecountEngine
186	186	///////////////////////////////////////////////////////////////////////////////////////////////////
187	187
188	188	template <typename TTurn>

Collapse file

‎src/engine/SubtreeEngine.cpp‎

Copy file name to clipboardExpand all lines: src/engine/SubtreeEngine.cpp

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -30,7 +30,7 @@ Turn::Turn(TurnIdT id, TurnFlagsT flags) :
30	30	}
31	31
32	32	///////////////////////////////////////////////////////////////////////////////////////////////////
33		- /// PulseCountEngine
	33	+ /// PulsecountEngine
34	34	///////////////////////////////////////////////////////////////////////////////////////////////////
35	35
36	36	template <typename TTurn>

Collapse file

‎src/sandbox/Main.cpp‎

Copy file name to clipboardExpand all lines: src/sandbox/Main.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -31,9 +31,9 @@ REACTIVE_DOMAIN(D);
31	31
32	32	// Explicit engine:
33	33	//#include "react/engine/SubtreeEngine.h"
34		- //#include "react/engine/PulseCountEngine.h"
	34	+ //#include "react/engine/PulsecountEngine.h"
35	35
36		- //REACTIVE_DOMAIN(D, PulseCountEngine<parallel>);
	36	+ //REACTIVE_DOMAIN(D, PulsecountEngine<parallel>);
37	37
38	38	void SignalExample0()
39	39	{

Collapse file

‎src/test/EventStreamTest.cpp‎

Copy file name to clipboardExpand all lines: src/test/EventStreamTest.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -6,7 +6,7 @@
6	6
7	7	#include "EventStreamTest.h"
8	8
9		- #include "react/engine/PulseCountEngine.h"
	9	+ #include "react/engine/PulsecountEngine.h"
10	10	#include "react/engine/ToposortEngine.h"
11	11	#include "react/engine/SubtreeEngine.h"
12	12
@@ -17,7 +17,7 @@ using namespace react;
17	17
18	18	INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, EventStreamTest, ToposortEngine<sequential>);
19	19	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>);
21	21	INSTANTIATE_TYPED_TEST_CASE_P(Subtree, EventStreamTest, SubtreeEngine<parallel>);
22	22
23	23	} // ~namespace

Collapse file

‎src/test/EventStreamTestQ.cpp‎

Copy file name to clipboardExpand all lines: src/test/EventStreamTestQ.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -6,7 +6,7 @@
6	6
7	7	#include "EventStreamTest.h"
8	8
9		- #include "react/engine/PulseCountEngine.h"
	9	+ #include "react/engine/PulsecountEngine.h"
10	10	#include "react/engine/ToposortEngine.h"
11	11	#include "react/engine/SubtreeEngine.h"
12	12
@@ -17,7 +17,7 @@ using namespace react;
17	17
18	18	INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, EventStreamTest, ToposortEngine<sequential_queue>);
19	19	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>);
21	21	INSTANTIATE_TYPED_TEST_CASE_P(ParToposortP, EventStreamTest, ToposortEngine<parallel_pipeline>);
22	22	INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, EventStreamTest, SubtreeEngine<parallel_queue>);
23	23

Collapse file

‎src/test/ObserverTest.cpp‎

Copy file name to clipboardExpand all lines: src/test/ObserverTest.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -6,7 +6,7 @@
6	6
7	7	#include "ObserverTest.h"
8	8
9		- #include "react/engine/PulseCountEngine.h"
	9	+ #include "react/engine/PulsecountEngine.h"
10	10	#include "react/engine/ToposortEngine.h"
11	11	#include "react/engine/SubtreeEngine.h"
12	12
@@ -17,7 +17,7 @@ using namespace react;
17	17
18	18	INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, ObserverTest, ToposortEngine<sequential>);
19	19	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>);
21	21	INSTANTIATE_TYPED_TEST_CASE_P(Subtree, ObserverTest, SubtreeEngine<parallel>);
22	22
23	23	} // ~namespace

Collapse file

‎src/test/ObserverTestQ.cpp‎

Copy file name to clipboardExpand all lines: src/test/ObserverTestQ.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -6,7 +6,7 @@
6	6
7	7	#include "ObserverTest.h"
8	8
9		- #include "react/engine/PulseCountEngine.h"
	9	+ #include "react/engine/PulsecountEngine.h"
10	10	#include "react/engine/ToposortEngine.h"
11	11	#include "react/engine/SubtreeEngine.h"
12	12
@@ -17,7 +17,7 @@ using namespace react;
17	17
18	18	INSTANTIATE_TYPED_TEST_CASE_P(SeqToposortQ, ObserverTest, ToposortEngine<sequential_queue>);
19	19	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>);
21	21	INSTANTIATE_TYPED_TEST_CASE_P(ParToposortP, ObserverTest, ToposortEngine<parallel_pipeline>);
22	22	INSTANTIATE_TYPED_TEST_CASE_P(SubtreeQ, ObserverTest, SubtreeEngine<parallel_queue>);
23	23

Collapse file

‎src/test/OperationsTest.cpp‎

Copy file name to clipboardExpand all lines: src/test/OperationsTest.cpp

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -6,7 +6,7 @@
6	6
7	7	#include "OperationsTest.h"
8	8
9		- #include "react/engine/PulseCountEngine.h"
	9	+ #include "react/engine/PulsecountEngine.h"
10	10	#include "react/engine/ToposortEngine.h"
11	11	#include "react/engine/SubtreeEngine.h"
12	12
@@ -17,7 +17,7 @@ using namespace react;
17	17
18	18	INSTANTIATE_TYPED_TEST_CASE_P(SeqToposort, OperationsTest, ToposortEngine<sequential>);
19	19	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>);
21	21	INSTANTIATE_TYPED_TEST_CASE_P(Subtree, OperationsTest, SubtreeEngine<parallel>);
22	22
23	23	} // ~namespace

0 commit comments

Comments

0 (0)