[Gzz-commits] fenfire ./Makefile org/fenfire/swamp/bench/RDFO...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Tuomas J. Lukka <address@hidden>        03/05/08 09:22:07

Modified files:
        .              : Makefile 
        org/fenfire/swamp/bench: RDFOps.java graph.py 
        org/fenfire/util: RDFUtil.java 
        org/fenfire/view: PageSpanLayout.java 

Log message:
        Fix pagespanlayout to new vob. Graph benching.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/Makefile.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/bench/RDFOps.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/bench/graph.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/PageSpanLayout.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: fenfire/Makefile
diff -u fenfire/Makefile:1.16 fenfire/Makefile:1.17
--- fenfire/Makefile:1.16       Mon Apr 28 07:24:24 2003
+++ fenfire/Makefile    Thu May  8 09:22:06 2003
@@ -29,7 +29,7 @@
 BENCH=org.fenfire.swamp.bench.graph
 
 bench:
-       $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/bench/mark.py $(BENCH)
+       $(LDLIB) java -cp $(CLASSPATH) $(PYTHONPATH) org.python.util.jython 
../libvob/runbench.py $(BENCH)
 
 .PHONY: docs
 
Index: fenfire/org/fenfire/swamp/bench/RDFOps.java
diff -u fenfire/org/fenfire/swamp/bench/RDFOps.java:1.2 
fenfire/org/fenfire/swamp/bench/RDFOps.java:1.3
--- fenfire/org/fenfire/swamp/bench/RDFOps.java:1.2     Sat Apr 19 10:26:13 2003
+++ fenfire/org/fenfire/swamp/bench/RDFOps.java Thu May  8 09:22:06 2003
@@ -15,7 +15,7 @@
 
     public int circleSize;
 
-    Graph g;
+    public Graph graph;
     URN5Namespace namespace = new URN5Namespace();
     
     Object[] nodes;
@@ -29,14 +29,14 @@
     public void traverseCircle_prepare() {
        // Make a circle
        for(int i=0; i<circleSize; i++) 
-           g.add(nodes[i+1], nodes[0], nodes[i+2]);
-       g.add(nodes[circleSize+1], nodes[0], nodes[1]);
+           graph.add(nodes[i+1], nodes[0], nodes[i+2]);
+       graph.add(nodes[circleSize+1], nodes[0], nodes[1]);
     }
 
     public void traverseCircle_find1() {
        Object node = nodes[1];
        for(int i=0; i<nrounds; i++) {
-           node = g.find1_11X(node, nodes[0]);
+           node = graph.find1_11X(node, nodes[0]);
            if(node == null) throw new NullPointerException();
        }
     }
Index: fenfire/org/fenfire/swamp/bench/graph.py
diff -u fenfire/org/fenfire/swamp/bench/graph.py:1.1 
fenfire/org/fenfire/swamp/bench/graph.py:1.2
--- fenfire/org/fenfire/swamp/bench/graph.py:1.1        Thu Apr 24 08:05:30 2003
+++ fenfire/org/fenfire/swamp/bench/graph.py    Thu May  8 09:22:06 2003
@@ -1,19 +1,27 @@
 # (c) Tuomas J. Lukka
 
 import org
-swamp = org.fenfire.swamp
+import java
+from org import fenfire as ff
+
 
 tim = java.lang.System.currentTimeMillis
 
 def bench(nrounds, nnodes = 100):
-    ro = swamp.bench.RDFOps(nnodes + 50)
-    ro.graph = HashGraph()
+    ro = ff.swamp.bench.RDFOps(nnodes + 50)
+    ro.graph = ff.swamp.impl.HashGraph()
 
     ro.nrounds = nrounds * nnodes
     ro.circleSize = nnodes
 
     ro.traverseCircle_prepare()
 
-    t0 = tim
+    t0 = tim()
     ro.traverseCircle_find1()
-    t1 = tim
+    t1 = tim()
+
+    return ((t1-t0) / 1000.0, "X")
+
+args = {
+"nnodes": (10,100,1000),
+}
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.9 
fenfire/org/fenfire/util/RDFUtil.java:1.10
--- fenfire/org/fenfire/util/RDFUtil.java:1.9   Wed May  7 00:08:05 2003
+++ fenfire/org/fenfire/util/RDFUtil.java       Thu May  8 09:22:07 2003
@@ -42,11 +42,19 @@
        return false;
     }
 
-    /** Get int from the literal 
+    /** Get int attribute (from a literal).
      */
     static public int getInt(Fen fen, Object node, Object pre) {
        Literal lit = (Literal)fen.constgraph.find1_11X(node, pre);
        return Integer.parseInt(lit.getTextString() );
+    }
+
+    /** Set int attribute (literal).
+     */
+    static public void setInt(Fen fen, Object node, Object pre, int val) {
+       fen.graph.set1_11X(node, pre,
+               Nodes.getStringLiteral(
+                   Integer.toString(val)));
     }
 
 
Index: fenfire/org/fenfire/view/PageSpanLayout.java
diff -u fenfire/org/fenfire/view/PageSpanLayout.java:1.9 
fenfire/org/fenfire/view/PageSpanLayout.java:1.10
--- fenfire/org/fenfire/view/PageSpanLayout.java:1.9    Sun May  4 21:38:49 2003
+++ fenfire/org/fenfire/view/PageSpanLayout.java        Thu May  8 09:22:07 2003
@@ -21,7 +21,8 @@
 
     public static final float scale = 72 * 6;
 
-    public static float diceLength = 10f;
+    public static float diceLength = 16f;
+    public static float diceLength2 = 16f;
     public static int diceDepth = 20;
     public static int  flags = 2;
 
@@ -199,6 +200,7 @@
                        xywh[4*p + 0]+xywh[4*p + 2], 
                        xywh[4*p + 1]+xywh[4*p + 3], flags,
                        diceLength,
+                       diceLength2,
                        diceDepth
                        ), tr);
        }