reverse bytes so compatible with C/C++ (thanks Clive Cox)

Aapo Kyrola · Aapo Kyrola · commit 24a592724878 · 2012-10-06T12:05:49.000-04:00
diff --git a/src/edu/cmu/graphchi/apps/Pagerank.java b/src/edu/cmu/graphchi/apps/Pagerank.java
@@ -18,7 +18,7 @@
 public class Pagerank implements GraphChiProgram<Float, Float> {
 
 
-    public void update(ChiVertex<Float, Float> vertex, GraphChiContext context) {
+    public void update(ChiVertex<Float, Float> vertex, GraphChiContext context)  {
         if (context.getIteration() == 0) {
             vertex.setValue(1.0f);
         } else {
@@ -34,6 +34,7 @@ public void update(ChiVertex<Float, Float> vertex, GraphChiContext context) {
             vertex.outEdge(i).setValue(outValue);
         }
 
+
         if (vertex.getId() % 100000 == 0 || vertex.getId() == 8737 || vertex.getId() == 2914) {
             System.out.println(vertex.getId() + " => " + vertex.getValue());
         }
diff --git a/src/edu/cmu/graphchi/datablocks/FloatConverter.java b/src/edu/cmu/graphchi/datablocks/FloatConverter.java
@@ -22,15 +22,15 @@ public int sizeOf() {
     }
 
     public Float getValue(byte[] array) {
-        int x = ((array[0]  & 0xff) << 24) + ((array[1] & 0xff) << 16) + ((array[2] & 0xff) << 8) + (array[3] & 0xff);
+        int x = ((array[3]  & 0xff) << 24) + ((array[2] & 0xff) << 16) + ((array[1] & 0xff) << 8) + (array[0] & 0xff);
         return Float.intBitsToFloat(x);
     }
 
     public void setValue(byte[] array, Float val) {
         int x = Float.floatToIntBits(val);
-        array[0] = (byte) ((x >>> 24) & 0xff);
-        array[1] = (byte) ((x >>> 16) & 0xff);
-        array[2] = (byte) ((x >>> 8) & 0xff);
-        array[3] = (byte) ((x >>> 0) & 0xff);
+        array[0] = (byte) ((x >>> 0) & 0xff);
+        array[1] = (byte) ((x >>> 8) & 0xff);
+        array[2] = (byte) ((x >>> 16) & 0xff);
+        array[3] = (byte) ((x >>> 24) & 0xff);
     }
 }
diff --git a/src/edu/cmu/graphchi/datablocks/IntConverter.java b/src/edu/cmu/graphchi/datablocks/IntConverter.java
@@ -21,14 +21,14 @@ public int sizeOf() {
     }
 
     public Integer getValue(byte[] array) {
-        int x = ((array[0]  & 0xff) << 24) + ((array[1] & 0xff) << 16) + ((array[2] & 0xff) << 8) + (array[3] & 0xff);
+        int x = ((array[3]  & 0xff) << 24) + ((array[2] & 0xff) << 16) + ((array[1] & 0xff) << 8) + (array[0] & 0xff);
         return x;
     }
 
     public void setValue(byte[] array, Integer x) {
-        array[0] = (byte) ((x >>> 24) & 0xff);
-        array[1] = (byte) ((x >>> 16) & 0xff);
-        array[2] = (byte) ((x >>> 8) & 0xff);
-        array[3] = (byte) ((x >>> 0) & 0xff);
+        array[3] = (byte) ((x >>> 24) & 0xff);
+        array[2] = (byte) ((x >>> 16) & 0xff);
+        array[1] = (byte) ((x >>> 8) & 0xff);
+        array[0] = (byte) ((x >>> 0) & 0xff);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`public class Pagerank implements GraphChiProgram<Float, Float> {`
`19`	`19`
`20`	`20`
`21`		`- public void update(ChiVertex<Float, Float> vertex, GraphChiContext context) {`
	`21`	`+ public void update(ChiVertex<Float, Float> vertex, GraphChiContext context) {`
`22`	`22`	`if (context.getIteration() == 0) {`
`23`	`23`	`vertex.setValue(1.0f);`
`24`	`24`	`} else {`
`@@ -34,6 +34,7 @@ public void update(ChiVertex<Float, Float> vertex, GraphChiContext context) {`
`34`	`34`	`vertex.outEdge(i).setValue(outValue);`
`35`	`35`	`}`
`36`	`36`
	`37`	`+`
`37`	`38`	`if (vertex.getId() % 100000 == 0 \|\| vertex.getId() == 8737 \|\| vertex.getId() == 2914) {`
`38`	`39`	`System.out.println(vertex.getId() + " => " + vertex.getValue());`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ public int sizeOf() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public Float getValue(byte[] array) {`
`25`		`- int x = ((array[0] & 0xff) << 24) + ((array[1] & 0xff) << 16) + ((array[2] & 0xff) << 8) + (array[3] & 0xff);`
	`25`	`+ int x = ((array[3] & 0xff) << 24) + ((array[2] & 0xff) << 16) + ((array[1] & 0xff) << 8) + (array[0] & 0xff);`
`26`	`26`	`return Float.intBitsToFloat(x);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public void setValue(byte[] array, Float val) {`
`30`	`30`	`int x = Float.floatToIntBits(val);`
`31`		`- array[0] = (byte) ((x >>> 24) & 0xff);`
`32`		`- array[1] = (byte) ((x >>> 16) & 0xff);`
`33`		`- array[2] = (byte) ((x >>> 8) & 0xff);`
`34`		`- array[3] = (byte) ((x >>> 0) & 0xff);`
	`31`	`+ array[0] = (byte) ((x >>> 0) & 0xff);`
	`32`	`+ array[1] = (byte) ((x >>> 8) & 0xff);`
	`33`	`+ array[2] = (byte) ((x >>> 16) & 0xff);`
	`34`	`+ array[3] = (byte) ((x >>> 24) & 0xff);`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@ public int sizeOf() {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public Integer getValue(byte[] array) {`
`24`		`- int x = ((array[0] & 0xff) << 24) + ((array[1] & 0xff) << 16) + ((array[2] & 0xff) << 8) + (array[3] & 0xff);`
	`24`	`+ int x = ((array[3] & 0xff) << 24) + ((array[2] & 0xff) << 16) + ((array[1] & 0xff) << 8) + (array[0] & 0xff);`
`25`	`25`	`return x;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public void setValue(byte[] array, Integer x) {`
`29`		`- array[0] = (byte) ((x >>> 24) & 0xff);`
`30`		`- array[1] = (byte) ((x >>> 16) & 0xff);`
`31`		`- array[2] = (byte) ((x >>> 8) & 0xff);`
`32`		`- array[3] = (byte) ((x >>> 0) & 0xff);`
	`29`	`+ array[3] = (byte) ((x >>> 24) & 0xff);`
	`30`	`+ array[2] = (byte) ((x >>> 16) & 0xff);`
	`31`	`+ array[1] = (byte) ((x >>> 8) & 0xff);`
	`32`	`+ array[0] = (byte) ((x >>> 0) & 0xff);`
`33`	`33`	`}`
`34`	`34`	`}`