aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects/viatra-runtime-rete
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2023-08-19 03:14:50 +0200
committerLibravatar Kristóf Marussy <kristof@marussy.com>2023-08-19 03:14:50 +0200
commitd48a3d35bdcc6dcb15730e8daddfeec737df38b9 (patch)
tree56c1a6fe443767892b9508285ad66f73ec0dd91a /subprojects/viatra-runtime-rete
parentrefactor: remove unused VIATRA code (diff)
downloadrefinery-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')
-rw-r--r--subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulParallelTimelyColumnAggregatorNode.java25
-rw-r--r--subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/aggregation/timely/FaithfulSequentialTimelyColumnAggregatorNode.java7
-rw-r--r--subprojects/viatra-runtime-rete/src/main/java/tools/refinery/viatra/runtime/rete/network/mailbox/timeless/DefaultMailbox.java5
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 *******************************************************************************/
9package tools.refinery.viatra.runtime.rete.aggregation.timely; 9package tools.refinery.viatra.runtime.rete.aggregation.timely;
10 10
11import java.util.Collections;
12import java.util.Map;
13import java.util.Map.Entry;
14import java.util.Objects;
15import java.util.TreeMap;
16
17import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator; 11import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator;
18import tools.refinery.viatra.runtime.matchers.tuple.Tuple; 12import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
19import tools.refinery.viatra.runtime.matchers.tuple.TupleMask; 13import tools.refinery.viatra.runtime.matchers.tuple.TupleMask;
20import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory; 14import tools.refinery.viatra.runtime.matchers.util.*;
21import tools.refinery.viatra.runtime.matchers.util.Direction;
22import tools.refinery.viatra.runtime.matchers.util.IDeltaBag;
23import tools.refinery.viatra.runtime.matchers.util.Preconditions;
24import tools.refinery.viatra.runtime.matchers.util.Signed;
25import tools.refinery.viatra.runtime.matchers.util.timeline.Diff; 15import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
26import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate; 16import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate;
27import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState; 17import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState;
28import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState;
29import tools.refinery.viatra.runtime.rete.network.ReteContainer; 18import tools.refinery.viatra.runtime.rete.network.ReteContainer;
30import tools.refinery.viatra.runtime.rete.network.communication.Timestamp; 19import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
31import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode; 20import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode;
32 21
22import java.util.Collections;
23import java.util.Map;
24import java.util.Map.Entry;
25import java.util.Objects;
26import 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 *******************************************************************************/
9package tools.refinery.viatra.runtime.rete.aggregation.timely; 9package tools.refinery.viatra.runtime.rete.aggregation.timely;
@@ -25,14 +25,13 @@ import tools.refinery.viatra.runtime.matchers.util.Signed;
25import tools.refinery.viatra.runtime.matchers.util.timeline.Diff; 25import tools.refinery.viatra.runtime.matchers.util.timeline.Diff;
26import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.CumulativeAggregate; 26import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.CumulativeAggregate;
27import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.FoldingState; 27import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulSequentialTimelyColumnAggregatorNode.FoldingState;
28import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState;
29import tools.refinery.viatra.runtime.rete.network.ReteContainer; 28import tools.refinery.viatra.runtime.rete.network.ReteContainer;
30import tools.refinery.viatra.runtime.rete.network.communication.Timestamp; 29import tools.refinery.viatra.runtime.rete.network.communication.Timestamp;
31import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode; 30import 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 *******************************************************************************/
9package tools.refinery.viatra.runtime.rete.network.mailbox.timeless; 9package tools.refinery.viatra.runtime.rete.network.mailbox.timeless;
10 10
11import java.util.Map; 11import java.util.Map;
12import java.util.Map.Entry;
13 12
14import tools.refinery.viatra.runtime.matchers.tuple.Tuple; 13import tools.refinery.viatra.runtime.matchers.tuple.Tuple;
15import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory; 14import 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 */