diff options
Diffstat (limited to 'plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner')
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/GlobalPredicatePartitionFactory.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/GlobalPredicatePartitionFactory.java index 60147ba82..551429524 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/GlobalPredicatePartitionFactory.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/GlobalPredicatePartitionFactory.java @@ -257,7 +257,7 @@ public class GlobalPredicatePartitionFactory extends AbstractSimplePartitionFact protected void resolvePredicatedMiddleNodes(@NonNull BasicPartition partition) { for (@NonNull Node node : mappingPartitioner.getPredicatedMiddleNodes()) { - if (!partition.hasNode(node) && node.isMatched()) { // && mappingPartitioner.isCyclic(node)) { + if (!partition.hasNode(node) && !node.isConditional()) { // && mappingPartitioner.isCyclic(node)) { Role nodeRole = QVTscheduleUtil.getNodeRole(node); // if (node.isPattern() && node.isClass()) { // nodeRole = QVTscheduleUtil.asSpeculated(nodeRole); diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/LocalPredicatePartitionFactory.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/LocalPredicatePartitionFactory.java index 7f50837cf..e97d280f1 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/LocalPredicatePartitionFactory.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/LocalPredicatePartitionFactory.java @@ -24,8 +24,8 @@ import org.eclipse.qvtd.compiler.internal.qvts2qvts.utilities.ReachabilityForest import org.eclipse.qvtd.pivot.qvtschedule.BasicPartition; import org.eclipse.qvtd.pivot.qvtschedule.Edge; import org.eclipse.qvtd.pivot.qvtschedule.Node; -import org.eclipse.qvtd.pivot.qvtschedule.Node.Utility; import org.eclipse.qvtd.pivot.qvtschedule.Role; +import org.eclipse.qvtd.pivot.qvtschedule.utilities.InitUtility; import org.eclipse.qvtd.pivot.qvtschedule.utilities.QVTscheduleUtil; import com.google.common.collect.Iterables; @@ -182,8 +182,8 @@ public class LocalPredicatePartitionFactory extends AbstractSimplePartitionFacto // boolean isPredicated = node.isPredicated(); // boolean isMatched = node.isMatched(); // boolean isUnconditional = node.isUnconditional(); - Utility utility = node.getUtility(); - boolean isWeaklyMatched = utility == Utility.WEAKLY_MATCHED; + InitUtility initUtility = node.getInitUtility(); + boolean isWeaklyMatched = initUtility == InitUtility.NULLABLE_MATCHED; // Utility.WEAKLY_MATCHED; boolean isTraced = isTraced(node, executionNodes); if (!isCyclicCorollary && (isTraced || isWeaklyMatched)) { addNode(partition, node); diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/SpeculatedPartitionFactory.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/SpeculatedPartitionFactory.java index 16ceac222..898a30bd5 100644 --- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/SpeculatedPartitionFactory.java +++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvts2qvts/partitioner/SpeculatedPartitionFactory.java @@ -181,7 +181,7 @@ public class SpeculatedPartitionFactory extends AbstractSimplePartitionFactory }*/ protected void resolveTraceNodes(@NonNull BasicPartition partition, @NonNull Node traceNode) { - assert traceNode.isMatched() && traceNode.isClass() && traceNode.isPattern(); + assert !traceNode.isConditional() && traceNode.isClass() && traceNode.isPattern(); addNode(partition, traceNode, Role.PREDICATED); if (scheduleManager.useActivators()) { Node localSuccessNode = mappingPartitioner.basicGetLocalSuccessNode(traceNode); |