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:
e968199
)
checkpoint
author
adam
<adam@megacz.com>
Wed, 5 Dec 2007 08:01:56 +0000
(
00:01
-0800)
committer
adam
<adam@megacz.com>
Wed, 5 Dec 2007 08:01:56 +0000
(
00:01
-0800)
darcs-hash:
20071205080156
-5007d-
4c4d00db025768cc0cc2884af9a13e2ee573c555
.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
dfdc1a0
..
774efa3
100644
(file)
--- a/
src/edu/berkeley/qfat/Mesh.java
+++ b/
src/edu/berkeley/qfat/Mesh.java
@@
-186,10
+186,12
@@
public class Mesh implements Iterable<Mesh.T> {
public void unscore() {
if (nearest_in_other_mesh == null) return;
if (fundamentalQuadric == null) return;
public void unscore() {
if (nearest_in_other_mesh == null) return;
if (fundamentalQuadric == null) return;
+ nearest_in_other_mesh.unsc();
nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.minus(fundamentalQuadric);
nearest_in_other_mesh.quadric_count--;
if (nearest_in_other_mesh.quadric_count==0)
nearest_in_other_mesh.quadric = Matrix.ZERO;
nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.minus(fundamentalQuadric);
nearest_in_other_mesh.quadric_count--;
if (nearest_in_other_mesh.quadric_count==0)
nearest_in_other_mesh.quadric = Matrix.ZERO;
+ nearest_in_other_mesh.resc();
nearest_in_other_mesh = null;
}
nearest_in_other_mesh = null;
}
@@
-210,8
+212,10
@@
public class Mesh implements Iterable<Mesh.T> {
if (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) {
nearest_in_other_mesh = null;
} else {
if (nearest_in_other_mesh.e == null || nearest_in_other_mesh.norm().dot(norm()) < 0) {
nearest_in_other_mesh = null;
} else {
+ nearest_in_other_mesh.unsc();
nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric());
nearest_in_other_mesh.quadric_count++;
nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric());
nearest_in_other_mesh.quadric_count++;
+ nearest_in_other_mesh.resc();
}
}
}
}