From: <tea...@us...> - 2007-07-25 20:51:02
|
Revision: 439 http://cishell.svn.sourceforge.net/cishell/?rev=439&view=rev Author: teakettle22 Date: 2007-07-25 13:50:58 -0700 (Wed, 25 Jul 2007) Log Message: ----------- first implementation of the converter graph. Warning!!! Many errors; unusable, committing to store it so that I don't rely on local storage. Added Paths: ----------- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ 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/ConverterNode.java trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java Added: 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 (rev 0) +++ 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) @@ -0,0 +1,124 @@ +package org.cishell.testing.convertertester.core.converter.graph; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import org.osgi.framework.ServiceReference; + +public class ConverterGraph { + prefuse.data.Graph converterGraph; + Map<String, ArrayList<ServiceReference>> inDataToAlgorithm; + Map<String, ArrayList<ConverterPath>> fileExtensionTestConverters; + Map<String, ConverterPath> fileExtensionCompareConverters; + ServiceReference[] converters; + private static final String testOutData = "prefuse.data.Graph"; + + public ConverterGraph(ServiceReference[] converters){ + this.converters = converters; + inDataToAlgorithm = new HashMap<String, ArrayList<ServiceReference>>(); + fileExtensionTestConverters = new HashMap<String, ArrayList<ConverterPath>>(); + fileExtensionCompareConverters = new HashMap<String, ConverterPath>(); + + associateAlgorithms(this.converters, this.inDataToAlgorithm); + createConverterPaths(this.inDataToAlgorithm, this.fileExtensionTestConverters, this.fileExtensionCompareConverters); + } + + private void associateAlgorithms(ServiceReference[] sr, Map<String, ArrayList<ServiceReference>> hm){ + for(ServiceReference srv : sr){ + String s = srv.getProperty("in_data").toString(); + if(hm.get(s) == null){ + ArrayList<ServiceReference> al = new ArrayList<ServiceReference>(); + al.add(srv); + hm.put(s, al); + } + else{ + hm.get(s).add(srv); + } + } + } + + private void createConverterPaths(Map<String, ArrayList<ServiceReference>> algorithms, Map<String, ArrayList<ConverterPath>> testPaths, + Map<String, ConverterPath> comparePaths){ + + for(String s : algorithms.keySet()){ + if(s.startsWith("file-ext")){ + + + ConverterPath test = new ConverterPath(); + //ConverterPath + test.setInData(s); + createPaths(algorithms, testPaths, comparePaths, test, s); + } + } + } + + private void createPaths(Map<String,ArrayList<ServiceReference>> algorithms, Map<String, ArrayList<ConverterPath>> testPaths, + Map<String, ConverterPath> comparePaths, ConverterPath path, String dataType){ + /* + 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)); + + 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()); + } + + 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); + } + } + }catch(NullPointerException npe){ + npe.printStackTrace(); + } + } + + + + public String toString(){ + String str = ""; + for(String s : this.inDataToAlgorithm.keySet()){ + str += s + "\n"; + for(ServiceReference sr : this.inDataToAlgorithm.get(s)){ + str += "\t" + sr.getProperty("service.pid") + "\n"; + } + } + + for(String s : this.fileExtensionTestConverters.keySet()){ + for(ConverterPath cp : this.fileExtensionTestConverters.get(s)){ + str += cp.toString(); + } + } + + return str; + } +} \ No newline at end of file Added: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterNode.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterNode.java (rev 0) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterNode.java 2007-07-25 20:50:58 UTC (rev 439) @@ -0,0 +1,32 @@ +package org.cishell.testing.convertertester.core.converter.graph; + +public class ConverterNode { + String name; + int id; + + public ConverterNode(String s, int i){ + name = s; + id = i; + } + + public String getName(){ + return name; + } + + public int getID(){ + return id; + } + + public void setName(String s){ + name = s; + } + + public void setID(int i){ + id = i; + } + + public String toString(){ + return name + " " + id; + } + +} Added: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java (rev 0) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java 2007-07-25 20:50:58 UTC (rev 439) @@ -0,0 +1,69 @@ +package org.cishell.testing.convertertester.core.converter.graph; + +import java.util.ArrayList; +import java.util.List; + +import org.osgi.framework.ServiceReference; + +public class ConverterPath { + String in_data; + String out_data = null; + ArrayList<ServiceReference> path; + + public ConverterPath(){ + path = new ArrayList<ServiceReference>(); + } + + public ConverterPath(ConverterPath p){ + in_data = p.getInData(); + out_data = p.getOutData(); + + this.path = new ArrayList<ServiceReference>(p.getPath()); + + } + + public void setInData(String s){ + this.in_data = s; + } + + public void setOutData(String s){ + this.out_data = s; + } + + public boolean addAlgoritm(ServiceReference sr){ + boolean val = true; + //System.out.println(this.in_data + " " + this.out_data); + if(path.contains(sr)){ + System.out.println("Path already contains " + sr.getProperty("service.pid")); + //this.setOutData(sr.getProperty("out_data").toString()); + return false; + } + //System.out.println("Adding: " + sr.getProperty("service.pid")); + path.add(sr); + this.setOutData(sr.getProperty("out_data").toString()); + return val; + } + + public String getInData(){ + return this.in_data; + } + + public String getOutData(){ + return this.out_data; + } + + public List<ServiceReference> getPath(){ + return this.path; + } + + public String toString(){ + String val = this.in_data +" -->\n"; + + for(ServiceReference sr : this.path){ + val += "\t" + sr.getProperty("service.pid") + "\n"; + } + val += "--> " + this.out_data + "\n"; + return val; + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tea...@us...> - 2007-07-30 16:11:40
|
Revision: 441 http://cishell.svn.sourceforge.net/cishell/?rev=441&view=rev Author: teakettle22 Date: 2007-07-30 09:11:36 -0700 (Mon, 30 Jul 2007) Log Message: ----------- Refactored code to 1.4 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 trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.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-07-26 20:57:48 UTC (rev 440) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-07-30 16:11:36 UTC (rev 441) @@ -9,6 +9,7 @@ import org.cishell.framework.algorithm.AlgorithmProperty; import org.cishell.service.conversion.Converter; import org.cishell.service.conversion.DataConversionService; +import org.cishell.testing.convertertester.core.converter.graph.ConverterGraph; import org.osgi.framework.BundleContext; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceEvent; @@ -58,7 +59,8 @@ ServiceReference[] refs = bContext.getServiceReferences( AlgorithmFactory.class.getName(), filter); - + ConverterGraph g = new ConverterGraph(refs); + System.out.println(g); if (refs != null) { for (int i = 0; i < refs.length; ++i) { //System.out.println(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-07-26 20:57:48 UTC (rev 440) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-07-30 16:11:36 UTC (rev 441) @@ -9,41 +9,43 @@ public class ConverterGraph { prefuse.data.Graph converterGraph; - Map<String, ArrayList<ServiceReference>> inDataToAlgorithm; - Map<String, ArrayList<ConverterPath>> fileExtensionTestConverters; - Map<String, ConverterPath> fileExtensionCompareConverters; + Map inDataToAlgorithm; + Map fileExtensionTestConverters; + Map fileExtensionCompareConverters; ServiceReference[] converters; private static final String testOutData = "prefuse.data.Graph"; public ConverterGraph(ServiceReference[] converters){ this.converters = converters; - inDataToAlgorithm = new HashMap<String, ArrayList<ServiceReference>>(); - fileExtensionTestConverters = new ConcurrentHashMap<String, ArrayList<ConverterPath>>(); - fileExtensionCompareConverters = new ConcurrentHashMap<String, ConverterPath>(); + inDataToAlgorithm = new HashMap();//<String, ArrayList<ServiceReference>>(); + 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){ - for(ServiceReference srv : sr){ + private void associateAlgorithms(ServiceReference[] sr, Map hm){ + for(int i = 0; i < sr.length; i++){ + ServiceReference srv = sr[i]; String s = srv.getProperty("in_data").toString(); if(hm.get(s) == null){ - ArrayList<ServiceReference> al = new ArrayList<ServiceReference>(); + ArrayList al = new ArrayList(); al.add(srv); hm.put(s, al); } else{ - hm.get(s).add(srv); + ((ArrayList)hm.get(s)).add(srv); } } } - private void createConverterPaths(Map<String, ArrayList<ServiceReference>> algorithms, Map<String, ArrayList<ConverterPath>> testPaths, - Map<String, ConverterPath> comparePaths){ - - for(String s : algorithms.keySet()){ + private void createConverterPaths(Map algorithms, Map testPaths, + Map comparePaths){ + String[] keySet = (String[])algorithms.keySet().toArray(); + for(int i = 0; i < keySet.length; i++){ + String s = keySet[i]; if(s.startsWith("file-ext")){ @@ -51,14 +53,14 @@ //ConverterPath test.setInData(s); //createPaths(algorithms, testPaths, comparePaths, test, s); - createPaths(algorithms.get(s), test, s); + createPaths((ArrayList)algorithms.get(s), test, s); //System.out.println("I've got here"); } } } - private ConverterPath createPaths(ArrayList<ServiceReference> algorithms, ConverterPath path, String dataType){ - ArrayList<ServiceReference> refs = removeReferences(algorithms, path); + private ConverterPath createPaths(ArrayList algorithms, ConverterPath path, String dataType){ + ArrayList refs = removeReferences(algorithms, path); addCompareCycle(path); @@ -68,9 +70,9 @@ } while(!refs.isEmpty()){ ConverterPath p = new ConverterPath(path); - p.addAlgoritm(refs.get(0)); + p.addAlgoritm((ServiceReference)refs.get(0)); refs.remove(0); - createPaths(this.inDataToAlgorithm.get(p.getOutData()), p, p.getOutData()); + createPaths((ArrayList)this.inDataToAlgorithm.get(p.getOutData()), p, p.getOutData()); } return null; @@ -78,8 +80,8 @@ 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(); + firstOutData = ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString(); + lastInData = ((ServiceReference)cp.getPath().get(cp.getPath().size()-1)).getProperty("in_data").toString(); if(firstOutData.equals(lastInData)){ addPath(cp); } @@ -88,16 +90,17 @@ 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(); + String key = cp.getInData() + " " + ((ServiceReference)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(); + ConverterPath tempPath = (ConverterPath)this.fileExtensionCompareConverters.get(key); + int pathSize = tempPath.getPath().size(); if(pathSize > cp.getPath().size()){ - ConverterPath oldPath = this.fileExtensionCompareConverters.get(key); + ConverterPath oldPath = (ConverterPath)this.fileExtensionCompareConverters.get(key); System.out.println("Replacing Comparision Path:\n" + oldPath + "with\n" + cp); this.fileExtensionCompareConverters.put(key, new ConverterPath(cp)); @@ -107,11 +110,12 @@ } } - private static ArrayList<ServiceReference> removeReferences(ArrayList<ServiceReference> al, ConverterPath cp){ - ArrayList<ServiceReference> srs = new ArrayList<ServiceReference>(al); + private static ArrayList removeReferences(ArrayList al, ConverterPath cp){ + ArrayList srs = new ArrayList(al); srs.removeAll(cp.getPath()); - ArrayList<ServiceReference> forbidden = new ArrayList<ServiceReference>(); - for(ServiceReference sr: srs){ + ArrayList forbidden = new ArrayList(); + for(int i = 0; i < srs.size(); i++){ + ServiceReference sr = (ServiceReference)srs.get(i); String ss = sr.getProperty("out_data").toString(); if(ss.startsWith("file-ext") && (!ss.equals(cp.getInData()))){ System.out.println(sr.getProperty("service.pid") + " yes"); @@ -125,14 +129,14 @@ 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>(); + ArrayList paths = new ArrayList(); 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); + ((ArrayList)this.fileExtensionTestConverters.get(p.getInData())).add(p); System.out.println("Successfully Added"); } } @@ -140,7 +144,9 @@ public String printTestConverterPath(String s){ StringBuffer sb = new StringBuffer(); - for(ConverterPath cp : this.fileExtensionTestConverters.get(s)){ + ArrayList al = (ArrayList)this.fileExtensionTestConverters.get(s); + for(int i = 0; i < al.size(); i++){ + ConverterPath cp = (ConverterPath)al.get(i); sb.append(cp.toString()); } sb.trimToSize(); @@ -149,7 +155,9 @@ public String printTestConverterPaths(){ StringBuffer sb = new StringBuffer(); - for(String s : this.fileExtensionTestConverters.keySet()){ + String[] keySet = (String[])this.fileExtensionTestConverters.keySet().toArray(); + for(int i = 0; i < keySet.length; i++){ + String s = keySet[i]; sb.append(printTestConverterPath(s)); } sb.trimToSize(); @@ -163,8 +171,10 @@ public String printComparisonConverterPaths(){ StringBuffer sb = new StringBuffer(); - for(String s: this.fileExtensionCompareConverters.keySet()){ - sb.append(printComparisonConverterPath(s)); + String[] keySet = (String[])this.fileExtensionTestConverters.keySet().toArray(); + for(int i = 0; i < keySet.length; i++){ + String s = keySet[i]; + sb.append(printTestConverterPath(s)); } sb.trimToSize(); return sb.toString(); @@ -173,9 +183,13 @@ public String toString(){ StringBuffer str = new StringBuffer(); - for(String s : this.inDataToAlgorithm.keySet()){ + String[] keySet = (String[])this.inDataToAlgorithm.keySet().toArray(); + for(int i = 0; i < keySet.length; i++){ + String s = keySet[i]; str.append(s + "\n"); - for(ServiceReference sr : this.inDataToAlgorithm.get(s)){ + ArrayList al = (ArrayList)this.inDataToAlgorithm.get(s); + for(int j = 0; j < al.size(); j++){ + ServiceReference sr = (ServiceReference)al.get(j); str.append("\t" + sr.getProperty("service.pid") + "\n"); } } Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java =================================================================== --- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java 2007-07-26 20:57:48 UTC (rev 440) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterPath.java 2007-07-30 16:11:36 UTC (rev 441) @@ -8,17 +8,17 @@ public class ConverterPath { String in_data; String out_data = null; - ArrayList<ServiceReference> path; + ArrayList path; public ConverterPath(){ - path = new ArrayList<ServiceReference>(); + path = new ArrayList(); } public ConverterPath(ConverterPath p){ in_data = p.getInData(); out_data = p.getOutData(); - this.path = new ArrayList<ServiceReference>(p.getPath()); + this.path = new ArrayList(p.getPath()); } @@ -52,14 +52,15 @@ return this.out_data; } - public List<ServiceReference> getPath(){ + public List getPath(){ return this.path; } public String toString(){ String val = this.in_data +" -->\n"; - for(ServiceReference sr : this.path){ + for(int i = 0; i < this.path.size(); i++){ + ServiceReference sr = (ServiceReference)this.path.get(i); val += "\t" + sr.getProperty("service.pid") + "\n"; } val += "--> " + this.out_data + "\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tea...@us...> - 2007-07-30 17:54:49
|
Revision: 445 http://cishell.svn.sourceforge.net/cishell/?rev=445&view=rev Author: teakettle22 Date: 2007-07-30 10:54:45 -0700 (Mon, 30 Jul 2007) Log Message: ----------- fixed some errors, return cast arrays rather than ArrayLists. 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-07-30 17:28:26 UTC (rev 444) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-07-30 17:54:45 UTC (rev 445) @@ -60,6 +60,7 @@ ServiceReference[] refs = bContext.getServiceReferences( AlgorithmFactory.class.getName(), filter); ConverterGraph g = new ConverterGraph(refs); + System.out.println("Blah!"); System.out.println(g); if (refs != null) { for (int i = 0; i < refs.length; ++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-07-30 17:28:26 UTC (rev 444) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-07-30 17:54:45 UTC (rev 445) @@ -43,7 +43,8 @@ private void createConverterPaths(Map algorithms, Map testPaths, Map comparePaths){ - String[] keySet = (String[])algorithms.keySet().toArray(); + String[] keySet = new String[algorithms.keySet().size()]; + keySet = (String[])algorithms.keySet().toArray(keySet); for(int i = 0; i < keySet.length; i++){ String s = keySet[i]; if(s.startsWith("file-ext")){ @@ -155,7 +156,8 @@ public String printTestConverterPaths(){ StringBuffer sb = new StringBuffer(); - String[] keySet = (String[])this.fileExtensionTestConverters.keySet().toArray(); + String[] keySet = new String[this.fileExtensionTestConverters.keySet().size()]; + keySet = (String[])this.fileExtensionTestConverters.keySet().toArray(keySet); for(int i = 0; i < keySet.length; i++){ String s = keySet[i]; sb.append(printTestConverterPath(s)); @@ -183,7 +185,8 @@ public String toString(){ StringBuffer str = new StringBuffer(); - String[] keySet = (String[])this.inDataToAlgorithm.keySet().toArray(); + String[] keySet = new String[this.inDataToAlgorithm.keySet().size()]; + keySet = (String[])this.inDataToAlgorithm.keySet().toArray(keySet); for(int i = 0; i < keySet.length; i++){ String s = keySet[i]; str.append(s + "\n"); @@ -201,29 +204,29 @@ return str.toString(); } - public ArrayList getTestPath(String s){ - return (ArrayList)this.fileExtensionTestConverters.get(s); + public ServiceReference[] getTestPath(String s){ + return (ServiceReference[])((ArrayList)this.fileExtensionTestConverters.get(s)).toArray(); } - public ArrayList getTestPaths(){ + public ServiceReference[][] getTestPaths(){ String[] fileExtensions = (String[])this.fileExtensionTestConverters.keySet().toArray(); ArrayList graphs = new ArrayList(); for(int i = 0; i < fileExtensions.length; i++){ graphs.add(getTestPath(fileExtensions[i])); } - return graphs; + return (ServiceReference[][])graphs.toArray(); } public ConverterPath getComparePath(String s){ return (ConverterPath)this.fileExtensionCompareConverters.get(s); } - public ArrayList getComparePaths(){ + public ServiceReference[] getComparePaths(){ String[] fileExtensions = (String[])this.fileExtensionCompareConverters.keySet().toArray(); ArrayList graphs = new ArrayList(); for(int i = 0; i < fileExtensions.length; i++){ graphs.add(getComparePath(fileExtensions[i])); } - return graphs; + return (ServiceReference[])graphs.toArray(); } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tea...@us...> - 2007-07-31 15:55:23
|
Revision: 448 http://cishell.svn.sourceforge.net/cishell/?rev=448&view=rev Author: teakettle22 Date: 2007-07-31 08:55:16 -0700 (Tue, 31 Jul 2007) Log Message: ----------- an initial to nwb file format of the converter graph. 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-07-30 18:00:47 UTC (rev 447) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-07-31 15:55:16 UTC (rev 448) @@ -59,9 +59,9 @@ ServiceReference[] refs = bContext.getServiceReferences( AlgorithmFactory.class.getName(), filter); - ConverterGraph g = new ConverterGraph(refs); - System.out.println("Blah!"); - System.out.println(g); + // ConverterGraph g = new ConverterGraph(refs); + // System.out.println("Blah!"); + // System.out.println(g); if (refs != null) { for (int i = 0; i < refs.length; ++i) { //System.out.println(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-07-30 18:00:47 UTC (rev 447) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-07-31 15:55:16 UTC (rev 448) @@ -1,8 +1,13 @@ package org.cishell.testing.convertertester.core.converter.graph; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import org.osgi.framework.ServiceReference; @@ -94,16 +99,16 @@ String key = cp.getInData() + " " + ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString(); if(this.fileExtensionCompareConverters.get(key) == null){ - System.out.println("Adding a new Comparison Path:\n" + cp); + // System.out.println("Adding a new Comparison Path:\n" + cp); this.fileExtensionCompareConverters.put(key, new ConverterPath(cp)); } else { ConverterPath tempPath = (ConverterPath)this.fileExtensionCompareConverters.get(key); int pathSize = tempPath.getPath().size(); if(pathSize > cp.getPath().size()){ - ConverterPath oldPath = (ConverterPath)this.fileExtensionCompareConverters.get(key); - System.out.println("Replacing Comparision Path:\n" + oldPath + "with\n" - + cp); + //ConverterPath oldPath = (ConverterPath)this.fileExtensionCompareConverters.get(key); + //System.out.println("Replacing Comparision Path:\n" + oldPath + "with\n" + // + cp); this.fileExtensionCompareConverters.put(key, new ConverterPath(cp)); } } @@ -119,7 +124,7 @@ ServiceReference sr = (ServiceReference)srs.get(i); String ss = sr.getProperty("out_data").toString(); if(ss.startsWith("file-ext") && (!ss.equals(cp.getInData()))){ - System.out.println(sr.getProperty("service.pid") + " yes"); + //System.out.println(sr.getProperty("service.pid") + " yes"); forbidden.add(sr); } } @@ -129,16 +134,16 @@ private void addPath(ConverterPath p){ if(this.fileExtensionTestConverters.get(p.getInData()) == null){ - System.out.println("Adding a new path"); + //System.out.println("Adding a new path"); ArrayList paths = new ArrayList(); paths.add(p); this.fileExtensionTestConverters.put(p.getInData(), paths); - System.out.println("Successfully Added"); + //System.out.println("Successfully Added"); } else{ - System.out.println("Adding a path"); + //System.out.println("Adding a path"); ((ArrayList)this.fileExtensionTestConverters.get(p.getInData())).add(p); - System.out.println("Successfully Added"); + //System.out.println("Successfully Added"); } } @@ -173,7 +178,8 @@ public String printComparisonConverterPaths(){ StringBuffer sb = new StringBuffer(); - String[] keySet = (String[])this.fileExtensionTestConverters.keySet().toArray(); + String[] keySet = new String[this.fileExtensionTestConverters.keySet().size()]; + keySet = (String[])this.fileExtensionTestConverters.keySet().toArray(keySet); for(int i = 0; i < keySet.length; i++){ String s = keySet[i]; sb.append(printTestConverterPath(s)); @@ -229,4 +235,129 @@ } return (ConverterPath[])graphs.toArray(); } + + public File asNWB(){ + File f = getTempFile(); + Map nodes = assembleNodesSet(); + TreeSet output = assembleEdges(nodes); + try{ + FileWriter out = new FileWriter(f); + BufferedWriter bw = new BufferedWriter(out); + + writeNodes(bw,nodes); + + } + catch(IOException ex){ + System.out.println("Blurt!"); + } + return f; + } + + private void writeNodeHeader(BufferedWriter bw, int numNodes) throws IOException{ + bw.flush(); + bw.write("*Nodes " + numNodes); + + } + + private void writeNodes(BufferedWriter bw, Map nodes) throws IOException{ + System.out.println("*Nodes " + nodes.size()); + writeNodeHeader(bw, nodes.size()); + String[] keySet = new String[nodes.keySet().size()]; + keySet = (String[])nodes.keySet().toArray(keySet); + + for(int i = 0; i < keySet.length; i++){ + bw.flush(); + bw.write(nodes.get(keySet[i]) + " " + keySet[i]); + } + + } + + private void writeEdgeHeader(BufferedWriter bw, int numEdges) throws IOException{ + bw.flush(); + bw.write("*DirectedEdges " + numEdges); + } + + + private void writeEdges(BufferedWriter bw, TreeSet edges) throws IOException{ + System.out.println("*DirectedEdges " + edges.size()); + writeEdgeHeader(bw,edges.size()); + + String[] edgeArray = new String[edges.size()]; + edgeArray = (String[])edges.toArray(edgeArray); + + for(int i = 0; i < edgeArray.length; i++){ + System.out.println(edgeArray[i]); + bw.flush(); + bw.write(edgeArray[i]); + } + } + + private Map assembleNodesSet(){ + + Map nodesToInt = new ConcurrentHashMap(); + + //create a set of all the in_data, out_data, and algorithm names + String[] keySet = new String[this.inDataToAlgorithm.keySet().size()]; + keySet = (String[])this.inDataToAlgorithm.keySet().toArray(keySet); + TreeSet nodeNames = new TreeSet(); + for(int i = 0; i < keySet.length; i++){ + String s = keySet[i]; + nodeNames.add(s); + ArrayList paths = (ArrayList)this.inDataToAlgorithm.get(s); + ServiceReference[] references = new ServiceReference[paths.size()]; + references = (ServiceReference[])paths.toArray(references); + + for(int j = 0; j < references.length; j++){ + nodeNames.add(s); + } + } + + String[] names = new String[nodeNames.size()]; + names = (String[])nodeNames.toArray(names); + + for(int i = 0; i < names.length; i++){ + nodesToInt.put(names[i], new Integer(i+1)); + } + + return nodesToInt; + } + + private TreeSet assembleEdges(Map m){ + TreeSet edges = new TreeSet(); + String[] keySet = new String[m.size()]; + keySet = (String[])m.keySet().toArray(keySet); + for(int i = 0; i < keySet.length; i++){ + String s = keySet[i]; + + ArrayList paths = (ArrayList)this.inDataToAlgorithm.get(s); + ServiceReference[] references = new ServiceReference[paths.size()]; + references = (ServiceReference[])paths.toArray(references); + + for(int j = 0; j < references.length; j++){ + String output = m.get(s).toString() + " "; + output += m.get(references[j].getProperty("service.pid")).toString(); + edges.add(output); + } + + } + return edges; + } + + private File getTempFile(){ + File tempFile; + + String tempPath = System.getProperty("java.io.tmpdir"); + File tempDir = new File(tempPath+File.separator+"temp"); + if(!tempDir.exists()) + tempDir.mkdir(); + try{ + tempFile = File.createTempFile("NWB-Session-", ".nwb", tempDir); + + }catch (IOException e){ + + tempFile = new File (tempPath+File.separator+"nwbTemp"+File.separator+"temp.nwb"); + + } + return tempFile; + } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tea...@us...> - 2007-08-01 17:00:36
|
Revision: 450 http://cishell.svn.sourceforge.net/cishell/?rev=450&view=rev Author: teakettle22 Date: 2007-08-01 09:47:06 -0700 (Wed, 01 Aug 2007) Log Message: ----------- added an asNWB function 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-01 16:44:53 UTC (rev 449) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-08-01 16:47:06 UTC (rev 450) @@ -59,7 +59,8 @@ ServiceReference[] refs = bContext.getServiceReferences( AlgorithmFactory.class.getName(), filter); - // ConverterGraph g = new ConverterGraph(refs); + ConverterGraph g = new ConverterGraph(refs); + g.asNWB(); // System.out.println("Blah!"); // System.out.println(g); if (refs != null) { 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-01 16:44:53 UTC (rev 449) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-08-01 16:47:06 UTC (rev 450) @@ -245,7 +245,7 @@ BufferedWriter bw = new BufferedWriter(out); writeNodes(bw,nodes); - + writeEdges(bw,output); } catch(IOException ex){ System.out.println("Blurt!"); @@ -255,26 +255,25 @@ private void writeNodeHeader(BufferedWriter bw, int numNodes) throws IOException{ bw.flush(); - bw.write("*Nodes " + numNodes); + bw.write("*Nodes " + numNodes + "\nid*int label*string\n"); } private void writeNodes(BufferedWriter bw, Map nodes) throws IOException{ - System.out.println("*Nodes " + nodes.size()); + System.out.println("*Nodes " + nodes.size() + "\n"); writeNodeHeader(bw, nodes.size()); String[] keySet = new String[nodes.keySet().size()]; keySet = (String[])nodes.keySet().toArray(keySet); - for(int i = 0; i < keySet.length; i++){ bw.flush(); - bw.write(nodes.get(keySet[i]) + " " + keySet[i]); + bw.write(nodes.get(keySet[i]) + " \"" + keySet[i]+"\"\n"); } } private void writeEdgeHeader(BufferedWriter bw, int numEdges) throws IOException{ bw.flush(); - bw.write("*DirectedEdges " + numEdges); + bw.write("*DirectedEdges " + numEdges + "\nsource*int target*int\n"); } @@ -288,7 +287,7 @@ for(int i = 0; i < edgeArray.length; i++){ System.out.println(edgeArray[i]); bw.flush(); - bw.write(edgeArray[i]); + bw.write(edgeArray[i]+"\n"); } } @@ -307,8 +306,9 @@ ServiceReference[] references = new ServiceReference[paths.size()]; references = (ServiceReference[])paths.toArray(references); - for(int j = 0; j < references.length; j++){ - nodeNames.add(s); + for(int j = 0; j < references.length; j++){ + ServiceReference r = references[j]; + nodeNames.add(r.getProperty("service.pid").toString()); } } @@ -316,6 +316,7 @@ names = (String[])nodeNames.toArray(names); for(int i = 0; i < names.length; i++){ + System.out.println(names[i] + " " + (i+1)); nodesToInt.put(names[i], new Integer(i+1)); } @@ -328,16 +329,23 @@ keySet = (String[])m.keySet().toArray(keySet); for(int i = 0; i < keySet.length; i++){ String s = keySet[i]; - + System.out.println(keySet[i]); ArrayList paths = (ArrayList)this.inDataToAlgorithm.get(s); + if(paths != null){ ServiceReference[] references = new ServiceReference[paths.size()]; references = (ServiceReference[])paths.toArray(references); for(int j = 0; j < references.length; j++){ - String output = m.get(s).toString() + " "; - output += m.get(references[j].getProperty("service.pid")).toString(); - edges.add(output); + String output1 = m.get(s).toString() + " "; + String output2 = references[j].getProperty("service.pid").toString(); + output1 += m.get(output2).toString(); + output2 = m.get(output2).toString() + " " + m.get(references[j].getProperty("out_data")).toString(); + System.out.println(output1); + System.out.println(output2); + edges.add(output1); + edges.add(output2); } + } } return edges; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tea...@us...> - 2007-08-06 15:29:14
|
Revision: 457 http://cishell.svn.sourceforge.net/cishell/?rev=457&view=rev Author: teakettle22 Date: 2007-08-06 08:28:57 -0700 (Mon, 06 Aug 2007) Log Message: ----------- changed how the ConverterPath[][] was generated in getTestPaths. 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-01 19:16:21 UTC (rev 456) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/ConverterLoaderImpl.java 2007-08-06 15:28:57 UTC (rev 457) @@ -51,8 +51,19 @@ ServiceReference[] refs = bContext.getServiceReferences( AlgorithmFactory.class.getName(), filter); + /* ConverterGraph g = new ConverterGraph(refs); + 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++){ + for(int j = 0; j < g.getTestPaths()[i].length; j++){ + length++; + } + } + System.out.println(length + " " + g.getTestPaths().length); - if (refs != null) { + // System.out.println(g);*/ +*/ 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-01 19:16:21 UTC (rev 456) +++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/converter/graph/ConverterGraph.java 2007-08-06 15:28:57 UTC (rev 457) @@ -89,7 +89,7 @@ firstOutData = ((ServiceReference)cp.getPath().get(0)).getProperty("out_data").toString(); lastInData = ((ServiceReference)cp.getPath().get(cp.getPath().size()-1)).getProperty("in_data").toString(); if(firstOutData.equals(lastInData)){ - addPath(cp); + addTestPath(cp); } } @@ -130,7 +130,7 @@ return srs; } - private void addPath(ConverterPath p){ + private void addTestPath(ConverterPath p){ if(this.fileExtensionTestConverters.get(p.getInData()) == null){ ArrayList paths = new ArrayList(); @@ -140,7 +140,7 @@ } else{ - ((ArrayList)this.fileExtensionTestConverters.get(p.getInData())).add(p); + ((ArrayList)this.fileExtensionTestConverters.get((p.getInData()))).add(p); } } @@ -151,7 +151,7 @@ ArrayList al = (ArrayList)this.fileExtensionTestConverters.get(s); for(int i = 0; i < al.size(); i++){ ConverterPath cp = (ConverterPath)al.get(i); - sb.append(cp.toString()); + sb.append(s + cp.toString()); } sb.trimToSize(); return sb.toString(); @@ -213,13 +213,13 @@ } public ConverterPath[][] getTestPaths(){ + ConverterPath[][] paths = new ConverterPath[this.fileExtensionTestConverters.keySet().size()][]; String[] fileExtensions = (String[])this.fileExtensionTestConverters.keySet().toArray(new String[0]); - ArrayList graphs = new ArrayList(); for(int i = 0; i < fileExtensions.length; i++){ - graphs.add(getTestPath(fileExtensions[i])); + paths[i] = (getTestPath(fileExtensions[i])); } //this line may be busted - return (ConverterPath[][])graphs.toArray(new ConverterPath[0][]); + return paths; } public ConverterPath getComparePath(String s){ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |