From d48a3d35bdcc6dcb15730e8daddfeec737df38b9 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sat, 19 Aug 2023 03:14:50 +0200 Subject: 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. --- ...FaithfulParallelTimelyColumnAggregatorNode.java | 25 +++++++++------------- ...ithfulSequentialTimelyColumnAggregatorNode.java | 7 +++--- .../network/mailbox/timeless/DefaultMailbox.java | 5 ++--- 3 files changed, 15 insertions(+), 22 deletions(-) (limited to 'subprojects/viatra-runtime-rete/src/main/java/tools') 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 @@ * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at * http://www.eclipse.org/legal/epl-v20.html. - * + * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ package tools.refinery.viatra.runtime.rete.aggregation.timely; -import java.util.Collections; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.TreeMap; - import tools.refinery.viatra.runtime.matchers.psystem.aggregations.IMultisetAggregationOperator; import tools.refinery.viatra.runtime.matchers.tuple.Tuple; import tools.refinery.viatra.runtime.matchers.tuple.TupleMask; -import tools.refinery.viatra.runtime.matchers.util.CollectionsFactory; -import tools.refinery.viatra.runtime.matchers.util.Direction; -import tools.refinery.viatra.runtime.matchers.util.IDeltaBag; -import tools.refinery.viatra.runtime.matchers.util.Preconditions; -import tools.refinery.viatra.runtime.matchers.util.Signed; +import tools.refinery.viatra.runtime.matchers.util.*; import tools.refinery.viatra.runtime.matchers.util.timeline.Diff; import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.CumulativeAggregate; import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulParallelTimelyColumnAggregatorNode.FoldingState; -import tools.refinery.viatra.runtime.rete.aggregation.timely.FaithfulTimelyColumnAggregatorNode.MergeableFoldingState; import tools.refinery.viatra.runtime.rete.network.ReteContainer; import tools.refinery.viatra.runtime.rete.network.communication.Timestamp; import tools.refinery.viatra.runtime.rete.network.communication.timely.ResumableNode; +import java.util.Collections; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.TreeMap; + /** * Faithful column aggregator with parallel aggregation architecture. - * + * * @author Tamas Szabo * @since 2.4 * @@ -214,4 +209,4 @@ public class FaithfulParallelTimelyColumnAggregatorNode * Usually, the mailbox performs counting of messages so that they can cancel each other out. However, if marked as a * fall-through mailbox, than update messages are delivered directly to the receiver node to reduce overhead. - * + * * @author Tamas Szabo * @since 2.0 */ -- cgit v1.2.3-54-g00ecf