Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [466] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ converter
|
From: <tea...@us...> - 2007-08-09 19:44:40
|
Revision: 466
http://cishell.svn.sourceforge.net/cishell/?rev=466&view=rev
Author: teakettle22
Date: 2007-08-09 12:44:36 -0700 (Thu, 09 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java
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/ConverterLoaderImpl.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-08-09 19:13:21 UTC (rev 465)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-08-09 19:44:36 UTC (rev 466)
@@ -51,8 +51,9 @@
ServiceReference[] refs = bContext.getServiceReferences(
AlgorithmFactory.class.getName(), filter);
- /* ConverterGraph g = new ConverterGraph(refs);
- System.out.println(g.printComparisonConverterPaths() + "\n" +
+ // ConverterGraph g = new ConverterGraph(refs);
+ // System.out.println(g.printComparisonConverterPaths());
+ /* System.out.println(g.printComparisonConverterPaths() + "\n" +
g.getComparePaths().length + "\n" + g.printTestConverterPaths() + "\n");
int length = 0;
for(int i = 0; i < g.getTestPaths().length; i++){
@@ -61,10 +62,10 @@
}
}
System.out.println(length + " " + g.getTestPaths().length);
+ */
+ // System.out.println(g);
- // System.out.println(g);
- *
-*/ if (refs != null) {
+ if (refs != null) {
for (int i = 0; i < refs.length; ++i) {
this.converterList.put(refs[i].getProperty("service.pid").toString(), refs[i]);
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-08-09 19:13:21 UTC (rev 465)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-08-09 19:44:36 UTC (rev 466)
@@ -6,6 +6,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
@@ -66,6 +67,7 @@
}
}
+
}
private ConverterPath createPaths(ArrayList algorithms, ConverterPath path, String dataType){
@@ -91,6 +93,7 @@
String firstOutData, lastInData;
firstOutData = ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString();
lastInData = ((ServiceReference)cp.getPath().get(cp.getPath().size()-1)).getProperty("in_data").toString();
+ //System.out.println(firstOutData + " " + lastInData);
if(firstOutData.equals(lastInData)){
addTestPath(cp);
}
@@ -100,6 +103,7 @@
if(cp.getOutData() != null){
if(cp.getOutData().equals(ConverterGraph.testOutData)){
String key = cp.getInData() + " " + ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString();
+ //System.out.println(key);
if(this.fileExtensionCompareConverters.get(key) == null){
@@ -134,16 +138,19 @@
}
private void addTestPath(ConverterPath p){
- if(this.fileExtensionTestConverters.get(p.getInData()) == null){
+ String key = p.getInData();
+ key += " ";
+ key += ((ServiceReference)p.getPath().get(0)).getProperty("out_data").toString();
+ if(this.fileExtensionTestConverters.get(key) == null){
ArrayList paths = new ArrayList();
paths.add(p);
- this.fileExtensionTestConverters.put(p.getInData(), paths);
+ this.fileExtensionTestConverters.put(key, paths);
}
else{
- ((ArrayList)this.fileExtensionTestConverters.get((p.getInData()))).add(p);
+ ((ArrayList)this.fileExtensionTestConverters.get(key)).add(p);
}
}
@@ -154,7 +161,7 @@
ArrayList al = (ArrayList)this.fileExtensionTestConverters.get(s);
for(int i = 0; i < al.size(); i++){
ConverterPath cp = (ConverterPath)al.get(i);
- sb.append(s + cp.toString());
+ sb.append(cp.toString());
}
sb.trimToSize();
return sb.toString();
@@ -179,11 +186,12 @@
public String printComparisonConverterPaths(){
StringBuffer sb = new StringBuffer();
- String[] keySet = new String[this.fileExtensionTestConverters.keySet().size()];
- keySet = (String[])this.fileExtensionTestConverters.keySet().toArray(keySet);
+ String[] keySet = new String[this.fileExtensionCompareConverters.keySet().size()];
+ keySet = (String[])this.fileExtensionCompareConverters.keySet().toArray(keySet);
for(int i = 0; i < keySet.length; i++){
String s = keySet[i];
- sb.append(printTestConverterPath(s));
+ System.out.println(s);
+ sb.append(printComparisonConverterPath(s));
}
sb.trimToSize();
return sb.toString();
@@ -229,6 +237,7 @@
return (ConverterPath)this.fileExtensionCompareConverters.get(s);
}
+
public ConverterPath[] getComparePaths(){
String[] fileExtensions = (String[])this.fileExtensionCompareConverters.keySet().toArray(new String[0]);
ArrayList graphs = new ArrayList();
@@ -238,6 +247,14 @@
return (ConverterPath[])graphs.toArray(new ConverterPath[0]);
}
+ public Map getCompareMap(){
+ return this.fileExtensionCompareConverters;
+ }
+
+ public Map getTestMap(){
+ return this.fileExtensionTestConverters;
+ }
+
public File asNWB(){
File f = getTempFile();
Map nodes = assembleNodesSet();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
