Bugfix in reading from file

Data2Semantics · Nov 10, 2016 · 4f8f8ce · 4f8f8ce
1 parent 86fce0b
commit 4f8f8ce
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/nodes/src/main/java/org/nodes/DiskDGraph.java b/nodes/src/main/java/org/nodes/DiskDGraph.java
@@ -1280,7 +1280,7 @@ private static long readSorted(List<List<Integer>> list, File file, boolean forw
 
 		long links = 0;
 
-		Integer current = null;
+		Integer current = 0;
 		List<Integer> neighbors = new ArrayList<Integer>();
 
 		do

diff --git a/nodes/src/test/java/org/nodes/DiskDGraphTest.java b/nodes/src/test/java/org/nodes/DiskDGraphTest.java
@@ -649,6 +649,30 @@ public void testJBC()
 		assertEquals(2, subgraph.numLinks());
 	}
 
+	@Test
+	public void degrees()
+		throws IOException
+	{
+		DGraph<String> disk = DiskDGraph.fromFile(new File("/Users/Peter/Documents/Datasets/graphs/wikipedia-nl/wikipedia-nl-simple.txt"), new File("./tmp/"));
+
+		DGraph<String> mem = Data.edgeListDirectedUnlabeled(new File("/Users/Peter/Documents/Datasets/graphs/wikipedia-nl/wikipedia-nl-simple.txt"), true);
+
+		assertEquals(disk.size(), mem.size());
+		assertEquals(disk.numLinks(), mem.numLinks());
+
+		for(int i : series(disk.size()))
+		{
+			try {
+				assertEquals(mem.get(i).inDegree(), disk.get(i).inDegree());
+				assertEquals(mem.get(i).outDegree(), disk.get(i).outDegree());
+			} catch(AssertionError e)
+			{
+				System.out.println(i + " mem: " + mem.get(i).inDegree() + " " + mem.get(i).outDegree() + " disk:" + disk.get(i).inDegree() + " " + disk.get(i).outDegree() );
+			}
+		}
+	}
+
+
 	@After
 	public void cleanup()
 	{