systemml git commit: [MINOR] Remove deprecated MLContext method from DMLScript

[de...@apache.org]

Repository: systemml
Updated Branches:
  refs/heads/master 7fec7fa57 -> 8544f6960


[MINOR] Remove deprecated MLContext method from DMLScript


Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/8544f696
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/8544f696
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/8544f696

Branch: refs/heads/master
Commit: 8544f6960e994bed7f0da8d27281cbed094e88e9
Parents: 7fec7fa
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Mon Jun 19 10:58:42 2017 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Mon Jun 19 10:58:42 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/sysml/api/DMLScript.java    | 69 --------------------
 1 file changed, 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/systemml/blob/8544f696/src/main/java/org/apache/sysml/api/DMLScript.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/api/DMLScript.java b/src/main/java/org/apache/sysml/api/DMLScript.java
index c927250..6a9077a 100644
--- a/src/main/java/org/apache/sysml/api/DMLScript.java
+++ b/src/main/java/org/apache/sysml/api/DMLScript.java
@@ -541,75 +541,6 @@ public class DMLScript
 		
 		return true;
 	}
-	
-	///////////////////////////////
-	// private internal utils (argument parsing)
-	////////
-
-	@Deprecated()
-	/**
-	 * Creates an argument map appropriate for consumption by the backend
-	 * The only method using this is the legacy {@link MLContext} api.
-	 * Once that is removed, this function should be removed as well.
-	 * This method uses a fragile position based argument for -args & -nvargs
-	 * @param hasNamedArgs true for named arguments, false for positional arguments
-	 * @param args in "k=v" format for named arguments and "v" for positional arguments
-	 * @return	a map containing either ($K,V) or ($1,V) for named and positional arguments respectively
-	 * @throws LanguageException when a named argument is an invalid identifier for DML/PyDML
-	 */
-	protected static Map<String,String> createArgumentsMap(boolean hasNamedArgs, String[] args)
-		throws LanguageException
-	{			
-		Map<String, String> argMap = new HashMap<String,String>();
-		
-		if (args == null)
-			return argMap;
-		
-		for(int i=1; i<=args.length; i++)
-		{
-			String arg = args[i-1];
-			
-			if (arg.equalsIgnoreCase("-l") || arg.equalsIgnoreCase("-log") ||
-				arg.equalsIgnoreCase("-v") || arg.equalsIgnoreCase("-visualize")||
-				arg.equalsIgnoreCase("-explain") || 
-				arg.equalsIgnoreCase("-debug") || 
-				arg.equalsIgnoreCase("-stats") || 
-				arg.equalsIgnoreCase("-exec") ||
-				arg.equalsIgnoreCase("-debug") ||
-				arg.startsWith("-config"))
-			{
-					throw new LanguageException("-args or -nvargs must be the final argument for DMLScript!");
-			}
-			
-			//parse arguments (named args / args by position)
-			if(hasNamedArgs)
-			{
-				// CASE: named argument argName=argValue -- must add <argName, argValue> pair to _argVals
-				String[] argPieces = arg.split("=");
-				if(argPieces.length < 2)
-					throw new LanguageException("for -nvargs option, elements in arg list must be named and have form argName=argValue");
-				String argName = argPieces[0];
-				StringBuilder sb = new StringBuilder();
-				for (int jj=1; jj < argPieces.length; jj++){
-					sb.append(argPieces[jj]); 
-				}
-				
-				String varNameRegex = "^[a-zA-Z]([a-zA-Z0-9_])*$";
-				if (!argName.matches(varNameRegex))
-					throw new LanguageException("argName " + argName + " must be a valid variable name in DML. Valid variable names in DML start with upper-case or lower-case letter, and contain only letters, digits, or underscores");
-					
-				argMap.put("$"+argName,sb.toString());
-			}
-			else 
-			{
-				// CASE: unnamed argument -- use position in arg list for name
-				argMap.put("$"+i ,arg);
-			}
-		}
-		
-		return argMap;
-	}
-
 
 	/**
 	 * Reads the DML/PyDML script into a String