projects
/
anneal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fd66f9c
)
checkpoint
author
adam
<adam@megacz.com>
Wed, 5 Dec 2007 09:19:51 +0000
(
01:19
-0800)
committer
adam
<adam@megacz.com>
Wed, 5 Dec 2007 09:19:51 +0000
(
01:19
-0800)
darcs-hash:
20071205091951
-5007d-
2fe60c5d9ee894e17dc03cf171855493ec6c2356
.gz
src/edu/berkeley/qfat/Mesh.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/qfat/Mesh.java
b/src/edu/berkeley/qfat/Mesh.java
index
02188f2
..
0e59461
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-322,10
+322,17
@@
public class Mesh implements Iterable<Mesh.T> {
private HashSet<E> left = new HashSet<E>();
private HashSet<E> right = new HashSet<E>();
public BindingGroup() { }
private HashSet<E> left = new HashSet<E>();
private HashSet<E> right = new HashSet<E>();
public BindingGroup() { }
- public BindingGroup(E e) { add(e, false); }
- public void add(E e, boolean swap) {
+ public BindingGroup(E e) { add(null, e, false); }
+ public void add(E ethis, E e, boolean swap) {
+ if (ethis==null) { }
+ else if (right.contains(ethis)) swap = !swap;
+ else if (!left.contains(ethis)) throw new Error();
+
if (e.bg != null) {
if (e.bg != null) {
- if (e.bg == this) return; /* fixme what if it is in the "other" set? */
+ if (e.bg == this) {
+ if ((!swap ? right : left).contains(e)) throw new Error("double bind!");
+ return;
+ }
for(E ex : (!swap ? e.bg.left : e.bg.right)) {
ex.bg = this;
left.add(ex);
for(E ex : (!swap ? e.bg.left : e.bg.right)) {
ex.bg = this;
left.add(ex);
@@
-339,9
+346,8
@@
public class Mesh implements Iterable<Mesh.T> {
(!swap ? left : right).add(e);
e.bg = this;
}
(!swap ? left : right).add(e);
e.bg = this;
}
-
for(E ex : (!swap ? right : left)) {
for(E ex : (!swap ? right : left)) {
- if (e.next.isBoundTo(ex.next)) {
+ if (e.prev.isBoundTo(ex.prev)) {
System.out.println("hit!");
}
}
System.out.println("hit!");
}
}
@@
-392,10
+398,7
@@
public class Mesh implements Iterable<Mesh.T> {
public int compareTo(E e) { return e.length() > length() ? 1 : -1; }
public int compareTo(E e) { return e.length() > length() ? 1 : -1; }
-
- public void bindEdge(E e) {
- bg.add(e, true);
- }
+ public void bindEdge(E e) { bg.add(this, e, true); }
public void dobind() { if (bg != null) bg.dobind(this); }
public Point shatter() { return shatter(midpoint(), null, null, false); }
public void dobind() { if (bg != null) bg.dobind(this); }
public Point shatter() { return shatter(midpoint(), null, null, false); }
@@
-415,8
+418,8
@@
public class Mesh implements Iterable<Mesh.T> {
newT(r.p, p1.p, mid, null);
newT(r.p, mid, p2.p, null);
newT(r.p, p1.p, mid, null);
newT(r.p, mid, p2.p, null);
- (swap ? bg1 : bg2).add(p1.getE(mid), swap);
- (swap ? bg2 : bg1).add(p2.getE(mid).pair, swap);
+ (swap ? bg1 : bg2).add(null, p1.getE(mid), swap);
+ (swap ? bg2 : bg1).add(null, p2.getE(mid).pair, swap);
return mid;
}
return mid;
}