Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell: [646] trunk/testing/org.cishell.testing. convertertester.core.new/src/org/cishell/testing/convertertester/core/ tester
|
From: <mwl...@us...> - 2008-03-06 16:49:18
|
Revision: 646
http://cishell.svn.sourceforge.net/cishell/?rev=646&view=rev
Author: mwlinnem
Date: 2008-03-06 08:46:25 -0800 (Thu, 06 Mar 2008)
Log Message:
-----------
Refactored name of GraphUtil to TableUtil.
Modified Paths:
--------------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/DefaultGraphComparer.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/ComplexGraphComparer.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsNotPreservedComparer.java
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsPreservedComparer.java
Added Paths:
-----------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/TableUtil.java
Removed Paths:
-------------
trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/GraphUtil.java
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/DefaultGraphComparer.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/DefaultGraphComparer.java 2008-03-05 16:50:27 UTC (rev 645)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/DefaultGraphComparer.java 2008-03-06 16:46:25 UTC (rev 646)
@@ -207,8 +207,8 @@
}
private boolean areEqualWhenSorted(Table t1, Table t2) {
- boolean result = areEqual(GraphUtil.getSorted(t1),
- GraphUtil.getSorted(t2));
+ boolean result = areEqual(TableUtil.getSorted(t1),
+ TableUtil.getSorted(t2));
return result;
}
@@ -277,14 +277,14 @@
* @return a stripped copy of the original table
*/
private Table getStrippedEdgeTable(Table t) {
- Table tCopy = GraphUtil.copyTable(t);
+ Table tCopy = TableUtil.copyTable(t);
tCopy.removeColumn(Graph.DEFAULT_SOURCE_KEY);
tCopy.removeColumn(Graph.DEFAULT_TARGET_KEY);
return tCopy;
}
private Table getStrippedNodeTable(Graph g) {
- Table tCopy = GraphUtil.copyTable(g.getNodeTable());
+ Table tCopy = TableUtil.copyTable(g.getNodeTable());
String nodeKeyField = g.getNodeKeyField();
if (nodeKeyField != null) {
tCopy.removeColumn(nodeKeyField);
Deleted: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/GraphUtil.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/GraphUtil.java 2008-03-05 16:50:27 UTC (rev 645)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/GraphUtil.java 2008-03-06 16:46:25 UTC (rev 646)
@@ -1,56 +0,0 @@
-package org.cishell.testing.convertertester.core.tester.graphcomparison;
-
-import java.util.Iterator;
-
-import prefuse.data.Table;
-import prefuse.data.Tuple;
-import prefuse.data.expression.parser.ExpressionParser;
-import prefuse.data.util.Sort;
-
-public class GraphUtil {
-
- public static String[] getColumnNames(Table t) {
- String[] columnNames = new String[t.getColumnCount()];
- for (int ii = 0; ii < t.getColumnCount(); ii++) {
- columnNames[ii] = t.getColumnName(ii);
- }
- return columnNames;
- }
-
- public static Table copyTable(Table t) {
- Table tCopy = new Table();
- tCopy.addColumns(t.getSchema());
-
- for (Iterator ii = t.tuples(); ii.hasNext();) {
- Tuple tuple = (Tuple) ii.next();
- tCopy.addTuple(tuple);
- }
- return tCopy;
- }
-
- public static void printTable(Table t) {
- Iterator ii = t.tuples();
- while (ii.hasNext()) {
- System.out.println((Tuple) ii.next());
- }
- }
-
- public static Table getSorted(Table t) {
- return getSortedByColumns(t, getColumnNames(t));
- }
-
- public static Table getSortedByColumns(Table t, String[] columnNames) {
- for (int ii = 0; ii < columnNames.length; ii++) {
- String columnName = columnNames[ii];
- if (t.getColumn(columnName) == null) {
- System.out.println("WTF, cannot find column " + columnName);
- }
- }
- Sort tSort = new Sort(columnNames);
- Table sortedTable = t.select(ExpressionParser.predicate("TRUE"),
- tSort);
- return sortedTable;
- }
-
-
-}
Copied: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/TableUtil.java (from rev 625, trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/GraphUtil.java)
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/TableUtil.java (rev 0)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester/graphcomparison/TableUtil.java 2008-03-06 16:46:25 UTC (rev 646)
@@ -0,0 +1,56 @@
+package org.cishell.testing.convertertester.core.tester.graphcomparison;
+
+import java.util.Iterator;
+
+import prefuse.data.Table;
+import prefuse.data.Tuple;
+import prefuse.data.expression.parser.ExpressionParser;
+import prefuse.data.util.Sort;
+
+public class TableUtil {
+
+ public static String[] getColumnNames(Table t) {
+ String[] columnNames = new String[t.getColumnCount()];
+ for (int ii = 0; ii < t.getColumnCount(); ii++) {
+ columnNames[ii] = t.getColumnName(ii);
+ }
+ return columnNames;
+ }
+
+ public static Table copyTable(Table t) {
+ Table tCopy = new Table();
+ tCopy.addColumns(t.getSchema());
+
+ for (Iterator ii = t.tuples(); ii.hasNext();) {
+ Tuple tuple = (Tuple) ii.next();
+ tCopy.addTuple(tuple);
+ }
+ return tCopy;
+ }
+
+ public static void printTable(Table t) {
+ Iterator ii = t.tuples();
+ while (ii.hasNext()) {
+ System.out.println((Tuple) ii.next());
+ }
+ }
+
+ public static Table getSorted(Table t) {
+ return getSortedByColumns(t, getColumnNames(t));
+ }
+
+ public static Table getSortedByColumns(Table t, String[] columnNames) {
+ for (int ii = 0; ii < columnNames.length; ii++) {
+ String columnName = columnNames[ii];
+ if (t.getColumn(columnName) == null) {
+ System.out.println("WTF, cannot find column " + columnName);
+ }
+ }
+ Sort tSort = new Sort(columnNames);
+ Table sortedTable = t.select(ExpressionParser.predicate("TRUE"),
+ tSort);
+ return sortedTable;
+ }
+
+
+}
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/ComplexGraphComparer.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/ComplexGraphComparer.java 2008-03-05 16:50:27 UTC (rev 645)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/ComplexGraphComparer.java 2008-03-06 16:46:25 UTC (rev 646)
@@ -2,7 +2,7 @@
import java.util.Iterator;
-import org.cishell.testing.convertertester.core.tester.graphcomparison.GraphUtil;
+import org.cishell.testing.convertertester.core.tester.graphcomparison.TableUtil;
import org.cishell.testing.convertertester.core.tester.graphcomparison.RunningLog;
import prefuse.data.Table;
@@ -31,10 +31,10 @@
return false;
}
- String[] colNames = GraphUtil.getColumnNames(t1);
+ String[] colNames = TableUtil.getColumnNames(t1);
- boolean result = areEqual(GraphUtil.getSortedByColumns(t1, colNames),
- GraphUtil.getSortedByColumns(t2, colNames));
+ boolean result = areEqual(TableUtil.getSortedByColumns(t1, colNames),
+ TableUtil.getSortedByColumns(t2, colNames));
return result;
}
@@ -155,8 +155,8 @@
t2.getColumnName(ii) + "', while the other does " +
"not.");
- String[] t1ColNames = GraphUtil.getColumnNames(t1);
- String[] t2ColNames = GraphUtil.getColumnNames(t2);
+ String[] t1ColNames = TableUtil.getColumnNames(t1);
+ String[] t2ColNames = TableUtil.getColumnNames(t2);
log.append("t1 columns: " + format(t1ColNames));
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsNotPreservedComparer.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsNotPreservedComparer.java 2008-03-05 16:50:27 UTC (rev 645)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsNotPreservedComparer.java 2008-03-06 16:46:25 UTC (rev 646)
@@ -6,7 +6,7 @@
import java.util.Set;
import org.cishell.testing.convertertester.core.tester.graphcomparison.ComparisonResult;
-import org.cishell.testing.convertertester.core.tester.graphcomparison.GraphUtil;
+import org.cishell.testing.convertertester.core.tester.graphcomparison.TableUtil;
import org.cishell.testing.convertertester.core.tester.graphcomparison.RunningLog;
import prefuse.data.Graph;
@@ -156,14 +156,14 @@
* @return a stripped copy of the original table
*/
private Table getStrippedEdgeTable(Table t) {
- Table tCopy = GraphUtil.copyTable(t);
+ Table tCopy = TableUtil.copyTable(t);
tCopy.removeColumn(Graph.DEFAULT_SOURCE_KEY);
tCopy.removeColumn(Graph.DEFAULT_TARGET_KEY);
return tCopy;
}
private Table getStrippedNodeTable(Graph g) {
- Table tCopy = GraphUtil.copyTable(g.getNodeTable());
+ Table tCopy = TableUtil.copyTable(g.getNodeTable());
String nodeKeyField = g.getNodeKeyField();
if (nodeKeyField != null) {
tCopy.removeColumn(nodeKeyField);
Modified: trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsPreservedComparer.java
===================================================================
--- trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsPreservedComparer.java 2008-03-05 16:50:27 UTC (rev 645)
+++ trunk/testing/org.cishell.testing.convertertester.core.new/src/org/cishell/testing/convertertester/core/tester2/graphcomparison/IdsPreservedComparer.java 2008-03-06 16:46:25 UTC (rev 646)
@@ -6,7 +6,7 @@
import java.util.Set;
import org.cishell.testing.convertertester.core.tester.graphcomparison.ComparisonResult;
-import org.cishell.testing.convertertester.core.tester.graphcomparison.GraphUtil;
+import org.cishell.testing.convertertester.core.tester.graphcomparison.TableUtil;
import org.cishell.testing.convertertester.core.tester.graphcomparison.RunningLog;
import prefuse.data.Graph;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
