moved model and zingg dir to izargs

zinggAI · May 9, 2024 · 2620ba1 · 2620ba1
1 parent 98af209
commit 2620ba1
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 32 deletions.
diff --git a/common/client/src/main/java/zingg/common/client/Arguments.java b/common/client/src/main/java/zingg/common/client/Arguments.java
@@ -87,13 +87,13 @@ public class Arguments implements Serializable, IArguments {
 	Pipe[] output; 
 	Pipe[] data;	
 	//Pipe[] zinggInternal;
-	String zinggDir = "/tmp/zingg";
+	String zinggDir = IZArgs.ZINGG_DIR;
 
 	Pipe[] trainingSamples;
 	List<? extends FieldDefinition> fieldDefinition;
 	int numPartitions = 10;
 	float labelDataSampleSize = 0.01f;
-	String modelId = "1";
+	String modelId = IZArgs.MODEL_ID;
 	double threshold = 0.5d;
 	int jobId = 1;
 	boolean collectMetrics = true;

diff --git a/common/client/src/main/java/zingg/common/client/IArguments.java b/common/client/src/main/java/zingg/common/client/IArguments.java
@@ -78,21 +78,7 @@ public Pipe[] getZinggInternal() {
 		return zinggInternal;
 	}
 	
-	/**
-	 * Set the location for Zingg to save its internal computations and
-	 * models. Please set it to a place where the program has write access.
-	 * 
-	 * @param zinggDir
-	 *            path to the Zingg directory
 	
-	public void setZinggInternal(Pipe[] zinggDir) {
-		this.zinggInternal = zinggDir;
-	}
-	*/
-
-	String getModelId();
-
-	void setModelId(String modelId);
 
 	/**
 	 * Get the output directory where the match output will be saved
@@ -127,22 +113,6 @@ public void setZinggInternal(Pipe[] zinggDir) {
 	 */
 	void setData(Pipe[] dataFile) throws ZinggClientException;
 
-	/**
-	 * Location for internal Zingg use.
-	 * 
-	 * @return the path for internal Zingg usage
-	 */
-	String getZinggDir();
-
-	/**
-	 * Set the location for Zingg to save its internal computations and
-	 * models. Please set it to a place where the program has write access.
-	 * 
-	 * @param zinggDir
-	 *            path to the Zingg directory
-	 */
-	void setZinggDir(String zinggDir);
-
 	/**
 	 * Location for internal Zingg use.
 	 * 

diff --git a/common/client/src/main/java/zingg/common/client/IZArgs.java b/common/client/src/main/java/zingg/common/client/IZArgs.java
@@ -5,8 +5,42 @@
  */
 public interface IZArgs {
 
+    String ZINGG_DIR = "/tmp/zingg";
+    String MODEL_ID = "1";
+
     boolean getCollectMetrics();
 
 	void setCollectMetrics(boolean collectMetrics);
 
+    /**
+	 * Set the location for Zingg to save its internal computations and
+	 * models. Please set it to a place where the program has write access.
+	 * 
+	 * @param zinggDir
+	 *            path to the Zingg directory
+	
+	public void setZinggInternal(Pipe[] zinggDir) {
+		this.zinggInternal = zinggDir;
+	}
+	*/
+
+	String getModelId();
+
+	void setModelId(String modelId);
+
+    /**
+	 * Location for internal Zingg use.
+	 * 
+	 * @return the path for internal Zingg usage
+	 */
+	String getZinggDir();
+
+	/**
+	 * Set the location for Zingg to save its internal computations and
+	 * models. Please set it to a place where the program has write access.
+	 * 
+	 * @param zinggDir
+	 *            path to the Zingg directory
+	 */
+	void setZinggDir(String zinggDir);
 }