diff options
| author | Zoltan Ujhelyi | 2017-07-12 09:05:28 +0000 |
|---|---|---|
| committer | Zoltan Ujhelyi | 2017-08-30 11:04:32 +0000 |
| commit | 94fe59716ac0e138dd6e0f76ab154138a90fd9f7 (patch) | |
| tree | 25a1760ca057507915279b7da96bafaffbc8ade6 | |
| parent | bf6ea677a59f33bd73a177583ccf1e2901f83def (diff) | |
| download | org.eclipse.viatra-94fe59716ac0e138dd6e0f76ab154138a90fd9f7.tar.gz org.eclipse.viatra-94fe59716ac0e138dd6e0f76ab154138a90fd9f7.tar.xz org.eclipse.viatra-94fe59716ac0e138dd6e0f76ab154138a90fd9f7.zip | |
[469149] Bugfixes related to generic local search
Change-Id: I9813c83723e48611bc21d7ffc93dc4c0573ff3f7
Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
2 files changed, 2 insertions, 2 deletions
diff --git a/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/matcher/integration/LocalSearchHints.java b/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/matcher/integration/LocalSearchHints.java index 1930d06b6..e7aa57710 100644 --- a/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/matcher/integration/LocalSearchHints.java +++ b/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/matcher/integration/LocalSearchHints.java @@ -116,7 +116,7 @@ public final class LocalSearchHints implements IMatcherCapability { */ public static LocalSearchHints getDefaultGeneric(){ LocalSearchHints result = new LocalSearchHints(); - result.useBase = false; + result.useBase = true; // Should be unused; but a false value might cause surprises as an engine-default hint result.rowCount = 4; result.costFunction = new VariableBindingBasedCostFunction(); result.flattenCallPredicate = new NeverFlattenCallPredicate(); diff --git a/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/generic/GenericTypeExtend.java b/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/generic/GenericTypeExtend.java index 86e36029c..d9ae44cf8 100644 --- a/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/generic/GenericTypeExtend.java +++ b/query/plugins/org.eclipse.viatra.query.runtime.localsearch/src/org/eclipse/viatra/query/runtime/localsearch/operations/generic/GenericTypeExtend.java @@ -92,7 +92,7 @@ public class GenericTypeExtend implements ISearchOperation, IIteratingSearchOper public boolean execute(MatchingFrame frame, ISearchContext context) throws LocalSearchException { if (it.hasNext()) { final Tuple next = it.next(); - for (int i : unboundVariableIndex) { + for (int i = 0; i < positions.length; i++) { frame.setValue(positions[i], next.get(i)); } return true; |