1 files changed, 53 insertions, 104 deletions

diff --git a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java
index 75f338b6..5f3895be 100644
--- a/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java
+++ b/subprojects/viatra-runtime-localsearch/src/main/java/tools/refinery/viatra/runtime/localsearch/matcher/integration/LocalSearchHints.java
@@ -3,63 +3,51 @@
  * 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.localsearch.matcher.integration;
 
-import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.ADORNMENT_PROVIDER;
-import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.CALL_DELEGATION_STRATEGY;
-import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.FLATTEN_CALL_PREDICATE;
-import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.PLANNER_COST_FUNCTION;
-import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.PLANNER_TABLE_ROW_COUNT;
-import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.USE_BASE_INDEX;
-import static tools.refinery.viatra.runtime.matchers.backend.CommonQueryHintOptions.normalizationTraceCollector;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
 import tools.refinery.viatra.runtime.localsearch.planner.cost.ICostFunction;
 import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.IndexerBasedConstraintCostFunction;
 import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.StatisticsBasedConstraintCostFunction;
-import tools.refinery.viatra.runtime.localsearch.planner.cost.impl.VariableBindingBasedCostFunction;
-import tools.refinery.viatra.runtime.matchers.backend.ICallDelegationStrategy;
-import tools.refinery.viatra.runtime.matchers.backend.IMatcherCapability;
-import tools.refinery.viatra.runtime.matchers.backend.IQueryBackendFactory;
-import tools.refinery.viatra.runtime.matchers.backend.QueryEvaluationHint;
-import tools.refinery.viatra.runtime.matchers.backend.QueryHintOption;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.DefaultFlattenCallPredicate;
+import tools.refinery.viatra.runtime.matchers.backend.*;
 import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IFlattenCallPredicate;
 import tools.refinery.viatra.runtime.matchers.psystem.rewriters.IRewriterTraceCollector;
-import tools.refinery.viatra.runtime.matchers.psystem.rewriters.NeverFlattenCallPredicate;
 import tools.refinery.viatra.runtime.matchers.psystem.rewriters.NopTraceCollector;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import static tools.refinery.viatra.runtime.localsearch.matcher.integration.LocalSearchHintOptions.*;
+import static tools.refinery.viatra.runtime.matchers.backend.CommonQueryHintOptions.normalizationTraceCollector;
+
 /**
  * Type safe builder and extractor for Local search specific hints
- * 
+ *
  * @author Grill Balázs
  * @since 1.4
  *
  */
 public final class LocalSearchHints implements IMatcherCapability {
-    
+
     private Boolean useBase = null;
-    
+
     private Integer rowCount = null;
-    
+
     private ICostFunction costFunction = null;
-    
+
     private IFlattenCallPredicate flattenCallPredicate = null;
-    
+
     private ICallDelegationStrategy callDelegationStrategy = null;
-    
+
     private IAdornmentProvider adornmentProvider = null;
-    
+
     private IRewriterTraceCollector traceCollector = NopTraceCollector.INSTANCE;
-    
+
     private IQueryBackendFactory backendFactory = null;
-    
+
     private LocalSearchHints() {}
 
     /**
@@ -68,53 +56,14 @@ public final class LocalSearchHints implements IMatcherCapability {
     public static LocalSearchHints getDefaultOverriddenBy(QueryEvaluationHint overridingHint){
         return parse(getDefault().build(overridingHint));
     }
-    
+
     /**
      * Default settings which are considered the most safe, providing a reasonable performance for most of the cases. Assumes the availability of the base indexer.
      */
     public static LocalSearchHints getDefault(){
-        LocalSearchHints result = new LocalSearchHints();
-        result.useBase = USE_BASE_INDEX.getDefaultValue();
-        result.rowCount = PLANNER_TABLE_ROW_COUNT.getDefaultValue();
-        result.costFunction = PLANNER_COST_FUNCTION.getDefaultValue();
-        result.flattenCallPredicate = FLATTEN_CALL_PREDICATE.getDefaultValue();
-        result.callDelegationStrategy = CALL_DELEGATION_STRATEGY.getDefaultValue();
-        result.adornmentProvider = ADORNMENT_PROVIDER.getDefaultValue();
-        result.backendFactory = LocalSearchEMFBackendFactory.INSTANCE;
-        return result;
+        return getDefaultGeneric();
     }
-    
-    /**
-     * With this setting, the patterns are flattened before planning. This may cause performance gain in some cases compared to the {@link #getDefault()} settings,
-     * However this should be used with care for patterns containing calls with several bodies.
-     */
-    public static LocalSearchHints getDefaultFlatten(){
-        LocalSearchHints result = new LocalSearchHints();
-        result.useBase = true;
-        result.rowCount = 4;
-        result.costFunction = new IndexerBasedConstraintCostFunction();
-        result.flattenCallPredicate = new DefaultFlattenCallPredicate();
-        result.callDelegationStrategy = CALL_DELEGATION_STRATEGY.getDefaultValue();
-        result.adornmentProvider = ADORNMENT_PROVIDER.getDefaultValue();
-        result.backendFactory = LocalSearchEMFBackendFactory.INSTANCE;
-        return result;
-    }
-    
-    /**
-     * Settings to be used when the base index is not available.
-     */
-    public static LocalSearchHints getDefaultNoBase(){
-        LocalSearchHints result = new LocalSearchHints();
-        result.useBase = false;
-        result.rowCount = 4;
-        result.costFunction = new VariableBindingBasedCostFunction();
-        result.flattenCallPredicate = new NeverFlattenCallPredicate();
-        result.callDelegationStrategy = ICallDelegationStrategy.FULL_BACKEND_ADHESION;
-        result.adornmentProvider = ADORNMENT_PROVIDER.getDefaultValue();
-        result.backendFactory = LocalSearchEMFBackendFactory.INSTANCE;
-        return result;
-    }
-    
+
     /**
      * Initializes the generic (not EMF specific) search backend with the default settings
      * @since 1.7
@@ -130,7 +79,7 @@ public final class LocalSearchHints implements IMatcherCapability {
         result.backendFactory = LocalSearchGenericBackendFactory.INSTANCE;
         return result;
     }
-    
+
     /**
      * Initializes the default search backend with hybrid-enabled settings
      * @since 2.1
@@ -142,7 +91,7 @@ public final class LocalSearchHints implements IMatcherCapability {
                 new DontFlattenIncrementalPredicate(), new DontFlattenDisjunctive());
         return result;
     }
-   
+
     /**
      * Initializes the generic (not EMF specific) search backend with hybrid-enabled settings
      * @since 2.1
@@ -154,10 +103,10 @@ public final class LocalSearchHints implements IMatcherCapability {
                 new DontFlattenIncrementalPredicate(), new DontFlattenDisjunctive());
         return result;
     }
-    
+
     public static LocalSearchHints parse(QueryEvaluationHint hint){
         LocalSearchHints result = new LocalSearchHints();
-        
+
         result.useBase = USE_BASE_INDEX.getValueOrNull(hint);
         result.rowCount = PLANNER_TABLE_ROW_COUNT.getValueOrNull(hint);
         result.flattenCallPredicate = FLATTEN_CALL_PREDICATE.getValueOrNull(hint);
@@ -165,15 +114,15 @@ public final class LocalSearchHints implements IMatcherCapability {
         result.costFunction = PLANNER_COST_FUNCTION.getValueOrNull(hint);
         result.adornmentProvider = ADORNMENT_PROVIDER.getValueOrNull(hint);
         result.traceCollector = normalizationTraceCollector.getValueOrDefault(hint);
-        
+
         return result;
     }
-    
+
 
     private Map<QueryHintOption<?>, Object> calculateHintMap() {
         Map<QueryHintOption<?>, Object> map = new HashMap<>();
         if (useBase != null){
-            USE_BASE_INDEX.insertOverridingValue(map, useBase); 
+            USE_BASE_INDEX.insertOverridingValue(map, useBase);
         }
         if (rowCount != null){
             PLANNER_TABLE_ROW_COUNT.insertOverridingValue(map, rowCount);
@@ -195,43 +144,43 @@ public final class LocalSearchHints implements IMatcherCapability {
         }
         return map;
     }
-    
+
     public QueryEvaluationHint build(){
         Map<QueryHintOption<?>, Object> map = calculateHintMap();
         return new QueryEvaluationHint(map, backendFactory);
     }
-    
+
     /**
      * @since 1.7
      */
     public QueryEvaluationHint build(QueryEvaluationHint overridingHint) {
         if (overridingHint == null)
             return build();
-        
+
         IQueryBackendFactory factory = (overridingHint.getQueryBackendFactory() == null)
                 ? this.backendFactory
                 : overridingHint.getQueryBackendFactory();
-        
+
         Map<QueryHintOption<?>, Object> hints = calculateHintMap();
         if (overridingHint.getBackendHintSettings() != null) {
             hints.putAll(overridingHint.getBackendHintSettings());
         }
-        
+
         return new QueryEvaluationHint(hints, factory);
     }
-    
+
     public boolean isUseBase() {
         return useBase;
     }
-    
+
     public ICostFunction getCostFunction() {
         return costFunction;
     }
-    
+
     public IFlattenCallPredicate getFlattenCallPredicate() {
         return flattenCallPredicate;
     }
-    
+
     /**
      * @since 2.1
      */
@@ -242,7 +191,7 @@ public final class LocalSearchHints implements IMatcherCapability {
     public Integer getRowCount() {
         return rowCount;
     }
-    
+
     /**
      * @since 1.5
      */
@@ -256,28 +205,28 @@ public final class LocalSearchHints implements IMatcherCapability {
     public IRewriterTraceCollector getTraceCollector() {
         return traceCollector == null ? normalizationTraceCollector.getDefaultValue() : traceCollector;
     }
-    
+
     public LocalSearchHints setUseBase(boolean useBase) {
         this.useBase = useBase;
         return this;
     }
-    
+
     public LocalSearchHints setRowCount(int rowCount) {
         this.rowCount = rowCount;
         return this;
     }
-    
+
     public LocalSearchHints setCostFunction(ICostFunction costFunction) {
         this.costFunction = costFunction;
         return this;
     }
-    
+
     public LocalSearchHints setFlattenCallPredicate(IFlattenCallPredicate flattenCallPredicate) {
         this.flattenCallPredicate = flattenCallPredicate;
         return this;
     }
-    
-    
+
+
     /**
      * @since 2.1
      */
@@ -293,7 +242,7 @@ public final class LocalSearchHints implements IMatcherCapability {
         this.traceCollector = traceCollector;
         return this;
     }
-    
+
     /**
      * @since 1.5
      */
@@ -301,37 +250,37 @@ public final class LocalSearchHints implements IMatcherCapability {
         this.adornmentProvider = adornmentProvider;
         return this;
     }
-    
+
     public static LocalSearchHints customizeUseBase(boolean useBase){
         return new LocalSearchHints().setUseBase(useBase);
     }
-    
+
     public static LocalSearchHints customizeRowCount(int rowCount){
         return new LocalSearchHints().setRowCount(rowCount);
     }
-    
+
     public static LocalSearchHints customizeCostFunction(ICostFunction costFunction){
         return new LocalSearchHints().setCostFunction(costFunction);
     }
-    
+
     public static LocalSearchHints customizeFlattenCallPredicate(IFlattenCallPredicate predicate){
         return new LocalSearchHints().setFlattenCallPredicate(predicate);
     }
-    
+
     /**
      * @since 2.1
      */
     public static LocalSearchHints customizeCallDelegationStrategy(ICallDelegationStrategy strategy){
         return new LocalSearchHints().setCallDelegationStrategy(strategy);
     }
-    
+
     /**
      * @since 1.5
      */
     public static LocalSearchHints customizeAdornmentProvider(IAdornmentProvider adornmentProvider){
         return new LocalSearchHints().setAdornmentProvider(adornmentProvider);
     }
-    
+
     /**
      * @since 1.6
      */