diff options
Diffstat (limited to 'subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java')
-rw-r--r-- | subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java index bb0630f3..c68152e3 100644 --- a/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java +++ b/subprojects/store-query-viatra/src/main/java/tools/refinery/store/query/viatra/internal/ViatraModelQueryBuilderImpl.java | |||
@@ -17,7 +17,6 @@ import tools.refinery.store.query.viatra.ViatraModelQueryBuilder; | |||
17 | import tools.refinery.store.query.viatra.internal.localsearch.FlatCostFunction; | 17 | import tools.refinery.store.query.viatra.internal.localsearch.FlatCostFunction; |
18 | import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher; | 18 | import tools.refinery.store.query.viatra.internal.matcher.RawPatternMatcher; |
19 | import tools.refinery.store.query.viatra.internal.pquery.Dnf2PQuery; | 19 | import tools.refinery.store.query.viatra.internal.pquery.Dnf2PQuery; |
20 | import tools.refinery.viatra.runtime.CancellationToken; | ||
21 | import tools.refinery.viatra.runtime.api.IQuerySpecification; | 20 | import tools.refinery.viatra.runtime.api.IQuerySpecification; |
22 | import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions; | 21 | import tools.refinery.viatra.runtime.api.ViatraQueryEngineOptions; |
23 | import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchGenericBackendFactory; | 22 | import tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchGenericBackendFactory; |
@@ -36,7 +35,6 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via | |||
36 | // Use a cost function that ignores the initial (empty) model but allows higher arity input keys. | 35 | // Use a cost function that ignores the initial (empty) model but allows higher arity input keys. |
37 | LocalSearchHintOptions.PLANNER_COST_FUNCTION, new FlatCostFunction() | 36 | LocalSearchHintOptions.PLANNER_COST_FUNCTION, new FlatCostFunction() |
38 | ), (IQueryBackendFactory) null); | 37 | ), (IQueryBackendFactory) null); |
39 | private CancellationToken cancellationToken = CancellationToken.NONE; | ||
40 | private final CompositeRewriter rewriter; | 38 | private final CompositeRewriter rewriter; |
41 | private final Dnf2PQuery dnf2PQuery = new Dnf2PQuery(); | 39 | private final Dnf2PQuery dnf2PQuery = new Dnf2PQuery(); |
42 | private final Set<AnyQuery> queries = new LinkedHashSet<>(); | 40 | private final Set<AnyQuery> queries = new LinkedHashSet<>(); |
@@ -87,12 +85,6 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via | |||
87 | } | 85 | } |
88 | 86 | ||
89 | @Override | 87 | @Override |
90 | public ViatraModelQueryBuilder cancellationToken(CancellationToken cancellationToken) { | ||
91 | this.cancellationToken = cancellationToken; | ||
92 | return this; | ||
93 | } | ||
94 | |||
95 | @Override | ||
96 | public ViatraModelQueryBuilder queries(Collection<? extends AnyQuery> queries) { | 88 | public ViatraModelQueryBuilder queries(Collection<? extends AnyQuery> queries) { |
97 | checkNotConfigured(); | 89 | checkNotConfigured(); |
98 | this.queries.addAll(queries); | 90 | this.queries.addAll(queries); |
@@ -144,7 +136,7 @@ public class ViatraModelQueryBuilderImpl extends AbstractModelAdapterBuilder<Via | |||
144 | validateSymbols(store); | 136 | validateSymbols(store); |
145 | return new ViatraModelQueryStoreAdapterImpl(store, buildEngineOptions(), dnf2PQuery.getSymbolViews(), | 137 | return new ViatraModelQueryStoreAdapterImpl(store, buildEngineOptions(), dnf2PQuery.getSymbolViews(), |
146 | Collections.unmodifiableMap(canonicalQueryMap), Collections.unmodifiableMap(querySpecifications), | 138 | Collections.unmodifiableMap(canonicalQueryMap), Collections.unmodifiableMap(querySpecifications), |
147 | Collections.unmodifiableSet(vacuousQueries), cancellationToken); | 139 | Collections.unmodifiableSet(vacuousQueries), store::checkCancelled); |
148 | } | 140 | } |
149 | 141 | ||
150 | private ViatraQueryEngineOptions buildEngineOptions() { | 142 | private ViatraQueryEngineOptions buildEngineOptions() { |