projects
/
anneal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[anneal.git]
/
src
/
edu
/
berkeley
/
qfat
/
geom
/
HasBindingGroup.java
diff --git
a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index
fc12a29
..
5b761a3
100644
(file)
--- a/
src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/
src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@
-16,7
+16,8
@@
public abstract class HasBindingGroup {
if (other.bindingGroup == null) other.bindingGroup = new BindingGroup(other);
if (other.bindingGroup == this.bindingGroup) {
if (other.bindingGroup == null) other.bindingGroup = new BindingGroup(other);
if (other.bindingGroup == this.bindingGroup) {
- if (getBindingMatrix(other).equals(bindingMatrix)) return;
+ if (getBindingMatrix(other).equals(bindingMatrix))
+ return;
throw new Error("rebind attempt: "+this+" and "+other+" with "
+ bindingMatrix
+ "; expected "
throw new Error("rebind attempt: "+this+" and "+other+" with "
+ bindingMatrix
+ "; expected "
@@
-24,7
+25,7
@@
public abstract class HasBindingGroup {
}
bindingMatrix =
}
bindingMatrix =
- getBindingMatrix()
+ getBindingMatrix().inverse()
.times(bindingMatrix)
.times(other.getBindingMatrix());
other.bindingGroup.merge(bindingGroup, bindingMatrix);
.times(bindingMatrix)
.times(other.getBindingMatrix());
other.bindingGroup.merge(bindingGroup, bindingMatrix);