Merge branch 'zinggAI:main' into sania

common/core/src/main/java/zingg/common/core/block/Block.java

@@ -125,7 +125,8 @@ public void estimateElimCount(Canopy<R> c, long elimCount) {
 		long least = Long.MAX_VALUE;
 		int maxElimination = 0;
 		Canopy<R>best = null;
-		for (FieldDefinition field : fieldsOfInterest) {
+		List<FieldDefinition> adjustedFieldOfInterestList = getFieldOfInterestList(fieldsOfInterest, node);
+		for (FieldDefinition field : adjustedFieldOfInterestList) {
 			if (LOG.isDebugEnabled()){
 				LOG.debug("Trying for " + field + " with data type " + field.getDataType() + " and real dt " 
 					+ getFeatureFactory().getDataTypeFromString(field.getDataType()));
@@ -404,6 +405,11 @@ public void printTree(Tree<Canopy<R>> tree,
 		}			
 	}
 
+	public List<FieldDefinition> getFieldOfInterestList(List<FieldDefinition> fieldDefinitions, Canopy<R> node) {
+		FieldDefinitionStrategy<R> fieldDefinitionStrategy = new DefaultFieldDefinitionStrategy<R>();
+		return fieldDefinitionStrategy.getAdjustedFieldDefinitions(fieldDefinitions, node);
+	}
+
 	public abstract FeatureFactory<T> getFeatureFactory();
 
 

common/core/src/main/java/zingg/common/core/block/DefaultFieldDefinitionStrategy.java

@@ -0,0 +1,14 @@
+package zingg.common.core.block;
+
+import zingg.common.client.FieldDefinition;
+
+import java.util.List;
+
+public class DefaultFieldDefinitionStrategy<R> implements FieldDefinitionStrategy<R> {
+    @Override
+    public List<FieldDefinition> getAdjustedFieldDefinitions(List<FieldDefinition> fieldDefinitions, Canopy<R> node) {
+        //returning fieldDefinitions
+        //as it is here
+        return fieldDefinitions;
+    }
+}

common/core/src/main/java/zingg/common/core/block/FieldDefinitionStrategy.java

@@ -0,0 +1,9 @@
+package zingg.common.core.block;
+
+import zingg.common.client.FieldDefinition;
+
+import java.util.List;
+
+public interface FieldDefinitionStrategy<R> {
+    List<FieldDefinition> getAdjustedFieldDefinitions(List<FieldDefinition> fieldDefinitions, Canopy<R> node);
+}

common/core/src/test/java/zingg/common/core/executor/TestExecutorsSingle.java

@@ -26,8 +26,17 @@ public TestExecutorsSingle(){
 
 	@Override
 	public List<ExecutorTester<S, D, R, C, T>> getExecutors() throws ZinggClientException, IOException{
-	    TrainingDataFinder<S, D, R, C, T> tdf = getTrainingDataFinder();
-		Labeller<S, D, R, C, T> labeler = getLabeller();
+
+		getBaseExecutors();
+		getAdditionalExecutors();
+
+		return executorTesterList;
+	}
+
+	public void getBaseExecutors() throws ZinggClientException, IOException{
+
+		TrainingDataFinder<S, D, R, C, T> tdf = getTrainingDataFinder();
+    	Labeller<S, D, R, C, T> labeler = getLabeller();
 		executorTesterList.add(new FtdAndLabelCombinedExecutorTester<S, D, R, C, T>(tdf, new TrainingDataFinderValidator<S, D, R, C, T>(tdf), getConfigFile(),
 				labeler, new LabellerValidator<S, D, R, C, T>(labeler), modelId, getDFObjectUtil()));
 
@@ -38,13 +47,16 @@ public List<ExecutorTester<S, D, R, C, T>> getExecutors() throws ZinggClientExce
         VerifyBlocking<S, D, R, C, T> verifyBlocker = getVerifyBlocker();
         executorTesterList.add(new ExecutorTester<S, D, R, C, T>(verifyBlocker, new BlockerValidator<S, D, R, C, T>(verifyBlocker),getConfigFile(),modelId,getDFObjectUtil()));
 
+	}
+
+	public void getAdditionalExecutors() throws ZinggClientException, IOException{
+
 		Matcher<S, D, R, C, T> matcher = getMatcher();
 		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(matcher,new MatcherValidator<S, D, R, C, T>(matcher),getConfigFile(),modelId,getDFObjectUtil()));
 
 		Linker<S, D, R, C, T> linker = getLinker();
 		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(linker,new LinkerValidator<S, D, R, C, T>(linker),getLinkerConfigFile(),modelId,getDFObjectUtil()));
-
-		return executorTesterList;
+
 	}
 
 	public abstract String getConfigFile();

common/core/src/test/java/zingg/common/core/executor/validate/FindAndLabelValidator.java

@@ -1,13 +1,9 @@
 package zingg.common.core.executor.validate;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import zingg.common.client.ZFrame;
 import zingg.common.client.ZinggClientException;
-import zingg.common.client.util.ColName;
 import zingg.common.core.executor.FindAndLabeller;
 
 public class FindAndLabelValidator<S, D, R, C, T> extends ExecutorValidator<S, D, R, C, T> {

common/core/src/test/java/zingg/common/core/executor/validate/TrainerValidator.java

@@ -3,7 +3,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import zingg.common.client.IArguments;
 import zingg.common.client.ZinggClientException;
 import zingg.common.core.executor.Trainer;