cols for oss

common/client/src/main/java/zingg/common/client/FieldDefinition.java

@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
+import zingg.common.client.cols.Named;
 import zingg.common.py.annotations.PythonClass;
 import zingg.common.py.annotations.PythonMethod;
 
@@ -34,7 +35,7 @@
  *
  */
 @PythonClass(module = "client", outputDirectory = "python/zinggGenerated")
-public class FieldDefinition implements 
+public class FieldDefinition implements Named,
 		Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -125,6 +126,21 @@ public void setFieldName(String fieldName) {
 		this.fieldName = fieldName;
 	}
 
+	public boolean isDontUse() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'isDontUse'");
+    }
+
+	@Override
+    public String getName() {
+        return getFieldName();
+    }
+
+    @Override
+    public void setName(String name) {
+        setFieldName(name);
+    }
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;

common/client/src/main/java/zingg/common/client/cols/FieldDefSelectedCols.java

@@ -3,16 +3,31 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import zingg.common.client.FieldDefinition;
+
 public class FieldDefSelectedCols extends SelectedCols {
+
     public FieldDefSelectedCols(List<FieldDefinition> fieldDefs, boolean showConcise) {
-        List<Named> namedList = new ArrayList<>();
+
+        List<FieldDefinition> namedList = new ArrayList<>();
+
         for (FieldDefinition fieldDef : fieldDefs) {
             if (showConcise && fieldDef.isDontUse()) {
                 continue;
             }
             namedList.add(fieldDef);
         }
-        namedList.add(new Named("source"));
-        setCols(namedList);
+
+        namedList.add(new FieldDefinition());
+        List<String> stringList = convertNamedListToStringList(namedList);
+        setCols(stringList);
+    }
+
+    private List<String> convertNamedListToStringList(List<FieldDefinition> namedList) {
+        List<String> stringList = new ArrayList<>();
+        for (FieldDefinition named : namedList) {
+            stringList.add(named.getName());
+        }
+        return stringList;
     }
 }

common/client/src/main/java/zingg/common/client/cols/ISelectedCols.java

@@ -8,7 +8,9 @@ public interface ISelectedCols {
 
     String[] getCols();
 
-    void setCols(String[] cols);
-
     void setCols(List<String> cols);
-}
+
+    void setNamedCols(List<? extends Named> n);
+
+    void setStringCols(List<String> cols);
+}

common/client/src/main/java/zingg/common/client/cols/Named.java

@@ -1,6 +1,8 @@
 package zingg.common.client.cols;
 
 public interface Named {
+
     String getName();
+
     void setName(String name);
 }

common/client/src/main/java/zingg/common/client/cols/SelectedCols.java

@@ -21,18 +21,17 @@ public String[] getCols() {
     }
 
     @Override
-    public void setCols(String[] cols) {
-        this.cols = cols;
+    public void setCols(List<String> strings) {
+        this.cols = strings.toArray(new String[0]);
     }
 
     @Override
-    public void setCols(List<? extends Named> n) {
+    public void setNamedCols(List<? extends Named> n) {
         this.cols = getCols(n);
     }
 
     @Override
-    public void setCols(List<String> columnNames) {
+    public void setStringCols(List<String> columnNames) {
         this.cols = columnNames.toArray(new String[0]);
     }
-}
-
+}

common/client/src/main/java/zingg/common/client/cols/ZidAndFieldDefSelector.java

@@ -1,5 +1,14 @@
 package zingg.common.client.cols;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class ZidAndFieldDefSelector extends SelectedCols {
-    // Constructor and additional methods here
+
+    public ZidAndFieldDefSelector(String[] fieldDefs) {
+
+        List<String> fieldDefList = Arrays.asList(fieldDefs);
+        fieldDefList.add(0, "zid");
+        setCols(fieldDefList);
+    }
 }

common/client/src/main/java/zingg/common/client/util/DSUtil.java

@@ -223,11 +223,21 @@ public  List<C> getFieldDefColumns (ZFrame<D, R, C> ds, IArguments args, boolean
 
 	}
 
+	public ZFrame<D, R, C> ZidSelector(ZFrame<D, R, C> frame, IArguments args, boolean someFlag) {
+		return null;
+	}
+
 	// public  ZFrame<D, R, C> getFieldDefColumnsDS(ZFrame<D, R, C> ds, IArguments args, boolean includeZid) {
 	// 	return select(ds, getFieldDefColumns(ds, args, includeZid, false));
 	// }
+
+	private Object getDSUtil() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Unimplemented method 'getDSUtil'");
+	}
+
 	public ZFrame<D, R, C> getFieldDefColumnsDS(ZFrame<D, R, C> ds, IArguments args, boolean includeZid) {
-		return getDSUtil().ZidSelector(getFieldDefColumns(ds, args, includeZid, false), args, true);
+		return ((DSUtil) getDSUtil()).ZidSelector(ds, args, true);
 	}
 
 	public  ZFrame<D, R, C> select(ZFrame<D, R, C> ds, List<C> cols) {

common/core/src/main/java/zingg/common/core/executor/LabelDataViewHelper.java

@@ -1,5 +1,6 @@
 package zingg.common.core.executor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -44,9 +45,11 @@ public List<R>  getClusterIds(ZFrame<D,R,C>  lines) {
 	// 	return getDSUtil().getFieldDefColumns(lines, args, false, args.getShowConcise());
 	// }
 	@Override
-	public List<C> getDisplayColumns(ZFrame<D, R, C> lines, IArguments args) {
-		return getDSUtil().ZidSelector(lines, args, args.getShowConcise());
-	}
+    public List<C> getDisplayColumns(ZFrame<D, R, C> lines, IArguments args) {
+        ZFrame<D, R, C> resultFrame = getDSUtil().ZidSelector(lines, args, args.getShowConcise());
+		List<C> resultList = new ArrayList<>();
+		return resultList;
+    }
 
 
 	@Override

common/core/src/main/java/zingg/common/core/executor/LabelUpdater.java

@@ -11,6 +11,7 @@
 import zingg.common.client.options.ZinggOptions;
 import zingg.common.client.pipe.Pipe;
 import zingg.common.client.util.ColName;
+import zingg.common.client.IArguments;
 import zingg.common.core.util.LabelMatchType;
 
 public abstract class LabelUpdater<S,D,R,C,T> extends Labeller<S,D,R,C,T> {
@@ -34,9 +35,8 @@ public void execute() throws ZinggClientException {
 		}
 	}
 
-	@Override
-	public List<C> getDisplayColumns(ZFrame<D, R, C> lines, IArguments args) {
-		return getDSUtil().ZidSelector(lines, args, false, args.getShowConcise());
+	public ZFrame<D, R, C> getDisplayColumns(ZFrame<D, R, C> lines, IArguments args) {
+		return getDSUtil().ZidSelector(lines, args, args.getShowConcise());
 	}
 
 	public ZFrame<D,R,C> processRecordsCli(ZFrame<D,R,C> lines) throws ZinggClientException {

common/core/src/main/java/zingg/common/core/executor/TrainingDataFinder.java

@@ -188,7 +188,7 @@ public ZFrame<D,R,C> getPositiveSamples(ZFrame<D,R,C> data) throws Exception {
 		}
 		ZFrame<D,R,C> posSample = data.sample(false, args.getLabelDataSampleSize());
 		//select only those columns which are mentioned in the field definitions
-		posSample = getDSUtil().getFieldDefColumnsDS(posSample, args, true);
+		posSample = getDSUtil().ZidSelector(posSample, args, true);
 		if (LOG.isDebugEnabled()) {
 			LOG.debug("Sampled " + posSample.count());
 		}