Changeset 2551

Timestamp:

10/28/08 17:17:28 (2 months ago)

Author:

pataphil

Message:

Modified Extract Word Co-Occurrence Network to accept multiple target columns, as opposed to just one.

Files:

• trunk/plugins/analysis/edu.iu.nwb.analysis.extractdirectednetfromtable/src/edu/iu/nwb/analysis/extractdirectednetfromtable/algorithms/ExtractDirectedNetworkAlgorithm.java (modified) (2 diffs)
• trunk/plugins/analysis/edu.iu.nwb.analysis.extractnetfromtable/src/edu/iu/nwb/analysis/extractnetfromtable/components/GraphContainer.java (modified) (9 diffs)
• trunk/plugins/composite/edu.iu.nwb.composite.extractcowordfromtable/src/edu/iu/nwb/composite/extractcowordfromtable/ExtractCoWordNetworkAlgorithm.java (modified) (3 diffs)
• trunk/plugins/composite/edu.iu.nwb.composite.extractcowordfromtable/src/edu/iu/nwb/composite/extractcowordfromtable/ExtractCoWordNetworkAlgorithmFactory.java (modified) (4 diffs)

trunk/plugins/analysis/edu.iu.nwb.analysis.extractdirectednetfromtable/src/edu/iu/nwb/analysis/extractdirectednetfromtable/algorithms/ExtractDirectedNetworkAlgorithm.java

@@ -2 +2 @@
-
-import java.util.Dictionary;
+import java.util.Enumeration;
-import java.util.Properties;
-
@@ -47 +48 @@
-        final prefuse.data.Table dataTable = (prefuse.data.Table) data[0].getData();
-        
-split
+delimiter
-        String sourceColumn = null;
-
+ 
-        Object functionFile = null;
-        Properties functions = null;
-        
-split
+delimiter
-        sourceColumn = this.parameters.get("sourceColumn").toString();
-        targetColumn = this.parameters.get("targetColumn").toString();
-        functionFile = this.parameters.get("aff");
-        
-
-
+
+
+
-        }
-        
-
-
-
+
+
+
+
+
+
+
-        
-
+
+
-                        "Network with directed edges from " + sourceColumn + " to " + targetColumn+ ".");
-        
-
-
-
+
+
+
+
+
-        }
-        

trunk/plugins/analysis/edu.iu.nwb.analysis.extractnetfromtable/src/edu/iu/nwb/analysis/extractnetfromtable/components/GraphContainer.java

@@ -41 +41 @@
-
-        public Graph buildGraph(String sourceColumnName, String targetColumnName, String splitString, LogService log){
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                boolean dupValues = false;
-                final HashMap dupValuesErrorMessages = new HashMap();
@@ -54 +56 @@
-                int count = 0;
-
-
+ 
-                        this.progMonitor.start(ProgressMonitor.WORK_TRACKABLE, rows);
-                }
@@ -62 +64 @@
-                        Node node2 = null;
-                        int row = ((Integer)it.next()).intValue();
-
+
+
+
-
-                        Set seenObject = new HashSet();
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                        }
-
+
+
+
-                                        for (int j = 0; j < i; j++) {
-
-
-
+
+
+
+
+
-
-                                                        }
-                                                        //create or modify an edge as necessary
-objects
+splitTargetStringArray
-                                                        EdgeContainer.mutateEdge(node1, node2, this.graph, this.table, row, this.edgeMap);
-
+
+
-                                                        dupValues = true; //detected a self-loop
-                                                }
@@ -113 +123 @@
-        }
-
- targetColumnName, String splitString
-p = Pattern.compile("\\Q" + splitString
+[] targetColumnNames, String delimiter
+splitPattern = Pattern.compile("\\Q" + delimiter
-                final HashMap dupValuesErrorMessages = new HashMap();
-                Column sourceColumn = this.table.getColumn(sourceColumnName);
-                Column targetColumn = this.table.getColumn(targetColumnName);
-                Node node1;
-                Node node2;
@@ -127 +136 @@
-                        this.progMonitor.start(ProgressMonitor.WORK_TRACKABLE, rows);
-                }
-
-
-
+
+
-                        int row = ((Integer)it.next()).intValue();
-                        final String sourceString = (String) sourceColumn.get(row);
-
+
+
+
-
-                        Set seenSource = new HashSet();
-                        Set seenTarget;// = seenSource;
-
-
-
-
-
+
+
+
-
-                                for (int i = 0; i < sources.length; i++) {
-
-
+
+
+
+
-                                                seenTarget = new HashSet();
-
-                                                for (int j = 0; j < targets.length; j++) {
-
-
+
+
+
-
-                                                                EdgeContainer.mutateEdge(node1,node2,this.graph,this.table,row,this.edgeMap);
@@ -157 +169 @@
-                                }
-                        }
-
-
+ 
+ 
-                                String title = "unknown";
-
-
-
+
+
+
+
+
-                        if(this.progMonitor != null)
-                                this.progMonitor.worked(count);
-                }
+                                
-                for(Iterator dupIter = dupValuesErrorMessages.keySet().iterator(); dupIter.hasNext();){
-                        log.log(LogService.LOG_WARNING, (String)dupValuesErrorMessages.get(dupIter.next()));
-                }
-
-
-                return this.graph;
-        }
@@ -180 +194 @@
-                if(inputSchema.getColumnIndex(sourceColumnName) < 0)
-                        throw new InvalidColumnNameException(sourceColumnName + " was not a column in this table.\n");
-
-
+
+
+
+
+
+
-                        throw new InvalidColumnNameException(targetColumnName + " was not a column in this table.\n");
+                else
+                {
+                        for (int ii = 0; ii < targetColumnNameArray.length; ii++)
+                        {
+                                if (inputSchema.getColumnIndex(targetColumnNameArray[ii]) < 0)
+                                {
+                                        throw new InvalidColumnNameException(targetColumnNameArray[ii] +
+                                                " was not a column in this table.\n");
+                                }
+                        }
+                }
-
-                Schema nodeSchema = createNodeSchema();
@@ -208 +237 @@
-                if(inputSchema.getColumnIndex(sourceColumnName) < 0)
-                        throw new InvalidColumnNameException(sourceColumnName + " was not a column in this table.\n");
-
-
+
+
+
+
+
+
-                        throw new InvalidColumnNameException(targetColumnName + " was not a column in this table.\n");
+                else
+                {
+                        for (int ii = 0; ii < targetColumnNameArray.length; ii++)
+                        {
+                                if (inputSchema.getColumnIndex(targetColumnNameArray[ii]) < 0)
+                                {
+                                        throw new InvalidColumnNameException(targetColumnNameArray[ii] +
+                                                " was not a column in this table.\n");
+                                }
+                        }
+                }
-
-                Schema nodeSchema = createNodeSchema();
@@ -242 +286 @@
-                return edgeSchema;
-        }
+        
+        private static String buildRowTargetStringFromColumnNames(int row, String[] targetColumnNames,
+                                                                                                                          Table table, String delimiter) {
+                StringBuilder targetStringBuilder = new StringBuilder();
+                
+                // This is outside of the proceeding for loop because that loop appends the delmiter first.
+                Column targetColumn = table.getColumn(targetColumnNames[0]);
+                targetStringBuilder.append((String)targetColumn.getString(row));
+                
+                for (int iColumn = 1; iColumn < targetColumnNames.length; iColumn++) {
+                        targetColumn = table.getColumn(targetColumnNames[iColumn]);
+                        targetStringBuilder.append(delimiter);
+                        targetStringBuilder.append((String)targetColumn.getString(row));
+                }
+                
+                return targetStringBuilder.toString();
+        }
-}

trunk/plugins/composite/edu.iu.nwb.composite.extractcowordfromtable/src/edu/iu/nwb/composite/extractcowordfromtable/ExtractCoWordNetworkAlgorithm.java

@@ -3 +3 @@
-import java.util.Dictionary;
-import java.util.Hashtable;
+import java.util.Enumeration;
-
-import org.cishell.framework.CIShellContext;
@@ -39 +40 @@
-
-        public Data[] execute() throws AlgorithmExecutionException {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        //turn scientometrics data table into prefuse Graph of directed network
-p
+newP
-                        Data[] directedNetworkData = extractAlg.execute();
-                        //converter prefuse Graph of directed network into nwb graph file of directed network
@@ -63 +109 @@
-                return networkData;
-            }
+         
+         
+         private boolean isAColumnCheckBoxParameter(String[] explodedParameterKey) {
+                 return (explodedParameterKey.length > 1) && (explodedParameterKey[0].equals("column"));
+         }
+         
+         private boolean columnCheckBoxWasSelected(Object parameterValue) 
+         {
+                //parameter represents whether a certain column is selected or not
+                 boolean columnWasSelected = ((Boolean) parameterValue).booleanValue();
+                 return columnWasSelected;
+         }
+                 
-}

trunk/plugins/composite/edu.iu.nwb.composite.extractcowordfromtable/src/edu/iu/nwb/composite/extractcowordfromtable/ExtractCoWordNetworkAlgorithmFactory.java

@@ -27 +27 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        private AlgorithmFactory extractDirectedNetwork;
-        private AlgorithmFactory bibliographicCoupling;
@@ -34 +48 @@
-        
-        public ObjectClassDefinition mutateParameters(Data[] data, ObjectClassDefinition parameters) {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                Arrays.sort(columnNames);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -87 +194 @@
-                        
-                DataConversionService converter = (DataConversionService)
-
+   
-                
-                 return new ExtractCoWordNetworkAlgorithm(data, parameters, context,
@@ -100 +207 @@
-    private AlgorithmFactory getAlgorithmFactory (String filter) 
-    throws InvalidSyntaxException {
- bContext
-
+
+       bContext
-        
-        if (algFactoryRefs != null && algFactoryRefs.length != 0) {