cishell-svn

[CIShell-SVN] SF.net SVN: cishell:[909] trunk/core/org.cishell.algorithm.convertergraph/ src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java

[<mwl...@us...>]

Revision: 909
          http://cishell.svn.sourceforge.net/cishell/?rev=909&view=rev
Author:   mwlinnem
Date:     2009-07-31 15:24:24 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
Removing 'id' attribute (this was causing some confusion, as there was already an auto-generated id on the Jung graph).

Modified Paths:
--------------
    trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java

Modified: trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java
===================================================================
--- trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java	2009-07-30 21:35:14 UTC (rev 908)
+++ trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java	2009-07-31 15:24:24 UTC (rev 909)
@@ -134,8 +134,7 @@
 		nodeCount++;
 		
 		Vertex node = new DirectedSparseVertex();
-		
-		node.addUserDatum("id", nodeCount, new UserDataContainer.CopyAction.Shared());
+
 		node.addUserDatum("strength", 1, new UserDataContainer.CopyAction.Shared());
 		node.addUserDatum("label", nodeKey, new UserDataContainer.CopyAction.Shared());
 		


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

[CIShell-SVN] SF.net SVN: cishell:[979] trunk/core/org.cishell.algorithm.convertergraph/ src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java

[<mwl...@us...>]

Revision: 979
          http://cishell.svn.sourceforge.net/cishell/?rev=979&view=rev
Author:   mwlinnem
Date:     2009-11-06 21:32:45 +0000 (Fri, 06 Nov 2009)

Log Message:
-----------
Explicitly created Integers instead of relying on auto-boxing, so CIShell stays 1.4 compatible (build breaks if it isn't).

Modified Paths:
--------------
    trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java

Modified: trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java
===================================================================
--- trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java	2009-11-06 20:53:24 UTC (rev 978)
+++ trunk/core/org.cishell.algorithm.convertergraph/src/org/cishell/algorithm/convertergraph/ConverterGraphComputation.java	2009-11-06 21:32:45 UTC (rev 979)
@@ -122,7 +122,7 @@
 					.equalsIgnoreCase(currentNodeKey)) {
 				int currentVertexStrength = 
 					((Integer) currentVertex.getUserDatum("strength")).intValue();
-				currentVertex.setUserDatum("strength", ++currentVertexStrength, 
+				currentVertex.setUserDatum("strength", new Integer(++currentVertexStrength), 
 						new UserDataContainer.CopyAction.Shared());
 				return currentVertex;
 			}
@@ -134,8 +134,7 @@
 		nodeCount++;
 		
 		Vertex node = new DirectedSparseVertex();
-
-		node.addUserDatum("strength", 1, new UserDataContainer.CopyAction.Shared());
+		node.addUserDatum("strength", new Integer(1), new UserDataContainer.CopyAction.Shared());
 		node.addUserDatum("label", nodeKey, new UserDataContainer.CopyAction.Shared());
 		
 		outputGraph.addVertex(node);


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