unifying datatype in generics

client/src/main/java/zingg/client/Client.java

@@ -18,7 +18,7 @@
  * @author sgoyal
  *
  */
-public class Client<S, D,R,C,T,T1> implements Serializable {
+public class Client<S, D,R,C,T> implements Serializable {
 	private Arguments arguments;
 	private IZingg<D,R,C> zingg;
 	private ClientOptions options;

core/src/main/java/zingg/Documenter.java

@@ -21,7 +21,7 @@
 import zingg.util.RowAdapter;
 import zingg.util.RowWrapper;
 
-public abstract class Documenter<S,D,R,C,T1,T2> extends ZinggBase<S,D,R,C,T1,T2> {
+public abstract class Documenter<S,D,R,C,T> extends ZinggBase<S,D,R,C,T> {
 
 	protected static String name = "zingg.Documenter";
 	public static final Log LOG = LogFactory.getLog(Documenter.class);

core/src/main/java/zingg/FindAndLabeller.java

@@ -6,11 +6,11 @@
 import zingg.client.ZinggClientException;
 import zingg.client.ZinggOptions;
 
-public abstract class FindAndLabeller<S,D,R,C,T1,T2> extends Labeller<S,D,R,C,T1,T2> {
+public abstract class FindAndLabeller<S,D,R,C,T> extends Labeller<S,D,R,C,T> {
 	protected static String name = "zingg.FindAndLabeller";
 	public static final Log LOG = LogFactory.getLog(FindAndLabeller.class);
 
-	private TrainingDataFinder<S,D,R,C,T1,T2> finder;
+	private TrainingDataFinder<S,D,R,C,T> finder;
 
 	public FindAndLabeller() {
 		setZinggOptions(ZinggOptions.FIND_AND_LABEL);		

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

@@ -20,7 +20,7 @@
 import zingg.util.LabelMatchType;
 import zingg.util.PipeUtilBase;
 
-public abstract class LabelUpdater<S,D,R,C,T1,T2> extends Labeller<S,D,R,C,T1,T2> {
+public abstract class LabelUpdater<S,D,R,C,T> extends Labeller<S,D,R,C,T> {
 	protected static String name = "zingg.LabelUpdater";
 	public static final Log LOG = LogFactory.getLog(LabelUpdater.class);
 

core/src/main/java/zingg/Labeller.java

@@ -19,7 +19,7 @@
 import zingg.client.util.ColValues;
 import zingg.util.LabelMatchType;
 
-public abstract class Labeller<S,D,R,C,T1,T2> extends ZinggBase<S,D,R,C,T1,T2> {
+public abstract class Labeller<S,D,R,C,T> extends ZinggBase<S,D,R,C,T> {
 
 	protected static String name = "zingg.Labeller";
 	public static final Log LOG = LogFactory.getLog(Labeller.class);

core/src/main/java/zingg/Linker.java

@@ -25,7 +25,7 @@
 
 
 
-public abstract class Linker<S,D,R,C,T1,T2> extends Matcher<S,D,R,C,T1,T2> {
+public abstract class Linker<S,D,R,C,T> extends Matcher<S,D,R,C,T> {
 
 	protected static String name = "zingg.Linker";
 	public static final Log LOG = LogFactory.getLog(Linker.class);

core/src/main/java/zingg/Matcher.java

@@ -18,7 +18,7 @@
 import zingg.client.util.ColValues;
 import zingg.util.Metric;
 
-public abstract class Matcher<S,D,R,C,T1,T2> extends ZinggBase<S,D,R,C,T1,T2>{
+public abstract class Matcher<S,D,R,C,T> extends ZinggBase<S,D,R,C,T>{
 
 
 	protected static String name = "zingg.Matcher";

core/src/main/java/zingg/Recommender.java

@@ -7,7 +7,7 @@
 import zingg.client.ZinggOptions;
 import zingg.recommender.StopWordsRecommender;
 
-public class Recommender<S,D,R,C, T,T1> extends ZinggBase<S,D,R,C,T,T1> {
+public class Recommender<S,D,R,C, T> extends ZinggBase<S,D,R,C,T> {
 
 	protected static String name = "zingg.Recommender";
 	public static final Log LOG = LogFactory.getLog(Recommender.class);

core/src/main/java/zingg/TrainMatcher.java

@@ -6,12 +6,12 @@
 import zingg.client.ZinggClientException;
 import zingg.client.ZinggOptions;
 
-public abstract class TrainMatcher<S,D,R,C,T1,T2> extends Matcher<S,D,R,C,T1,T2>{
+public abstract class TrainMatcher<S,D,R,C,T> extends Matcher<S,D,R,C,T>{
 
 	protected static String name = "zingg.TrainMatcher";
 	public static final Log LOG = LogFactory.getLog(TrainMatcher.class); 
 
-	private Trainer<S,D,R,C,T1,T2> trainer;
+	private Trainer<S,D,R,C,T> trainer;
 
     public TrainMatcher() {
         setZinggOptions(ZinggOptions.TRAIN_MATCH);		

core/src/main/java/zingg/Trainer.java

@@ -20,7 +20,7 @@
 import zingg.util.ModelUtil;
 import zingg.util.PipeUtilBase;
 
-public abstract class Trainer<S,D,R,C,T1,T2> extends ZinggBase<S,D,R,C,T1,T2>{
+public abstract class Trainer<S,D,R,C,T> extends ZinggBase<S,D,R,C,T>{
 
 	protected static String name = "zingg.Trainer";
 	public static final Log LOG = LogFactory.getLog(Trainer.class);    

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

@@ -17,7 +17,7 @@
 import zingg.util.DSUtil;
 import zingg.util.ModelUtil;
 
-public abstract class TrainingDataFinder<S,D,R,C,T1,T2> extends ZinggBase<S,D,R,C,T1,T2>{
+public abstract class TrainingDataFinder<S,D,R,C,T> extends ZinggBase<S,D,R,C,T>{
 
 	protected static String name = "zingg.TrainingDataFinder";
 	public static final Log LOG = LogFactory.getLog(TrainingDataFinder.class);    

core/src/main/java/zingg/ZinggBase.java

@@ -40,7 +40,7 @@
 //Dataset
 //row
 //column
-public abstract class ZinggBase<S,D, R, C, T1,T2> implements Serializable, IZingg<D, R, C> {
+public abstract class ZinggBase<S,D, R, C, T> implements Serializable, IZingg<D, R, C> {
 
     protected Arguments args;
 
@@ -55,11 +55,11 @@ public abstract class ZinggBase<S,D, R, C, T1,T2> implements Serializable, IZing
 
     public static final Log LOG = LogFactory.getLog(ZinggBase.class);
     protected PipeUtilBase<S,D,R,C> pipeUtil;
-    protected HashUtil<D,R,C,T1,T2> hashUtil;
+    protected HashUtil<D,R,C,T> hashUtil;
     protected DSUtil<S,D,R,C> dsUtil;
     protected GraphUtil<D,R,C> graphUtil;
     protected ModelUtil<S,D,R,C> modelUtil;
-    protected BlockingTreeUtil<D,R,C,T1,T2> blockingTreeUtil;
+    protected BlockingTreeUtil<D,R,C,T> blockingTreeUtil;
     ZinggBase base;
 
 
@@ -83,7 +83,7 @@ public ZinggBase() {
 
     }
 
-    public void setBase(ZinggBase<S,D,R,C,T1,T2> base) {
+    public void setBase(ZinggBase<S,D,R,C,T> base) {
         this.base = base;
     }
 
@@ -222,11 +222,11 @@ public Long getUnsureMarkedRecordsStat(ZFrame<D,R,C> markedRecords){
 
 
 
-    public HashUtil<D,R,C,T1,T2> getHashUtil() {
+    public HashUtil<D,R,C,T> getHashUtil() {
         return base.getHashUtil();
     }
 
-    public void setHashUtil(HashUtil<D,R,C,T1,T2> t) {
+    public void setHashUtil(HashUtil<D,R,C,T> t) {
         base.setHashUtil(t);
     }
 
@@ -269,7 +269,7 @@ public PipeUtilBase<S,D,R,C> getPipeUtil() {
         return base.pipeUtil;
     }
 
-    public BlockingTreeUtil<D,R,C,T1,T2> getBlockingTreeUtil() {
+    public BlockingTreeUtil<D,R,C,T> getBlockingTreeUtil() {
         return base.blockingTreeUtil;
     }
 

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

@@ -26,7 +26,7 @@
 import scala.collection.JavaConversions;
 import scala.collection.Seq;
 
-public class Block<D,R,C,T,T1> implements Serializable {
+public class Block<D,R,C,T> implements Serializable {
 
 	public static final Log LOG = LogFactory.getLog(Block.class);
 

core/src/main/java/zingg/documenter/DataDocumenter.java

@@ -16,7 +16,7 @@
 import zingg.client.ZFrame;
 import zingg.client.ZinggClientException;
 
-public class DataDocumenter<S,D,R,C,T,T1> extends DocumenterBase<S,D,R,C,T,T1> {
+public class DataDocumenter<S,D,R,C,T> extends DocumenterBase<S,D,R,C,T> {
 	protected static String name = "zingg.DataDocumenter";
 	protected static String TEMPLATE_TITLE = "Data Documentation";
 	private final String DATA_DOC_TEMPLATE = "dataDocTemplate.ftlh";

core/src/main/java/zingg/documenter/DocumenterBase.java

@@ -16,7 +16,7 @@
 import zingg.client.util.ColName;
 import zingg.util.RowWrapper;
 
-class DocumenterBase<S,D,R,C,T,T1> extends ZinggBase<S,D,R,C,T,T1>{
+class DocumenterBase<S,D,R,C,T> extends ZinggBase<S,D,R,C,T>{
 	protected static Configuration config;
 	protected SparkSession spark;
 	protected Arguments args;

core/src/main/java/zingg/documenter/ModelColDocumenter.java

@@ -14,7 +14,7 @@
 import zingg.client.ZFrame;
 import zingg.client.ZinggClientException;
 
-public class ModelColDocumenter<S,D,R,C,T,T1> extends DocumenterBase<S,D,R,C,T,T1> {
+public class ModelColDocumenter<S,D,R,C,T> extends DocumenterBase<S,D,R,C,T> {
 	protected static String name = "zingg.ModelColDocumenter";
 	public static final Log LOG = LogFactory.getLog(ModelColDocumenter.class);
 

core/src/main/java/zingg/documenter/ModelDocumenter.java

@@ -17,13 +17,13 @@
 import zingg.client.ZinggClientException;
 import zingg.client.util.ColName;
 
-public class ModelDocumenter<S,D,R,C,T,T1> extends DocumenterBase<S,D,R,C,T,T1> {
+public class ModelDocumenter<S,D,R,C,T> extends DocumenterBase<S,D,R,C,T> {
 
 	protected static String name = "zingg.ModelDocumenter";
 	public static final Log LOG = LogFactory.getLog(ModelDocumenter.class);
 
 	private final String MODEL_TEMPLATE = "model.ftlh";
-	ModelColDocumenter<S,D,R,C,T,T1> modelColDoc;
+	ModelColDocumenter<S,D,R,C,T> modelColDoc;
 	protected  ZFrame<D,R,C>  markedRecords;
 
 	public ModelDocumenter(Arguments args) {

core/src/main/java/zingg/hash/First1Chars.java

@@ -1,7 +1,7 @@
 package zingg.hash;
 
 
-public abstract class First1Chars<D,R,C,T,T1> extends FirstChars<D,R,C,T,T1>{
+public abstract class First1Chars<D,R,C,T> extends FirstChars<D,R,C,T>{
 
 	public First1Chars() {
 		super(1);

core/src/main/java/zingg/hash/First2Chars.java

@@ -1,6 +1,6 @@
 package zingg.hash;
 
-public abstract class First2Chars<D,R,C,T,T1> extends FirstChars<D,R,C,T,T1>{
+public abstract class First2Chars<D,R,C,T> extends FirstChars<D,R,C,T>{
 
 	public First2Chars() {
 		super(2);

core/src/main/java/zingg/hash/First2CharsBox.java

@@ -4,7 +4,7 @@
 import org.apache.spark.sql.api.java.UDF1;
 import org.apache.spark.sql.types.DataTypes;
 
-public abstract class First2CharsBox<D,R,C,T,T1>extends HashFunction<D,R,C,T,T1> implements UDF1<String, Integer>{
+public abstract class First2CharsBox<D,R,C,T>extends HashFunction<D,R,C,T> implements UDF1<String, Integer>{
 
 	public First2CharsBox() {
 		super("first2CharsBox");

core/src/main/java/zingg/hash/First3Chars.java

@@ -1,6 +1,6 @@
 package zingg.hash;
 
-public abstract class First3Chars<D,R,C,T,T1> extends FirstChars<D,R,C,T,T1>{
+public abstract class First3Chars<D,R,C,T> extends FirstChars<D,R,C,T>{
 
 	public First3Chars() {
 		super(3);

core/src/main/java/zingg/hash/First3CharsBox.java

@@ -4,7 +4,7 @@
 import org.apache.spark.sql.api.java.UDF1;
 import org.apache.spark.sql.types.DataTypes;
 
-public abstract class First3CharsBox<D,R,C,T,T1> extends HashFunction<D,R,C,T,T1> implements UDF1<String, Integer>{
+public abstract class First3CharsBox<D,R,C,T> extends HashFunction<D,R,C,T> implements UDF1<String, Integer>{
 
 	public First3CharsBox() {
 		super("first3CharsBox");

core/src/main/java/zingg/hash/First4Chars.java

@@ -1,6 +1,6 @@
 package zingg.hash;
 
-public abstract class First4Chars<D,R,C,T,T1> extends FirstChars<D,R,C,T,T1>{
+public abstract class First4Chars<D,R,C,T> extends FirstChars<D,R,C,T>{
 
 	public First4Chars() {
 		super(4);

core/src/main/java/zingg/hash/FirstChars.java

@@ -9,7 +9,7 @@
 import zingg.block.Canopy;
 
 
-public abstract class FirstChars<D,R,C,T,T1> extends HashFunction<D,R,C,T,T1>{
+public abstract class FirstChars<D,R,C,T> extends HashFunction<D,R,C,T>{
 
 	public static final Log LOG = LogFactory.getLog(FirstChars.class);
 

core/src/main/java/zingg/hash/HashFunction.java

@@ -4,27 +4,27 @@
 
 import zingg.client.ZFrame;
 
-public abstract class HashFunction<D,R,C,T,T1> implements Serializable{
+public abstract class HashFunction<D,R,C,T> implements Serializable{
 		/**
 		 * 
 		 */
 		private static final long serialVersionUID = 1L;
 		protected T dataType;
 		protected String name;
 		protected boolean isUdf = true;
-		protected T1 returnType;
+		protected T returnType;
 
 		public HashFunction(String name) {
 			this.name = name;
 		}
 
-		public HashFunction(String name, T cl, T1 returnType) {
+		public HashFunction(String name, T cl, T returnType) {
 			this.name = name;
 			this.dataType = cl;
 			this.returnType = returnType;
 		}
 
-		public HashFunction(String name, T cl, T1 returnType, boolean isUdf) {
+		public HashFunction(String name, T cl, T returnType, boolean isUdf) {
 			this(name, cl, returnType);
 			this.isUdf = isUdf;
 		}
@@ -51,11 +51,11 @@ public void setUdf(boolean isUdf) {
 			this.isUdf = isUdf;
 		}
 
-		public T1 getReturnType() {
+		public T getReturnType() {
 			return returnType;
 		}
 
-		public void setReturnType(T1 returnType) {
+		public void setReturnType(T returnType) {
 			this.returnType = returnType;
 		}
 

core/src/main/java/zingg/hash/HashFunctionRegistry.java

@@ -1,6 +1,6 @@
 package zingg.hash;
 
-public interface HashFunctionRegistry<D,R,C,T,T1>  {
+public interface HashFunctionRegistry<D,R,C,T>  {
 
 	//public static HashMap<String, HashFunction<D,R,C,T,T1> > fns = new  HashMap<String,HashFunction<D,R,C,T,T1>>();
 		/*
@@ -39,6 +39,6 @@ public interface HashFunctionRegistry<D,R,C,T,T1>  {
 		init(new RangeBetween1000And10000Dbl());
 	*/
 
-	public void init(HashFunction<D,R,C,T,T1> fn);
+	public void init(HashFunction<D,R,C,T> fn);
 
 }

core/src/main/java/zingg/hash/IdentityInteger.java

@@ -4,7 +4,7 @@
 import org.apache.spark.sql.api.java.UDF1;
 import org.apache.spark.sql.types.DataTypes;
 
-public abstract class IdentityInteger<D,R,C,T,T1> extends HashFunction<D,R,C,T,T1> implements UDF1<Integer, Integer>{
+public abstract class IdentityInteger<D,R,C,T> extends HashFunction<D,R,C,T> implements UDF1<Integer, Integer>{
 
 	public IdentityInteger() {
 		super("identityInteger");

core/src/main/java/zingg/hash/IdentityString.java

@@ -3,7 +3,7 @@
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.api.java.UDF1;
 import org.apache.spark.sql.types.DataTypes;
-public abstract class IdentityString<D,R,C,T,T1> extends HashFunction<D,R,C,T,T1> implements UDF1<String, String>{
+public abstract class IdentityString<D,R,C,T> extends HashFunction<D,R,C,T> implements UDF1<String, String>{
 
 	public IdentityString() {
 		super("identityString");

core/src/main/java/zingg/hash/IsNullOrEmpty.java

@@ -4,7 +4,7 @@
 import org.apache.spark.sql.api.java.UDF1;
 import org.apache.spark.sql.types.DataTypes;
 
-public abstract class IsNullOrEmpty<D,R,C,T,T1> extends HashFunction<D,R,C,T,T1> implements UDF1<String, Boolean>{
+public abstract class IsNullOrEmpty<D,R,C,T> extends HashFunction<D,R,C,T> implements UDF1<String, Boolean>{
 
 	public IsNullOrEmpty() {
 		super("isNullOrEmpty");

core/src/main/java/zingg/hash/Last1Chars.java

@@ -1,6 +1,6 @@
 package zingg.hash;
 
-public abstract class Last1Chars<D,R,C,T,T1> extends LastChars<D,R,C,T,T1>{
+public abstract class Last1Chars<D,R,C,T> extends LastChars<D,R,C,T>{
 
 	public Last1Chars() {
 		super(1);

core/src/main/java/zingg/hash/Last2Chars.java

@@ -1,6 +1,6 @@
 package zingg.hash;
 
-public abstract class Last2Chars<D,R,C,T,T1> extends LastChars<D,R,C,T,T1>{
+public abstract class Last2Chars<D,R,C,T> extends LastChars<D,R,C,T>{
 
 	public Last2Chars() {
 		super(2);

core/src/main/java/zingg/hash/Last3Chars.java

@@ -1,6 +1,6 @@
 package zingg.hash;
 
-public abstract class Last3Chars<D,R,C,T,T1> extends LastChars<D,R,C,T,T1>{
+public abstract class Last3Chars<D,R,C,T> extends LastChars<D,R,C,T>{
 
 	public Last3Chars() {
 		super(3);

core/src/main/java/zingg/hash/LastChars.java

@@ -4,7 +4,7 @@
 import org.apache.spark.sql.api.java.UDF1;
 import org.apache.spark.sql.types.DataTypes;
 
-public abstract class LastChars<D,R,C,T,T1> extends HashFunction<D,R,C,T,T1> implements UDF1<String, String>{
+public abstract class LastChars<D,R,C,T> extends HashFunction<D,R,C,T> implements UDF1<String, String>{
 	int numChars;
 
 	public LastChars(int endIndex) {