[Gzz-commits] fenfire/org/fenfire swamp/Graph.java swamp/make...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/07 03:14:33

Modified files:
        org/fenfire/swamp: Graph.java makeswamp.py 
        org/fenfire/swamp/impl: AbstractGraph.java StdObservedGraph.java 
Added files:
        org/fenfire/util: TreeTime.java 

Log message:
        Treetime utility

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/Graph.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/makeswamp.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/AbstractGraph.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/swamp/impl/StdObservedGraph.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/TreeTime.java?rev=1.1

Patches:
Index: fenfire/org/fenfire/swamp/Graph.java
diff -u fenfire/org/fenfire/swamp/Graph.java:1.5 
fenfire/org/fenfire/swamp/Graph.java:1.6
--- fenfire/org/fenfire/swamp/Graph.java:1.5    Tue Apr 15 06:39:40 2003
+++ fenfire/org/fenfire/swamp/Graph.java        Thu Aug  7 03:14:32 2003
@@ -12,6 +12,7 @@
 
     void rm_111(Object e0,Object e1,Object e2) ;
 void rm_11A(Object e0,Object e1) ;
+void rm_A11(Object e1,Object e2) ;
 void rm_1AA(Object e0) ;
 
 
Index: fenfire/org/fenfire/swamp/impl/AbstractGraph.java
diff -u fenfire/org/fenfire/swamp/impl/AbstractGraph.java:1.3 
fenfire/org/fenfire/swamp/impl/AbstractGraph.java:1.4
--- fenfire/org/fenfire/swamp/impl/AbstractGraph.java:1.3       Wed Jun 11 
13:00:24 2003
+++ fenfire/org/fenfire/swamp/impl/AbstractGraph.java   Thu Aug  7 03:14:33 2003
@@ -43,6 +43,15 @@
        for(i = l.iterator(); i.hasNext();)
            rm_111(e0, e1, i.next());
     }
+
+    public void rm_A11(Object e1,Object e2) {
+       Iterator i = findN_X11_Iter(e1, e2);
+       ArrayList l = new ArrayList();
+       while(i.hasNext())
+           l.add(i.next());
+       for(i = l.iterator(); i.hasNext();)
+           rm_111(i.next(), e1, e2);
+    }
     public void rm_1AA(Object e0) {
        while(true) {
            Iterator i = findN_1XA_Iter(e0);
Index: fenfire/org/fenfire/swamp/impl/StdObservedGraph.java
diff -u fenfire/org/fenfire/swamp/impl/StdObservedGraph.java:1.5 
fenfire/org/fenfire/swamp/impl/StdObservedGraph.java:1.6
--- fenfire/org/fenfire/swamp/impl/StdObservedGraph.java:1.5    Thu Apr 24 
08:59:07 2003
+++ fenfire/org/fenfire/swamp/impl/StdObservedGraph.java        Thu Aug  7 
03:14:33 2003
@@ -28,6 +28,9 @@
 public void rm_11A(Object e0,Object e1) {
          graph.rm_11A(e0,e1);
 }
+public void rm_A11(Object e1,Object e2) {
+         graph.rm_A11(e1,e2);
+}
 public void rm_1AA(Object e0) {
          graph.rm_1AA(e0);
 }
Index: fenfire/org/fenfire/swamp/makeswamp.py
diff -u fenfire/org/fenfire/swamp/makeswamp.py:1.8 
fenfire/org/fenfire/swamp/makeswamp.py:1.9
--- fenfire/org/fenfire/swamp/makeswamp.py:1.8  Wed Jun 11 13:00:24 2003
+++ fenfire/org/fenfire/swamp/makeswamp.py      Thu Aug  7 03:14:32 2003
@@ -38,6 +38,7 @@
 for pattern in (
        "111",  # Only these three removes at first...
        "11A", 
+       "A11", 
        "1AA",
        ):
     graph.append({