[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz doc/pegboard/pegboard.html doc/pegboard/100...
|
From: |
Tuomas J. Lukka |
|
Subject: |
[Gzz-commits] gzz doc/pegboard/pegboard.html doc/pegboard/100... |
|
Date: |
Mon, 16 Sep 2002 05:09:24 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Tuomas J. Lukka <address@hidden> 02/09/16 05:09:22
Modified files:
doc/pegboard : pegboard.html
doc/pegboard/1001: PEG_1001.html
gzz/media : Enfilade1D.java
gzz/media/impl : Enfilade1DImpl.java
Log message:
Intersects call in Enfilade1DImpl - pegging it for inclusion in
Enfilade1D
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/pegboard.html.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1001/PEG_1001.html.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/Enfilade1D.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/Enfilade1DImpl.java.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
Patches:
Index: gzz/doc/pegboard/1001/PEG_1001.html
diff -c gzz/doc/pegboard/1001/PEG_1001.html:1.3
gzz/doc/pegboard/1001/PEG_1001.html:1.4
*** gzz/doc/pegboard/1001/PEG_1001.html:1.3 Tue Aug 27 02:07:46 2002
--- gzz/doc/pegboard/1001/PEG_1001.html Mon Sep 16 05:09:21 2002
***************
*** 1,12 ****
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>
! <head>
! <title>PEG 1001</title>
!
! <meta http-equiv="content-type"
! content="text/html; charset=ISO-8859-1">
! </head>
! <body>
<h1>PEG 1001: Generic indexing API</h1>
<p><i>
--- 1,9 ----
! <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN"><html><head><title>PEG 1001</title>
!
!
! <meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1"></head>
!
! <body>
<h1>PEG 1001: Generic indexing API</h1>
<p><i>
***************
*** 70,75 ****
</ul>
<br>
! <br>
! </body>
! </html>
--- 67,82 ----
</ul>
<br>
!
! <h1>Changes to core APIs and packages</h1>
! <br>
! <ul>
! <li>Add <tt>gzz.index</tt> into a core package</li>
! <li>Add the <tt>intersects</tt> calls from
<tt>gzz.media.impl.Enfilade1DImpl</tt> into <tt>gzz.media.Enfilade1D</tt></li>
! <li>Deprecate <tt>SpanSet</tt> and its implementations</li>
! <li>Delete <tt>SearchableCellTexter</tt>, as its functionality will be
supported by the new framework<br>
! </li>
! </ul>
!
! <br>
! </body></html>
\ No newline at end of file
Index: gzz/doc/pegboard/pegboard.html
diff -c gzz/doc/pegboard/pegboard.html:1.14 gzz/doc/pegboard/pegboard.html:1.15
*** gzz/doc/pegboard/pegboard.html:1.14 Mon Sep 16 04:02:38 2002
--- gzz/doc/pegboard/pegboard.html Mon Sep 16 05:09:21 2002
***************
*** 60,66 ****
<tr>
<td valign="top"><a href="1001/PEG_1001.html">1001</a><br>
</td>
! <td valign="top">incomplete <b>[temporarily being
implemented]</b><br>
</td>
<td valign="top">Generic index API to replace
<tt>SearchableCellTexter</tt>
<br>
--- 60,66 ----
<tr>
<td valign="top"><a href="1001/PEG_1001.html">1001</a><br>
</td>
! <td valign="top">incomplete <small><b>[temporarily being
partly implemented]</b></small><br>
</td>
<td valign="top">Generic index API to replace
<tt>SearchableCellTexter</tt>
<br>
***************
*** 226,231 ****
--- 226,232 ----
<br>
<br>
<br>
+ <br>
<br>
<br>
</body></html>
Index: gzz/gzz/media/Enfilade1D.java
diff -c gzz/gzz/media/Enfilade1D.java:1.10 gzz/gzz/media/Enfilade1D.java:1.11
*** gzz/gzz/media/Enfilade1D.java:1.10 Sun Aug 18 08:00:29 2002
--- gzz/gzz/media/Enfilade1D.java Mon Sep 16 05:09:21 2002
***************
*** 43,49 ****
* with log(L) efficiency.
*/
public interface Enfilade1D extends java.io.Serializable {
! String rcsid = "$Id: Enfilade1D.java,v 1.10 2002/08/18 12:00:29 benja Exp $";
static public interface Maker {
Enfilade1D makeEnfilade(Span span);
--- 43,49 ----
* with log(L) efficiency.
*/
public interface Enfilade1D extends java.io.Serializable {
! String rcsid = "$Id: Enfilade1D.java,v 1.11 2002/09/16 09:09:21 tjl Exp $";
static public interface Maker {
Enfilade1D makeEnfilade(Span span);
***************
*** 111,114 ****
--- 111,115 ----
* saving, otherwise we'd generate lots of JUNK!
*/
Enfilade1D optimized() ;
+
}
Index: gzz/gzz/media/impl/Enfilade1DImpl.java
diff -c gzz/gzz/media/impl/Enfilade1DImpl.java:1.9
gzz/gzz/media/impl/Enfilade1DImpl.java:1.10
*** gzz/gzz/media/impl/Enfilade1DImpl.java:1.9 Sun Aug 18 08:00:29 2002
--- gzz/gzz/media/impl/Enfilade1DImpl.java Mon Sep 16 05:09:22 2002
***************
*** 29,35 ****
/** A simple tree implementation of enfilades.
*/
public class Enfilade1DImpl implements Enfilade1D {
! static public final String rcsid = "$Id: Enfilade1DImpl.java,v 1.9 2002/08/18
12:00:29 benja Exp $";
/** An empty enfilade.
*/
--- 29,35 ----
/** A simple tree implementation of enfilades.
*/
public class Enfilade1DImpl implements Enfilade1D {
! static public final String rcsid = "$Id: Enfilade1DImpl.java,v 1.10
2002/09/16 09:09:22 tjl Exp $";
/** An empty enfilade.
*/
***************
*** 266,271 ****
--- 266,300 ----
public int hashCode() {
return getList().hashCode();
+ }
+
+ /** Return true if this enfilade intersects
+ * (span-wise) the other one.
+ * XXX Implemented using a really slow, bad algorithm.
+ */
+ public boolean intersects(Enfilade1D other0) {
+ Enfilade1DImpl other = (Enfilade1DImpl)other0;
+ if(middle != null && other.intersects(middle))
+ return true;
+ if(left != null && left.intersects(other))
+ return true;
+ if(right != null && right.intersects(other))
+ return true;
+ return false;
+ }
+
+ /** Return true if this enfilade intersects
+ * (span-wise) the given span.
+ * XXX Implemented using a really slow, bad algorithm.
+ */
+ public boolean intersects(Span s) {
+ if(middle != null && middle.intersects(s))
+ return true;
+ if(left != null && left.intersects(s))
+ return true;
+ if(right != null && right.intersects(s))
+ return true;
+ return false;
}
public Enfilade1D optimized() {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz doc/pegboard/pegboard.html doc/pegboard/100...,
Tuomas J. Lukka <=