Thread: [CIShell-SVN] SF.net SVN: cishell: [440] trunk/testing/org.cishell.testing. convertertester.core.n

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 440
          http://cishell.svn.sourceforge.net/cishell/?rev=440&view=rev
Author:   teakettle22
Date:     2007-07-26 13:57:48 -0700 (Thu, 26 Jul 2007)

Log Message:
-----------
A functioning Converter Graph Assembler. For each file extension, it generates all valid paths that do not write out to another file extension. It also creates the shortest path from the given file extension to prefuse.data.Graph for use in the ConverterTester.

Modified Paths:
--------------
    trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java

Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java
===================================================================

--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java	2007-07-25 20:50:58 UTC (rev 439)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java	2007-07-26 20:57:48 UTC (rev 440)
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.osgi.framework.ServiceReference;
 
@@ -17,11 +18,12 @@
 	public ConverterGraph(ServiceReference[] converters){
 		this.converters = converters;
 		inDataToAlgorithm = new HashMap<String, ArrayList<ServiceReference>>();
-		fileExtensionTestConverters = new HashMap<String, ArrayList<ConverterPath>>();
-		fileExtensionCompareConverters = new HashMap<String, ConverterPath>();
+		fileExtensionTestConverters = new ConcurrentHashMap<String, ArrayList<ConverterPath>>();
+		fileExtensionCompareConverters = new ConcurrentHashMap<String, ConverterPath>();
 		
 		associateAlgorithms(this.converters, this.inDataToAlgorithm);
 		createConverterPaths(this.inDataToAlgorithm, this.fileExtensionTestConverters, this.fileExtensionCompareConverters);
+		//System.out.println("And here");
 	}
 
 	private void associateAlgorithms(ServiceReference[] sr, Map<String, ArrayList<ServiceReference>> hm){
@@ -48,77 +50,140 @@
 				ConverterPath test = new ConverterPath();
 				//ConverterPath 
 				test.setInData(s);
-				createPaths(algorithms, testPaths, comparePaths, test, s);
+				//createPaths(algorithms, testPaths, comparePaths, test, s);
+				createPaths(algorithms.get(s), test, s);
+				//System.out.println("I've got here");
 			}
 		}
 	}
 	
-	private void createPaths(Map<String,ArrayList<ServiceReference>> algorithms, Map<String, ArrayList<ConverterPath>> testPaths,
-			Map<String, ConverterPath> comparePaths, ConverterPath path, String dataType){
-		/*
+	private ConverterPath createPaths(ArrayList<ServiceReference> algorithms, ConverterPath path, String dataType){
+		ArrayList<ServiceReference> refs = removeReferences(algorithms, path);
+		
+			addCompareCycle(path);
+		
 		if(path.getInData().equals(path.getOutData())){
-			if(testPaths.get(path.getInData()) == null){
-				ArrayList<ConverterPath> paths = new ArrayList<ConverterPath>();
-				paths.add(new ConverterPath(path));
-				testPaths.put(path.getInData(), paths);
-				System.out.println(path);
-			}
-			else{
-				testPaths.get(path.getInData()).add(new ConverterPath(path));
-				System.out.println(path);
-			}
-		}*/
-		try{
-		ArrayList<ServiceReference> algs = new ArrayList<ServiceReference>(algorithms.get(dataType));
+			addTestCycle(path);
+			return path;
+		}
+		while(!refs.isEmpty()){
+			ConverterPath p = new ConverterPath(path);
+			p.addAlgoritm(refs.get(0));
+			refs.remove(0);
+			createPaths(this.inDataToAlgorithm.get(p.getOutData()), p, p.getOutData());
 		
-		algs.removeAll(path.getPath());
-		for(ServiceReference sr : algs){
-			//for(ServiceReference sr: algs){
-				System.out.println(sr.getProperty("service.pid"));
-			//}
-			ConverterPath p = new ConverterPath(path);
-			System.out.println();
-			if(p.addAlgoritm(sr)){
-				algs.remove(sr);
-				createPaths(algorithms, testPaths,comparePaths,p,p.getOutData());
+		}
+		return null;		
+	}
+	
+	private void addTestCycle(ConverterPath cp){
+		String firstOutData, lastInData;
+		firstOutData = cp.getPath().get(0).getProperty("out_data").toString();
+		lastInData = cp.getPath().get(cp.getPath().size()-1).getProperty("in_data").toString();
+		if(firstOutData.equals(lastInData)){
+			addPath(cp);
+		}
+	}
+	
+	private void addCompareCycle(ConverterPath cp){
+		if(cp.getOutData() != null){
+		if(cp.getOutData().equals(ConverterGraph.testOutData)){
+			String key = cp.getInData() + " " + cp.getPath().get(0).getProperty("out_data").toString();
+		if(this.fileExtensionCompareConverters.get(key) == null){
+
+			System.out.println("Adding a new Comparison Path:\n" + cp);
+			this.fileExtensionCompareConverters.put(key, new ConverterPath(cp));
+		}
+		else {
+			int pathSize = this.fileExtensionCompareConverters.get(key).getPath().size();
+			if(pathSize > cp.getPath().size()){
+				ConverterPath oldPath = this.fileExtensionCompareConverters.get(key);
+				System.out.println("Replacing Comparision Path:\n" + oldPath + "with\n"
+						+ cp);
+				this.fileExtensionCompareConverters.put(key, new ConverterPath(cp));
 			}
-			
-			else{
-				if(testPaths.get(path.getInData()) == null){
-					ArrayList<ConverterPath> paths = new ArrayList<ConverterPath>();
-					paths.add(p);
-					testPaths.put(path.getInData(), paths);
-					System.out.println(p);
-				}
-				else{
-					testPaths.get(path.getInData()).add(p);
-					System.out.println(p);
-				}
-				algs.remove(sr);
+		}
+		}
+		}
+	}
+	
+	private static ArrayList<ServiceReference> removeReferences(ArrayList<ServiceReference> al, ConverterPath cp){
+		ArrayList<ServiceReference> srs = new ArrayList<ServiceReference>(al);
+		srs.removeAll(cp.getPath());
+		ArrayList<ServiceReference> forbidden = new ArrayList<ServiceReference>();
+		for(ServiceReference sr: srs){
+			String ss = sr.getProperty("out_data").toString();
+			if(ss.startsWith("file-ext") && (!ss.equals(cp.getInData()))){
+				System.out.println(sr.getProperty("service.pid") + " yes");
+				forbidden.add(sr);
 			}
 		}
-		}catch(NullPointerException npe){
-			npe.printStackTrace();
+		srs.removeAll(forbidden);
+		return srs;
+	}
+	
+	private void addPath(ConverterPath p){
+		if(this.fileExtensionTestConverters.get(p.getInData()) == null){
+			System.out.println("Adding a new path");
+			ArrayList<ConverterPath> paths = new ArrayList<ConverterPath>();
+			paths.add(p);
+			this.fileExtensionTestConverters.put(p.getInData(), paths);
+			System.out.println("Successfully Added");
 		}
+		else{
+			System.out.println("Adding a path");
+			this.fileExtensionTestConverters.get(p.getInData()).add(p);
+			System.out.println("Successfully Added");
 		}
+	}
 		
 	
+	public String printTestConverterPath(String s){
+		StringBuffer sb = new StringBuffer();
+			for(ConverterPath cp : this.fileExtensionTestConverters.get(s)){
+				sb.append(cp.toString());
+			}
+			sb.trimToSize();
+		return sb.toString();
+	}
 	
+	public String printTestConverterPaths(){
+		StringBuffer sb = new StringBuffer();
+		for(String s : this.fileExtensionTestConverters.keySet()){
+			sb.append(printTestConverterPath(s));
+		}
+		sb.trimToSize();
+		return sb.toString();
+	}
+	
+	
+	public String printComparisonConverterPath(String s){
+		return this.fileExtensionCompareConverters.get(s).toString();
+	}
+	
+	public String printComparisonConverterPaths(){
+		StringBuffer sb = new StringBuffer();
+		for(String s: this.fileExtensionCompareConverters.keySet()){
+			sb.append(printComparisonConverterPath(s));
+		}
+		sb.trimToSize();
+		return sb.toString();
+	}
+	
+	
 	public String toString(){
-		String str = "";
+		StringBuffer str = new StringBuffer();
 		for(String s : this.inDataToAlgorithm.keySet()){
-			str += s + "\n";
+			str.append(s + "\n");
 			for(ServiceReference sr : this.inDataToAlgorithm.get(s)){
-				str += "\t" + sr.getProperty("service.pid") + "\n";
+				str.append("\t" + sr.getProperty("service.pid") + "\n");
 			}
 		}
-		
-		for(String s : this.fileExtensionTestConverters.keySet()){
-			for(ConverterPath cp : this.fileExtensionTestConverters.get(s)){
-				str += cp.toString();
-			}
-		}
-		
-		return str;
+		str.append("Test Paths:\n");
+		str.append(printTestConverterPaths());
+		str.append("Comparison Paths:\n");
+		str.append(printComparisonConverterPaths());
+		str.trimToSize();
+		return str.toString();
 	}
 }
\ No newline at end of file


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




Thread: [CIShell-SVN] SF.net SVN: cishell: [440] trunk/testing/org.cishell.testing. convertertester.core.n

cishell-svn