[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire docs/newbie-dev-faq.rst docs/projects.r...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] fenfire docs/newbie-dev-faq.rst docs/projects.r... |
|
Date: |
Fri, 06 Jun 2003 16:04:34 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Branch:
Changes by: Tuomas J. Lukka <address@hidden> 03/06/06 16:04:33
Modified files:
docs : newbie-dev-faq.rst projects.rst
docs/pegboard/fenfire_vision--benja_tjl: peg.rst
org/fenfire/demo: buoyoing.py
org/fenfire/swamp: Graphs.java Graphs.test
observablegraphtest.py
org/fenfire/test: gfx.py
org/fenfire/util: GLSpanner.java pagespanpaper.test
org/fenfire/view: pagespanlayout.test
Log message:
The tests are now silent
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/newbie-dev-faq.rst.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/projects.rst.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/docs/pegboard/fenfire_vision--benja_tjl/peg.rst.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graphs.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/observablegraphtest.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/gfx.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/GLSpanner.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/pagespanlayout.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: fenfire/docs/newbie-dev-faq.rst
diff -u fenfire/docs/newbie-dev-faq.rst:1.2 fenfire/docs/newbie-dev-faq.rst:1.3
--- fenfire/docs/newbie-dev-faq.rst:1.2 Mon Apr 28 11:38:28 2003
+++ fenfire/docs/newbie-dev-faq.rst Fri Jun 6 16:04:32 2003
@@ -3,8 +3,8 @@
====================================================================================
:Date: 2002-11-24
-:Revision: $Revision: 1.2 $
-:Last-Modified: $Date: 2003/04/28 15:38:28 $
+:Revision: $Revision: 1.3 $
+:Last-Modified: $Date: 2003/06/06 20:04:32 $
This file is for newbie developers.
@@ -85,12 +85,13 @@
private void pa(String s) { System.out.println("Foo::"+s);
- public void example() {
- p("Just a test")
+ public void example(int i) {
+ p("Just a test " + i)
}
}
-If you use this, debug string is always created and that isn't very efficient
in java.
+If you use this, debug string is always created using immutable string
concatenation
+and that isn't very efficient in java.
Well, instead of previous example, write a bit longer but more efficient: ::
class Foo {
@@ -98,8 +99,8 @@
private void pa(String s) { System.out.println("Foo::"+s);
- public void example() {
- if (dbg) pa("Just a test")
+ public void example(int i) {
+ if (dbg) pa("Just a test " + i)
}
}
@@ -125,24 +126,8 @@
Bilinear and Trilinear
- - Close temrs to mipmapping. Trilinear sums 8 texels and counts
- weighted average factor from two mipmap levels.
+ - Close temrs to mipmapping. Trilinear reads 8 texels from two mipmap levels.
+ and calculates a weighted average
Bilinear is same with 4 texels from one mipmap level.
Of course trilinear looks much better - it doesn't jump around.
-
-
-How to use mediaserver, mstmpimg and texpacker for mipzips?
-===========================================================
-
-0) cd gzz dir =)
-
-1) CLASSPATH=./CLASSES java gzz.mediaserver.AddToMediaserver -c ../Z-private
guess ../pdfs/<article>
-
-2) make sync-private
-
-3) perl genimages.pl
-
-4) get someone with fast cpu (and harddisk io) to generate the mipzips with
following script:
-
-5) make runjython DBG="gfx/util/texpacker.py ../mstmpimg/*-170-*[0-9]"
Index: fenfire/docs/pegboard/fenfire_vision--benja_tjl/peg.rst
diff -u fenfire/docs/pegboard/fenfire_vision--benja_tjl/peg.rst:1.2
fenfire/docs/pegboard/fenfire_vision--benja_tjl/peg.rst:1.3
--- fenfire/docs/pegboard/fenfire_vision--benja_tjl/peg.rst:1.2 Wed Apr 2
12:03:07 2003
+++ fenfire/docs/pegboard/fenfire_vision--benja_tjl/peg.rst Fri Jun 6
16:04:33 2003
@@ -4,8 +4,8 @@
:Authors: Benja Fallenstein, Tuomas J. Lukka
:Date: 2003-02-17
-:Revision: $Revision: 1.2 $
-:Last-Modified: $Date: 2003/04/02 17:03:07 $
+:Revision: $Revision: 1.3 $
+:Last-Modified: $Date: 2003/06/06 20:04:33 $
:Type: Policy
:Scope: Major
:Status: Incomplete
@@ -20,7 +20,6 @@
=====
- hyperstructure
-- "productization" of subprojects
- be as structured or unstructured as you need to be
- focus+context
- a desktop environment built around this (with a buoy view)
@@ -32,12 +31,34 @@
The text
========
+
+Various small aspects of the overall idea
+=========================================
+
+Data stability
+--------------
+
+This idea comes from Ted Nelson through xanalogical hypertext.
+The point is that whatever you enter into the computer should be absolutely
+permanent and stable ...
+
+... Storm ... XXX
+
A single data model
-------------------
All data meaningful to a user should be stored in the same format.
This format should allow making links at any granularity.
+Productization of subprojects
+-----------------------------
+
+Libvob, storm, alph &c started from fenfire as modules and at the end
+started weighing so much that fenfire had to "give birth" --- separate
+them into separate projects.
+
+The new subprojects have clearly defined immediate goals in supporting
+fenfire and hopefully others --- fenfire continues to be the soft research
core.
Reproducibility
@@ -54,11 +75,14 @@
PC is OK, 3D accelerators are OK, $5000 datagloves and projectors
are not.
---> idea: experiment with building cheap controllers out of
+For example, we have experimented with building cheap controllers out of
mice and LEGOs.
+
Who is funding the research group and what do *they* want?
----------------------------------------------------------
(this space unintentionally left blank ;-))
+
+
Index: fenfire/docs/projects.rst
diff -u fenfire/docs/projects.rst:1.5 fenfire/docs/projects.rst:1.6
--- fenfire/docs/projects.rst:1.5 Tue May 20 07:04:20 2003
+++ fenfire/docs/projects.rst Fri Jun 6 16:04:32 2003
@@ -94,4 +94,109 @@
horizontally(50, foo, GLMosaicText, CallGL);
foo.c = LibVob.c + (0, -100);
- Navidoc.c = GLMosaicText.c + (-50, -50);
\ No newline at end of file
+ Navidoc.c = GLMosaicText.c + (-50, -50);
+
+Brief explanations
+==================
+
+-------
+Navidoc
+-------
+
+:Maintainer: Asko Soukka
+
+A software engineering documentation tool using ReST and providing
+multidirectionally hyperlinked UML diagrams.
+
+-----
+Storm
+-----
+
+:Maintainer: Benja Fallenstein
+
+A new type of distributed computer storage framework with global, unique
+ids.
+
+----
+Alph
+----
+
+:Maintainer: Tuomas J. Lukka
+
+An implementation of xanalogical hypertext on top of the distributed Storm
+library.
+
+------------
+GLMosaicText
+------------
+
+:Maintainer: Tuomas J. Lukka
+
+An OpenGL library interfacing to freetype, providing
+fonts in textures, able to dice.
+
+Uses templates to provide flexible interfaces, allowing
+flexible geometry processing by the programmer.
+
+------
+CallGL
+------
+
+:Maintainer: Janne V. Kujala
+
+A library for 1) wrapping up OpenGL calls, 2) calling OpenGL
+dynamically.
+
+------
+LibVob
+------
+
+:Maintainer: Tuomas J. Lukka
+
+A graphical library providing automatic animation between unrelated
+views, if the views are reasonably defined, and connections crosscutting
+view hierarchies.
+
+LibPaper (currently in LibVob, maybe split later)
+-------------------------------------------------
+
+:Maintainer: Janne V. Kujala and Tuomas J. Lukka
+
+A library which creates unique backgrounds from given seed values.
+The backgrounds are maximally recognizable as well as legible for black
+text.
+
+
+------------
+Fenfire loom
+------------
+
+:Maintainer: Benja Fallenstein
+
+An RDF browser/editor.
+
+-------
+Fenfire
+-------
+
+:Maintainer: Tuomas J. Lukka
+
+The networked hyperstructured radical user interface.
+This is the least well defined part of all our projects;
+the other projects represent the hardened parts of this project --
+the code in fenfire is still soft and changing.
+
+FenPDF (currently in Fenfire, maybe separated as soon as it works)
+------------------------------------------------------------------
+
+:Maintainer: Tuomas J. Lukka
+
+A hyperstructured PDF viewer using xanalogical and RDF structure.
+
+Swamp (currently in Fenfire, maybe separated soon)
+--------------------------------------------------
+
+:Maintainer: Tuomas J. Lukka
+
+A Java RDF API focused on SPEED.
+
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.58
fenfire/org/fenfire/demo/buoyoing.py:1.59
--- fenfire/org/fenfire/demo/buoyoing.py:1.58 Thu Jun 5 14:07:03 2003
+++ fenfire/org/fenfire/demo/buoyoing.py Fri Jun 6 16:04:33 2003
@@ -31,8 +31,6 @@
import jarray
import java
-del(sys.modules["org"])
-
print "LOADING BUOYOING"
if dbg:
for (k,v) in sys.modules.items():
@@ -226,7 +224,7 @@
buoywidth0, buoyheight0)
vs.coords.setOrthoBoxParams(self.buoyinto2, 0,
- ctrx - .5*buoywidth0, 0 + h0 + .5*h1 - .5*buoyheight1,
+ ctrx - .5*buoywidth1, 0 + h0 + .5*h1 - .5*buoyheight1,
s1, s1,
buoywidth1, buoyheight1)
Index: fenfire/org/fenfire/swamp/Graphs.java
diff -u fenfire/org/fenfire/swamp/Graphs.java:1.8
fenfire/org/fenfire/swamp/Graphs.java:1.9
--- fenfire/org/fenfire/swamp/Graphs.java:1.8 Thu Jun 5 14:36:19 2003
+++ fenfire/org/fenfire/swamp/Graphs.java Fri Jun 6 16:04:33 2003
@@ -32,7 +32,7 @@
import java.util.Iterator;
public class Graphs {
- public static boolean dbg = true;
+ public static boolean dbg = false;
public static void p(String s) { System.out.println("swamp.Graphs:: "+s); }
public static Model toModel(ConstGraph g) {
@@ -53,11 +53,13 @@
for (Iterator k=g.findN_11X_Iter(o,p); k.hasNext();) {
Object q = k.next();
if(q instanceof Literal) {
- p("Literal! : "+ q);
+ if(dbg)
+ p("Literal! : "+ q);
String s = ((Literal)q).getTextString();
sub.addProperty(prop, s);
} else {
- p("Resource! : "+ q);
+ if(dbg)
+ p("Resource! : "+ q);
Resource ob = m.createResource(Nodes.toString(q));
sub.addProperty(prop, o);
}
@@ -73,10 +75,10 @@
public static Graph toGraph(Model m) {
try {
if (dbg) {
- p("toGraph!");
+ p("toGraph!");
StmtIterator j=m.listStatements();
while(j.hasNext()) {
- p("And there are: "+
+ p("And there are: "+
((Statement)j.next()).getString() );
}
}
@@ -87,7 +89,8 @@
Statement s = i.next();
Object sub = Nodes.get(s.getSubject().toString());
Object pred = Nodes.get(s.getPredicate().toString());
- System.out.println("PRED: '"+s.getPredicate().toString()+"'");
+ if(dbg)
+ p("PRED: '"+s.getPredicate().toString()+"'");
if(s.getObject() instanceof
com.hp.hpl.mesa.rdf.jena.model.Literal) {
Literal ob = Nodes.getStringLiteral(s.getString());
g.add(sub, pred, ob);
Index: fenfire/org/fenfire/swamp/Graphs.test
diff -u fenfire/org/fenfire/swamp/Graphs.test:1.4
fenfire/org/fenfire/swamp/Graphs.test:1.5
--- fenfire/org/fenfire/swamp/Graphs.test:1.4 Thu Jun 5 14:36:19 2003
+++ fenfire/org/fenfire/swamp/Graphs.test Fri Jun 6 16:04:33 2003
@@ -7,9 +7,12 @@
file = 'org.fenfire.swamp.Graphs.testFileSaveAndLoad.test.data'
+dbg = 0
def testFileSaveAndLoadSimple():
- """ Makes resources as aesy as 'foo:a0', 'foo:a1' and such
+ """ Test file saving and loading with simple resource names.
+
+ Makes resources as aesy as 'foo:a0', 'foo:a1' and such
"""
g = swamp.impl.HashGraph()
@@ -38,9 +41,8 @@
def testFileSaveAndLoadUrn5():
- """ Uses real urn-5 resources
+ """ Test file saving and loading using real urn-5 resources.
"""
- swamp.Graphs.dbg = 1
g = swamp.impl.HashGraph()
n = swamp.Nodes()
@@ -52,7 +54,8 @@
m.write(java.io.FileWriter(file))
swamp.Graphs.toGraph(m)
- print open(file).read()
+ if dbg:
+ print open(file).read()
#### Load
m = jena.mem.ModelMem()
@@ -61,7 +64,7 @@
iter = g.findN_XAA_Iter()
for i in range(0,10):
- print "<%s>" % i
+ if dbg: print "<%s>" % i
assert iter.hasNext()
assert iter.next() != None
Index: fenfire/org/fenfire/swamp/observablegraphtest.py
diff -u fenfire/org/fenfire/swamp/observablegraphtest.py:1.5
fenfire/org/fenfire/swamp/observablegraphtest.py:1.6
--- fenfire/org/fenfire/swamp/observablegraphtest.py:1.5 Sun Apr 27
16:19:25 2003
+++ fenfire/org/fenfire/swamp/observablegraphtest.py Fri Jun 6 16:04:33 2003
@@ -8,6 +8,8 @@
_uriMaker = org.fenfire.util.URN5Namespace()
_node = [Nodes.get(_uriMaker.generateId()) for i in range(0,20)]
+dbg = 0
+
class _Obs(org.fenfire.Obs):
def __init__(self):
self.t = 0
@@ -72,7 +74,8 @@
graph.set1_11X(node[0], node[1], node[3])
assert to1.t == 0
- print "CHANGES: ", to1.c
+ if dbg:
+ print "CHANGES: ", to1.c
assert len(to1.c) == 2
assert to1.c[0][0] == -1
assert to1.c[0][3] == node[2]
@@ -88,7 +91,7 @@
def f(self, g, x):
self.calls += 1
literal = g.find1_11X(x, node[0])
- print "F: Got literal",literal
+ if dbg: print "F: Got literal",literal
if literal == None: return None
return literal.getTextString()
@@ -97,7 +100,7 @@
cf = CachedNodeFunction(3, graph, of)
def doit(f):
- print "F now:",f
+ if dbg: print "F now:",f
assert f.f(graph, node[1]) == None
assert f.f(graph, node[2]) == None
assert f.f(graph, node[3]) == None
Index: fenfire/org/fenfire/test/gfx.py
diff -u fenfire/org/fenfire/test/gfx.py:1.4 fenfire/org/fenfire/test/gfx.py:1.5
--- fenfire/org/fenfire/test/gfx.py:1.4 Wed Mar 26 13:15:10 2003
+++ fenfire/org/fenfire/test/gfx.py Fri Jun 6 16:04:33 2003
@@ -69,7 +69,7 @@
else:
win = _realwin
-print "GW: ",win
+# print "GW: ",win
def failUnless(b, msg=None):
if not b:
Index: fenfire/org/fenfire/util/GLSpanner.java
diff -u fenfire/org/fenfire/util/GLSpanner.java:1.7
fenfire/org/fenfire/util/GLSpanner.java:1.8
--- fenfire/org/fenfire/util/GLSpanner.java:1.7 Tue Apr 22 21:45:49 2003
+++ fenfire/org/fenfire/util/GLSpanner.java Fri Jun 6 16:04:33 2003
@@ -79,13 +79,16 @@
pages = new SpanPage[sp.length()];
}
SpanPage getPage(int i) {
- pa("getPage: "+i+" "+pages.length);
+ if(dbg)
+ pa("getPage: "+i+" "+pages.length);
if(i < 0 || i >= pages.length) return null;
if(pages[i] == null) {
pages[i] = new SpanPage(sb, i);
- pa("created: "+i);
+ if(dbg)
+ pa("created: "+i);
}
- pa("returning: "+pages[i]);
+ if(dbg)
+ pa("returning: "+pages[i]);
return pages[i];
}
}
@@ -144,7 +147,8 @@
try {
path = MipzipCache.getPageFiles(sb)[page];
- pa("Loading mipzip path: "+path);
+ if(dbg)
+ pa("Loading mipzip path: "+path);
l = new MipzipLoader(new File(path));
} catch(IOException e) {
@@ -216,7 +220,8 @@
* @param pixScale The number of pixels per imagespan unit: the resolution
needed.
*/
public static SpanRect getSpanRect(PageImageSpan sp) {
- pa("getSpanRect: "+sp+" "+sp.getPageIndex());
+ if(dbg)
+ pa("getSpanRect: "+sp+" "+sp.getPageIndex());
SpanRect r = (SpanRect)span2rect.get(sp);
if(r == null) {
PageImageScroll sb = (PageImageScroll)sp.getScrollBlock();
Index: fenfire/org/fenfire/util/pagespanpaper.test
diff -u fenfire/org/fenfire/util/pagespanpaper.test:1.13
fenfire/org/fenfire/util/pagespanpaper.test:1.14
--- fenfire/org/fenfire/util/pagespanpaper.test:1.13 Tue Apr 22 09:26:20 2003
+++ fenfire/org/fenfire/util/pagespanpaper.test Fri Jun 6 16:04:33 2003
@@ -32,11 +32,6 @@
import java
-del(sys.modules["org"])
-del sys.modules["org.nongnu"]
-del sys.modules["org.nongnu.libvob"]
-
-
import vob
from org.nongnu import alph
from org.nongnu import storm
@@ -53,14 +48,13 @@
import vob.paper
import vob.paper.papermill
-print "vob",dir(vob)
-print "vob.gl",dir(vob.gl)
-
fenfire.util.PageSpanPaper.paperMill = vob.gl.PaperMill.getInstance()
fenfire.util.PageSpanPaper.paperMillWindow = fenfire.test.gfx.win
# alph/testdata/test1.pdf --
urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq
+dbg = 0
+
def setUp():
global sc
@@ -74,23 +68,25 @@
If not, all other tests in this file will fail too.
"""
- print "len",sc.getCurrent().length()
+ if dbg:
+ print "len",sc.getCurrent().length()
assert sc.getCurrent().length() == 2
def excinfo():
global exc
typ, val, tra = sys.exc_info()
- print (repr((typ, val)))
- print str(val)
+ if dbg:
+ print (repr((typ, val)))
+ print str(val)
exc = "\n".join(traceback.format_list(traceback.extract_tb(tra)))
def checkColors():
try:
# Check that the green rectangle is there
- gfx.checkAvgColor(160,150,50,50, (0, 255, 0), delta=110)
+ gfx.checkAvgColor(160,150,50,50, (0, 180, 0), delta=80)
# Check that the red rectangle is there
- gfx.checkAvgColor(260,150,50,50, (255, 0, 0), delta=110)
+ gfx.checkAvgColor(260,150,50,50, (180, 0, 0), delta=80)
# Check that the black rectangle is there
gfx.checkAvgColor(150,225,20,50, (0, 0, 0))
gfx.checkAvgColor(330,225,20,50, (0, 0, 0))
Index: fenfire/org/fenfire/view/pagespanlayout.test
diff -u fenfire/org/fenfire/view/pagespanlayout.test:1.8
fenfire/org/fenfire/view/pagespanlayout.test:1.9
--- fenfire/org/fenfire/view/pagespanlayout.test:1.8 Mon Apr 28 09:12:09 2003
+++ fenfire/org/fenfire/view/pagespanlayout.test Fri Jun 6 16:04:33 2003
@@ -40,6 +40,8 @@
from org.fenfire.test import gfx
+dbg = 0
+
def setUp():
global sc, enfMaker
@@ -56,7 +58,8 @@
print (repr((typ, val)))
# print str(val)
exc = str(val) +
"\n".join(traceback.format_list(traceback.extract_tb(tra)))
- print "EXCEPTION:", exc
+ if dbg:
+ print "EXCEPTION:", exc
def checkColors(x, y):
try:
@@ -131,7 +134,8 @@
gfx.render(vs)
if checkColors(150, 150):
- print "PASS!"
+ if dbg:
+ print "PASS!"
passed = 1
break
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire docs/newbie-dev-faq.rst docs/projects.r...,
Tuomas J. Lukka <=