Issue #162: Use training constants to specify training type.

jeffheaton · jeffheaton · commit 9486fb11da21 · 2014-01-10T06:16:03.000-06:00
diff --git a/src/main/java/org/encog/app/analyst/wizard/AnalystWizard.java b/src/main/java/org/encog/app/analyst/wizard/AnalystWizard.java
@@ -571,7 +571,7 @@ private void generateFeedForward(final int inputColumns,
 		}
 
 		this.script.getProperties().setProperty(ScriptProperties.ML_TRAIN_TYPE,
-				"rprop");
+				MLTrainFactory.TYPE_RPROP);
 		this.script.getProperties().setProperty(
 				ScriptProperties.ML_TRAIN_TARGET_ERROR, this.maxError);
 	}
@@ -983,10 +983,10 @@ private void generateRBF(final int inputColumns, final int outputColumns) {
 
 		if (outputColumns > 1) {
 			this.script.getProperties().setProperty(
-					ScriptProperties.ML_TRAIN_TYPE, "rprop");
+					ScriptProperties.ML_TRAIN_TYPE, MLTrainFactory.TYPE_RPROP);
 		} else {
 			this.script.getProperties().setProperty(
-					ScriptProperties.ML_TRAIN_TYPE, "svd");
+					ScriptProperties.ML_TRAIN_TYPE, MLTrainFactory.TYPE_SVD);
 		}
 
 		this.script.getProperties().setProperty(

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ private void generateFeedForward(final int inputColumns,`
`571`	`571`	`}`
`572`	`572`
`573`	`573`	`this.script.getProperties().setProperty(ScriptProperties.ML_TRAIN_TYPE,`
`574`		`- "rprop");`
	`574`	`+ MLTrainFactory.TYPE_RPROP);`
`575`	`575`	`this.script.getProperties().setProperty(`
`576`	`576`	`ScriptProperties.ML_TRAIN_TARGET_ERROR, this.maxError);`
`577`	`577`	`}`
`@@ -983,10 +983,10 @@ private void generateRBF(final int inputColumns, final int outputColumns) {`
`983`	`983`
`984`	`984`	`if (outputColumns > 1) {`
`985`	`985`	`this.script.getProperties().setProperty(`
`986`		`- ScriptProperties.ML_TRAIN_TYPE, "rprop");`
	`986`	`+ ScriptProperties.ML_TRAIN_TYPE, MLTrainFactory.TYPE_RPROP);`
`987`	`987`	`} else {`
`988`	`988`	`this.script.getProperties().setProperty(`
`989`		`- ScriptProperties.ML_TRAIN_TYPE, "svd");`
	`989`	`+ ScriptProperties.ML_TRAIN_TYPE, MLTrainFactory.TYPE_SVD);`
`990`	`990`	`}`
`991`	`991`
`992`	`992`	`this.script.getProperties().setProperty(`