Skip to content

Commit 3fe3597

Browse files
schlangsterschlangster
committed
Added TopoSort<parallel_pipelining> to testcases.
1 parent 0724a1a commit 3fe3597

9 files changed

Lines changed: 5 additions & 18 deletions

‎src/test/EventStreamTest.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,6 @@ INSTANTIATE_TYPED_TEST_CASE_P(Flooding, EventStreamTest, FloodingEngine<parallel
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELM, EventStreamTest, ELMEngine<parallel>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, EventStreamTest, PulseCountEngine<parallel>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, EventStreamTest, SourceSetEngine<parallel>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, EventStreamTest, PulseCountO1Engine<parallel>);
2220

2321
// ---
2422
}

‎src/test/EventStreamTestQ.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, EventStreamTest, FloodingEngine<paralle
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, EventStreamTest, ELMEngine<parallel_queuing>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, EventStreamTest, PulseCountEngine<parallel_queuing>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, EventStreamTest, SourceSetEngine<parallel_queuing>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, EventStreamTest, PulseCountO1Engine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortP, EventStreamTest, TopoSortEngine<parallel_pipelining>);
2221

2322
// ---
2423
}

‎src/test/ObserverTest.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,6 @@ INSTANTIATE_TYPED_TEST_CASE_P(Flooding, ObserverTest, FloodingEngine<parallel>);
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELM, ObserverTest, ELMEngine<parallel>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, ObserverTest, PulseCountEngine<parallel>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, ObserverTest, SourceSetEngine<parallel>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, ObserverTest, PulseCountO1Engine<parallel>);
2220

2321
// ---
2422
}

‎src/test/ObserverTestQ.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, ObserverTest, FloodingEngine<parallel_q
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, ObserverTest, ELMEngine<parallel_queuing>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, ObserverTest, PulseCountEngine<parallel_queuing>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, ObserverTest, SourceSetEngine<parallel_queuing>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, ObserverTest, PulseCountO1Engine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortP, ObserverTest, TopoSortEngine<parallel_pipelining>);
2221

2322
// ---
2423
}

‎src/test/OperationsTest.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,6 +17,5 @@ INSTANTIATE_TYPED_TEST_CASE_P(Flooding, OperationsTest, FloodingEngine<parallel>
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELM, OperationsTest, ELMEngine<parallel>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, OperationsTest, PulseCountEngine<parallel>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, OperationsTest, SourceSetEngine<parallel>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, OperationsTest, PulseCountO1Engine<parallel>);
2220

2321
} // ~namespace

‎src/test/OperationsTestQ.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,6 +17,6 @@ INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, OperationsTest, FloodingEngine<parallel
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, OperationsTest, ELMEngine<parallel_queuing>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, OperationsTest, PulseCountEngine<parallel_queuing>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, OperationsTest, SourceSetEngine<parallel_queuing>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, OperationsTest, PulseCountO1Engine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortP, OperationsTest, TopoSortEngine<parallel_pipelining>);
2221

2322
} // ~namespace

‎src/test/SignalTest.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,6 @@ INSTANTIATE_TYPED_TEST_CASE_P(Flooding, SignalTest, FloodingEngine<parallel>);
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELM, SignalTest, ELMEngine<parallel>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, SignalTest, PulseCountEngine<parallel>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, SignalTest, SourceSetEngine<parallel>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, SignalTest, PulseCountO1Engine<parallel>);
2220

2321
// ---
2422
}

‎src/test/SignalTestQ.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -18,7 +17,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, SignalTest, FloodingEngine<parallel_que
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, SignalTest, ELMEngine<parallel_queuing>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, SignalTest, PulseCountEngine<parallel_queuing>);
2019
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, SignalTest, SourceSetEngine<parallel_queuing>);
21-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, SignalTest, PulseCountO1Engine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortP, SignalTest, TopoSortEngine<parallel_pipelining>);
2221

2322
// ---
2423
}

‎src/test/TransactionTest.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
//#include "react/propagation/PulseCountO1Engine.h"
87
#include "react/propagation/ELMEngine.h"
98

109
////////////////////////////////////////////////////////////////////////////////////////
@@ -17,8 +16,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSort, TransactionTest, TopoSortEngine<paral
1716
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, TransactionTest, FloodingEngine<parallel_queuing>);
1817
INSTANTIATE_TYPED_TEST_CASE_P(ELM, TransactionTest, ELMEngine<parallel_queuing>);
1918
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, TransactionTest, PulseCountEngine<parallel_queuing>);
20-
//INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, TransactionTest, PulseCountO1Engine<parallel_queuing>);
2119
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, TransactionTest, SourceSetEngine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortP, TransactionTest, TopoSortEngine<parallel_pipelining>);
2221

2322
// ---
2423
}

0 commit comments

Comments
 (0)