From: adam Date: Wed, 5 Dec 2007 03:15:42 +0000 (-0800) Subject: checkpoint X-Git-Url: http://git.megacz.com/?p=anneal.git;a=commitdiff_plain;h=6b3895c2802157bfaab8d629c9870790d763001f checkpoint darcs-hash:20071205031542-5007d-f523ecc6e5734c735d9159327a738d86b54c706d.gz --- diff --git a/src/Geom.java b/src/Geom.java index 799f926..6bfe4f1 100644 --- a/src/Geom.java +++ b/src/Geom.java @@ -268,7 +268,7 @@ public class Geom implements Iterable { } rescore(); boolean good = true; - + /* for(T t : ts) { for(E e = this.e; ;) { if (e.intersects(t)) { good = false; break; } @@ -276,6 +276,7 @@ public class Geom implements Iterable { if (e == this.e) break; } } + */ /* if (t==this.t) continue; if (this.intersects(t)) good = false; diff --git a/src/Main.java b/src/Main.java index 8e3e65a..c789e0f 100644 --- a/src/Main.java +++ b/src/Main.java @@ -236,12 +236,12 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener Random random = new Random(); public synchronized void breakit() { - if (verts > 40) return; + if (verts > 20) return; //double min = (tile.avgedge/tile.numedges)*(1+(4/(double)verts)); //if (verts>0 && tile.es.peek().length() < min) return; PriorityQueue es = new PriorityQueue(); for(Geom.E e : tile.es) es.add(e); - for(int i=0; i<1; i++) { + for(int i=0; i<10; i++) { Geom.E e = es.poll(); verts++; System.out.println("shatter " + e);