projects
/
anneal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
de2400d
)
checkpoint
author
adam
<adam@megacz.com>
Sun, 6 Jul 2008 23:11:34 +0000
(16:11 -0700)
committer
adam
<adam@megacz.com>
Sun, 6 Jul 2008 23:11:34 +0000
(16:11 -0700)
darcs-hash:
20080706231134
-5007d-
5f01b3359a15471c838aca429b2429ea7b417e65
.gz
src/edu/berkeley/qfat/geom/BindingGroup.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/qfat/geom/BindingGroup.java
b/src/edu/berkeley/qfat/geom/BindingGroup.java
index
4c2d114
..
4df8cc4
100644
(file)
--- a/
src/edu/berkeley/qfat/geom/BindingGroup.java
+++ b/
src/edu/berkeley/qfat/geom/BindingGroup.java
@@
-5,8
+5,6
@@
import java.util.*;
/** tracks an equivalence class of geometric objects which are related to each other by transformation matrices */
public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
/** tracks an equivalence class of geometric objects which are related to each other by transformation matrices */
public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
- public Matrix krank = Matrix.ONE;
-
private T master = null;
private HashMap<T,Matrix> matrices = new HashMap<T,Matrix>();
private T master = null;
private HashMap<T,Matrix> matrices = new HashMap<T,Matrix>();
@@
-17,7
+15,6
@@
public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
public int size() { return matrices.size(); }
public int size() { return matrices.size(); }
- public void setKrank(Matrix k) { krank = krank.times(k); }
public void merge(BindingGroup<T> bg, Matrix m) {
if (bg==this) throw new Error();
for(HasBindingGroup hbg : bg.matrices.keySet()) {
public void merge(BindingGroup<T> bg, Matrix m) {
if (bg==this) throw new Error();
for(HasBindingGroup hbg : bg.matrices.keySet()) {
@@
-26,7
+23,6
@@
public class BindingGroup<T extends HasBindingGroup> implements Iterable<T> {
}
Matrix v = getMatrix(bg.master, master);
}
Matrix v = getMatrix(bg.master, master);
- //krank = krank.times(v.inverse().times(bg.krank).times(v));
HashSet<HasBindingGroup> stuff = new HashSet<HasBindingGroup>();
for(HasBindingGroup hbg : bg.matrices.keySet())
HashSet<HasBindingGroup> stuff = new HashSet<HasBindingGroup>();
for(HasBindingGroup hbg : bg.matrices.keySet())