diff options
author | 2023-08-19 03:14:50 +0200 | |
---|---|---|
committer | 2023-08-19 03:14:50 +0200 | |
commit | d48a3d35bdcc6dcb15730e8daddfeec737df38b9 (patch) | |
tree | 56c1a6fe443767892b9508285ad66f73ec0dd91a /subprojects/viatra-runtime-rete | |
parent | refactor: remove unused VIATRA code (diff) | |
download | refinery-d48a3d35bdcc6dcb15730e8daddfeec737df38b9.tar.gz refinery-d48a3d35bdcc6dcb15730e8daddfeec737df38b9.tar.zst refinery-d48a3d35bdcc6dcb15730e8daddfeec737df38b9.zip |
refactor: merge VIATRA subprojects
Since we remove EMF dependencies, there is no point to maintaining a base index
separate from the rest of the runtime.
Diffstat (limited to 'subprojects/viatra-runtime-rete')
3 files changed, 15 insertions, 22 deletions
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java index a9863400..19e02f10 100644 --- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java +++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java | |||
@@ -3,36 +3,31 @@ | |||
3 | * This program and the accompanying materials are made available under the | 3 | * This program and the accompanying materials are made available under the |
4 | * terms of the Eclipse Public License v. 2.0 which is available at | 4 | * terms of the Eclipse Public License v. 2.0 which is available at |
5 | * http://www.eclipse.org/legal/epl-v20.html. | 5 | * http://www.eclipse.org/legal/epl-v20.html. |
6 | * | 6 | * |
7 | * SPDX-License-Identifier: EPL-2.0 | 7 | * SPDX-License-Identifier: EPL-2.0 |
8 | *******************************************************************************/ | 8 | *******************************************************************************/ |
9 | package tools.refinery.viatra.runtime.rete.aggregation.timely; | 9 | package tools.refinery.viatra.runtime.rete.aggregation.timely; |
10 | 10 | ||
11 | import java.util.Collections; | ||
12 | import java.util.Map; | ||
13 | import java.util.Map.Entry; | ||
14 | import java.util.Objects; | ||
15 | import java.util.TreeMap; | ||
16 | |||
17 | import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator; | 11 | import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator; |
18 | import tools.refinery.viatra.runtime.matchers.tuple.Tuple; | 12 | import tools.refinery.viatra.runtime.matchers.tuple.Tuple; |
19 | import tools.refinery.viatra.runtime.matchers.tuple.TupleMask; | 13 | import tools.refinery.viatra.runtime.matchers.tuple.TupleMask; |
20 | import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory; | 14 | import tools.refinery.viatra.runtime.matchers.util.*; |
21 | import tools.refinery.viatra.runtime.matchers.util.Direction; | ||
22 | import tools.refinery.viatra.runtime.matchers.util.IDeltaBag; | ||
23 | import tools.refinery.viatra.runtime.matchers.util.Preconditions; | ||
24 | import tools.refinery.viatra.runtime.matchers.util.Signed; | ||
25 | import tools.refinery.viatra.runtime.matchers.util.timeline.Diff; | 15 | import tools.refinery.viatra.runtime.matchers.util.timeline.Diff; |
26 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate; | 16 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate; |
27 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState; | 17 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState; |
28 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState; | ||
29 | import tools.refinery.viatra.runtime.rete.network.ReteContainer; | 18 | import tools.refinery.viatra.runtime.rete.network.ReteContainer; |
30 | import tools.refinery.viatra.runtime.rete.network.communication.Timestamp; | 19 | import tools.refinery.viatra.runtime.rete.network.communication.Timestamp; |
31 | import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode; | 20 | import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode; |
32 | 21 | ||
22 | import java.util.Collections; | ||
23 | import java.util.Map; | ||
24 | import java.util.Map.Entry; | ||
25 | import java.util.Objects; | ||
26 | import java.util.TreeMap; | ||
27 | |||
33 | /** | 28 | /** |
34 | * Faithful column aggregator with parallel aggregation architecture. | 29 | * Faithful column aggregator with parallel aggregation architecture. |
35 | * | 30 | * |
36 | * @author Tamas Szabo | 31 | * @author Tamas Szabo |
37 | * @since 2.4 | 32 | * @since 2.4 |
38 | * | 33 | * |
@@ -214,4 +209,4 @@ public class FaithfulParallelTimelyColumnAggregatorNode<Domain, Accumulator, Agg | |||
214 | 209 | ||
215 | } | 210 | } |
216 | 211 | ||
217 | } \ No newline at end of file | 212 | } |
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java index 666b2051..cf2c2b2d 100644 --- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java +++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java | |||
@@ -3,7 +3,7 @@ | |||
3 | * This program and the accompanying materials are made available under the | 3 | * This program and the accompanying materials are made available under the |
4 | * terms of the Eclipse Public License v. 2.0 which is available at | 4 | * terms of the Eclipse Public License v. 2.0 which is available at |
5 | * http://www.eclipse.org/legal/epl-v20.html. | 5 | * http://www.eclipse.org/legal/epl-v20.html. |
6 | * | 6 | * |
7 | * SPDX-License-Identifier: EPL-2.0 | 7 | * SPDX-License-Identifier: EPL-2.0 |
8 | *******************************************************************************/ | 8 | *******************************************************************************/ |
9 | package tools.refinery.viatra.runtime.rete.aggregation.timely; | 9 | package tools.refinery.viatra.runtime.rete.aggregation.timely; |
@@ -25,14 +25,13 @@ import tools.refinery.viatra.runtime.matchers.util.Signed; | |||
25 | import tools.refinery.viatra.runtime.matchers.util.timeline.Diff; | 25 | import tools.refinery.viatra.runtime.matchers.util.timeline.Diff; |
26 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.CumulativeAggregate; | 26 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.CumulativeAggregate; |
27 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.FoldingState; | 27 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.FoldingState; |
28 | import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState; | ||
29 | import tools.refinery.viatra.runtime.rete.network.ReteContainer; | 28 | import tools.refinery.viatra.runtime.rete.network.ReteContainer; |
30 | import tools.refinery.viatra.runtime.rete.network.communication.Timestamp; | 29 | import tools.refinery.viatra.runtime.rete.network.communication.Timestamp; |
31 | import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode; | 30 | import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode; |
32 | 31 | ||
33 | /** | 32 | /** |
34 | * Faithful column aggregator with sequential aggregation architecture. | 33 | * Faithful column aggregator with sequential aggregation architecture. |
35 | * | 34 | * |
36 | * @author Tamas Szabo | 35 | * @author Tamas Szabo |
37 | * @since 2.4 | 36 | * @since 2.4 |
38 | * | 37 | * |
@@ -277,4 +276,4 @@ public class FaithfulSequentialTimelyColumnAggregatorNode<Domain, Accumulator, A | |||
277 | 276 | ||
278 | } | 277 | } |
279 | 278 | ||
280 | } \ No newline at end of file | 279 | } |
diff --git a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java index 5c72ba39..baf7270f 100644 --- a/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java +++ b/subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java | |||
@@ -3,13 +3,12 @@ | |||
3 | * This program and the accompanying materials are made available under the | 3 | * This program and the accompanying materials are made available under the |
4 | * terms of the Eclipse Public License v. 2.0 which is available at | 4 | * terms of the Eclipse Public License v. 2.0 which is available at |
5 | * http://www.eclipse.org/legal/epl-v20.html. | 5 | * http://www.eclipse.org/legal/epl-v20.html. |
6 | * | 6 | * |
7 | * SPDX-License-Identifier: EPL-2.0 | 7 | * SPDX-License-Identifier: EPL-2.0 |
8 | *******************************************************************************/ | 8 | *******************************************************************************/ |
9 | package tools.refinery.viatra.runtime.rete.network.mailbox.timeless; | 9 | package tools.refinery.viatra.runtime.rete.network.mailbox.timeless; |
10 | 10 | ||
11 | import java.util.Map; | 11 | import java.util.Map; |
12 | import java.util.Map.Entry; | ||
13 | 12 | ||
14 | import tools.refinery.viatra.runtime.matchers.tuple.Tuple; | 13 | import tools.refinery.viatra.runtime.matchers.tuple.Tuple; |
15 | import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory; | 14 | import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory; |
@@ -28,7 +27,7 @@ import tools.refinery.viatra.runtime.rete.network.mailbox.Mailbox; | |||
28 | * <p> | 27 | * <p> |
29 | * Usually, the mailbox performs counting of messages so that they can cancel each other out. However, if marked as a | 28 | * Usually, the mailbox performs counting of messages so that they can cancel each other out. However, if marked as a |
30 | * fall-through mailbox, than update messages are delivered directly to the receiver node to reduce overhead. | 29 | * fall-through mailbox, than update messages are delivered directly to the receiver node to reduce overhead. |
31 | * | 30 | * |
32 | * @author Tamas Szabo | 31 | * @author Tamas Szabo |
33 | * @since 2.0 | 32 | * @since 2.0 |
34 | */ | 33 | */ |