[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire swamp/ConstGraph.java swamp...
From: |
Tuomas J. Lukka |
Subject: |
[Gzz-commits] fenfire/org/fenfire swamp/ConstGraph.java swamp... |
Date: |
Tue, 15 Apr 2003 07:51:09 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Tuomas J. Lukka <address@hidden> 03/04/15 07:51:08
Modified files:
org/fenfire/swamp: ConstGraph.java makeswamp.py
org/fenfire/swamp/impl: AbstractConstGraph.java HashGraph.java
StdObservedConstGraph.java
org/fenfire/util: pagespanpaper.test
Log message:
Contains
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/ConstGraph.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/makeswamp.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/HashGraph.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/pagespanpaper.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/swamp/ConstGraph.java
diff -u fenfire/org/fenfire/swamp/ConstGraph.java:1.3
fenfire/org/fenfire/swamp/ConstGraph.java:1.4
--- fenfire/org/fenfire/swamp/ConstGraph.java:1.3 Mon Apr 14 08:21:20 2003
+++ fenfire/org/fenfire/swamp/ConstGraph.java Tue Apr 15 07:51:07 2003
@@ -10,6 +10,9 @@
ConstGraph getObservedConstGraph(org.fenfire.Obs o);
void close();
+ boolean contains(Object e0, Object e1, Object e2);
+ boolean contains(Object e0, Object e1, Object e2, Obs o);
+
Object find1_11X(Object e0,Object e1) ;
Object find1_1X1(Object e0,Object e2) ;
Object find1_X11(Object e1,Object e2) ;
Index: fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java
diff -u fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java:1.2
fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java:1.3
--- fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java:1.2 Mon Apr 14
08:21:20 2003
+++ fenfire/org/fenfire/swamp/impl/AbstractConstGraph.java Tue Apr 15
07:51:08 2003
@@ -11,6 +11,9 @@
return new StdObservedConstGraph(this, obs);
}
public void close() { }
+ public boolean contains(Object e0, Object e1, Object e2) {
+ return contains(e0, e1, e2, null);
+ }
public Object find1_11X(Object e0,Object e1) {
return this.find1_11X(e0,e1,null);
Index: fenfire/org/fenfire/swamp/impl/HashGraph.java
diff -u fenfire/org/fenfire/swamp/impl/HashGraph.java:1.5
fenfire/org/fenfire/swamp/impl/HashGraph.java:1.6
--- fenfire/org/fenfire/swamp/impl/HashGraph.java:1.5 Mon Apr 14 08:21:20 2003
+++ fenfire/org/fenfire/swamp/impl/HashGraph.java Tue Apr 15 07:51:08 2003
@@ -52,6 +52,19 @@
add(subject, predicate, object);
}
+ public boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ if(o != null) observer.addObs(e0, e1, e2, o);
+
+ HashMap hash1 = (HashMap) ind_012.get(e0);
+ if(hash1 == null) return false;
+
+ HashSet hash2 = (HashSet) hash1.get(e1);
+ if(hash2 == null) return false;
+
+ HashSet resSet = hash2;
+ return resSet.contains(e2);
+
+ }
//////////////////
// Finds
Index: fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java
diff -u fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java:1.2
fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java:1.3
--- fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java:1.2 Mon Apr
14 08:21:20 2003
+++ fenfire/org/fenfire/swamp/impl/StdObservedConstGraph.java Tue Apr 15
07:51:08 2003
@@ -24,6 +24,13 @@
public void close() { }
+ public boolean contains(Object e0, Object e1, Object e2) {
+ return constgraph.contains(e0, e1, e2, obs);
+ }
+ public boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ throw new Error("DoubleObs");
+ }
+
public Object find1_11X(Object e0,Object e1) {
return constgraph.find1_11X(e0,e1,obs);
}
Index: fenfire/org/fenfire/swamp/makeswamp.py
diff -u fenfire/org/fenfire/swamp/makeswamp.py:1.4
fenfire/org/fenfire/swamp/makeswamp.py:1.5
--- fenfire/org/fenfire/swamp/makeswamp.py:1.4 Tue Apr 15 06:39:40 2003
+++ fenfire/org/fenfire/swamp/makeswamp.py Tue Apr 15 07:51:07 2003
@@ -130,6 +130,9 @@
ConstGraph getObservedConstGraph(org.fenfire.Obs o);
void close();
+ boolean contains(Object e0, Object e1, Object e2);
+ boolean contains(Object e0, Object e1, Object e2, Obs o);
+
%(nonobs_findprotos)s
%(obs_findprotos)s
@@ -167,6 +170,9 @@
return new StdObservedConstGraph(this, obs);
}
public void close() { }
+ public boolean contains(Object e0, Object e1, Object e2) {
+ return contains(e0, e1, e2, null);
+ }
%(nonobs_callobs)s
@@ -198,6 +204,13 @@
public void close() { }
+ public boolean contains(Object e0, Object e1, Object e2) {
+ return constgraph.contains(e0, e1, e2, obs);
+ }
+ public boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ throw new Error("DoubleObs");
+ }
+
%(const_nonobs_callother)s
%(const_obs_nodouble)s
@@ -395,6 +408,19 @@
add(subject, predicate, object);
}
+ public boolean contains(Object e0, Object e1, Object e2, Obs o) {
+ if(o != null) observer.addObs(e0, e1, e2, o);
+
+ HashMap hash1 = (HashMap) ind_012.get(e0);
+ if(hash1 == null) return false;
+
+ HashSet hash2 = (HashSet) hash1.get(e1);
+ if(hash2 == null) return false;
+
+ HashSet resSet = hash2;
+ return resSet.contains(e2);
+
+ }
//////////////////
// Finds
Index: fenfire/org/fenfire/util/pagespanpaper.test
diff -u fenfire/org/fenfire/util/pagespanpaper.test:1.10
fenfire/org/fenfire/util/pagespanpaper.test:1.11
--- fenfire/org/fenfire/util/pagespanpaper.test:1.10 Tue Apr 15 06:39:40 2003
+++ fenfire/org/fenfire/util/pagespanpaper.test Tue Apr 15 07:51:08 2003
@@ -63,8 +63,9 @@
def setUp():
global sc
- id = "01ACE8A2E202A26072012715A94A270CD012F9B0F2"
+ id =
"urn:x-storm:1.0:application/pdf,6qrwyxinrkbr6znvopuo2rnqc7jjfpqg.ettfngwwbh4ore2hljm4soyipujr42gc7becvgq"
sc = alph.impl.PageImageScroll(None, storm.BlockId(id))
+ print sc.getID()
def testTestSpan():
"""Test that we really have the pagespan images.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] fenfire/org/fenfire swamp/ConstGraph.java swamp...,
Tuomas J. Lukka <=