cishell-svn

[CIShell-SVN] SF.net SVN: cishell: [745] branches/user_prefs/org.cishell.reference.gui. menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper .java

[<mwl...@us...>]

Revision: 745
          http://cishell.svn.sourceforge.net/cishell/?rev=745&view=rev
Author:   mwlinnem
Date:     2008-03-28 13:59:27 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
Fixed bug where we accidentally assumed an algorithm factory was a data validator.

Modified Paths:
--------------
    branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java

Modified: branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
===================================================================
--- branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2008-03-28 20:55:35 UTC (rev 744)
+++ branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2008-03-28 20:59:27 UTC (rev 745)
@@ -151,19 +151,24 @@
 	}
 
 	protected boolean testDataValidityIfPossible(AlgorithmFactory algFactory, Data[] dataInQuestion) {
-		String validation = ((DataValidator) algFactory).validate(dataInQuestion);
+		if (algFactory instanceof DataValidator) {
+			String validation = ((DataValidator) algFactory).validate(dataInQuestion);
 
-		if (validation != null && validation.length() > 0) {
-			String label = (String) algFactoryRef.getProperty(LABEL);
-			if (label == null) {
-				label = "Algorithm";
+			if (validation != null && validation.length() > 0) {
+				String label = (String) algFactoryRef.getProperty(LABEL);
+				if (label == null) {
+					label = "Algorithm";
+				}
+
+				builder.showError("Invalid Data", "The data given to \"" + label + "\" is incompatible for this reason: "
+						+ validation, (String) null);
+				return false;
 			}
-
-			builder.showError("Invalid Data", "The data given to \"" + label + "\" is incompatible for this reason: "
-					+ validation, (String) null);
-			return false;
-		}
-		return true;
+			return true;
+			} else {
+				//counts as valid if there is no validator available.
+				return true;
+			}
 	}
 
 	protected MetaTypeProvider obtainParameterSetupInfo(AlgorithmFactory algFactory, Data[] data) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[CIShell-SVN] SF.net SVN: cishell: [750] branches/user_prefs/org.cishell.reference.gui. menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper .java

[<mwl...@us...>]

Revision: 750
          http://cishell.svn.sourceforge.net/cishell/?rev=750&view=rev
Author:   mwlinnem
Date:     2008-04-02 08:34:10 -0700 (Wed, 02 Apr 2008)

Log Message:
-----------
Fixed bug in converting data to format required by an algorithm.

Modified Paths:
--------------
    branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java

Modified: branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
===================================================================
--- branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2008-04-02 15:04:25 UTC (rev 749)
+++ branches/user_prefs/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java	2008-04-02 15:34:10 UTC (rev 750)
@@ -25,6 +25,7 @@
 import org.cishell.app.service.datamanager.DataManagerService;
 import org.cishell.framework.CIShellContext;
 import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmExecutionException;
 import org.cishell.framework.algorithm.AlgorithmFactory;
 import org.cishell.framework.algorithm.AlgorithmProperty;
 import org.cishell.framework.algorithm.DataValidator;
@@ -86,8 +87,11 @@
 	public Data[] execute() {
 		try {
 			// prepare to run the algorithm
-
+			if (convertableData.length > 0) System.err.println("Convertable Data 0 in AlgorithmWrapper" + convertableData[0]);
+			else System.err.println("No Conv 0!");
 			Data[] data = convertDataToRequiredFormat(this.convertableData, this.converters);
+			if (data.length > 0) System.err.println("Data 0 in AlgorithmWrapper humph:" + data[0]);
+			else System.err.println("No Normal 0!");
 			AlgorithmFactory algFactory = (AlgorithmFactory) bContext.getService(algFactoryRef);
 			boolean inputIsValid = testDataValidityIfPossible(algFactory, data);
 			if (!inputIsValid) return null;
@@ -106,10 +110,14 @@
 			// execute the algorithm
 
 			Data[] rawOutData = algorithm.execute();
+			if (rawOutData.length > 0) System.err.println("rawOutData 0 in AlgorithmWrapper:" + rawOutData[0]);
+			else System.err.println("No Raw 0!");
 
 			// return the algorithm's output
 
 			Data[] processedOutData = processOutData(rawOutData);
+			if (processedOutData.length > 0) System.err.println("processedOutData 0 in AlgorithmWrapper:" + processedOutData[0]);
+			else System.err.println("No Processed 0!");
 			return processedOutData;
 
 		} catch (Throwable e) {
@@ -128,17 +136,15 @@
 	public void setProgressMonitor(ProgressMonitor monitor) {
 		progressMonitor = monitor;
 	}
-
-	protected Data[] convertDataToRequiredFormat(Data[] providedData, Converter[][] converters) throws Exception {
+	
+	protected Data[] convertDataToRequiredFormat(Data[] data, Converter[][] converters) throws Exception {
 		// convert data into the in_data format of the algorithm we are trying to run
-		Data[] readyData = new Data[providedData.length];
-
-		for (int i = 0; i < providedData.length; i++) {
+		for (int i = 0; i < data.length; i++) {
 			if (converters[i] != null) {
 				// WARNING: arbitrarily chooses first converter out of a list of possible converters
-				readyData[i] = converters[i][0].convert(providedData[i]);
-
-				if (readyData[i] == null && i < (readyData.length - 1)) {
+				data[i] = converters[i][0].convert(data[i]);
+				System.out.println("readyData " + i + ": " + data[i]);
+				if (data[i] == null && i < (data.length - 1)) {
 					Exception e = new Exception("The converter " + converters[i].getClass().getName()
 							+ " returned a null result where data was expected.");
 					throw e;
@@ -147,7 +153,7 @@
 			}
 		}
 
-		return readyData;
+		return data;
 	}
 
 	protected boolean testDataValidityIfPossible(AlgorithmFactory algFactory, Data[] dataInQuestion) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.