import java.util.*;
import edu.berkeley.qfat.geom.*;
import edu.berkeley.qfat.geom.Point;
+import edu.berkeley.qfat.geom.Polygon;
// TO DO:
// - real anneal
*/
+/*
+
+
+ */
+
// FIXME: re-orient goal (how?)
/** magnification factor */
private static final float MAG = 1;
+ public static final float MATCHING_EPSILON = 0.001f;
+
+ private static boolean small(float f) { return Math.abs(f) < 0.001; }
+ public void generateTile(Matrix[] matrices, Mesh mesh) {
+ mesh.coalesce = true;
+ HashSet<HalfSpace> halfSpaces = new HashSet<HalfSpace>();
+ HashSet<Polygon> polygons = new HashSet<Polygon>();
+ for(Matrix m : matrices) {
+ Vec v = m.getTranslationalComponent();
+ if (v.mag() < 0.0001) continue;
+ v = v.times(0.5f);
+ Point p = Point.ORIGIN.plus(v);
+ Vec v0 = v;
+ /*
+ if (small(v.x) && small(v.y)) v = new Vec(0,0,1);
+ else if (small(v.y) && small(v.z)) v = new Vec(1,0,0);
+ else if (small(v.z) && small(v.x)) v = new Vec(0,1,0);
+ else if (small(v.x)) v = new Vec(0,v.y,0).minus(new Vec(0,0,v.z)).cross(new Vec(1,0,0));
+ else if (small(v.y)) v = new Vec(0,0,v.z).minus(new Vec(v.x,0,0)).cross(new Vec(0,1,0));
+ else if (small(v.z)) v = new Vec(v.x,0,0).minus(new Vec(0,v.y,0)).cross(new Vec(0,0,1));
+ else {
+ Point v1 = new Point(v.x, 0, 0);
+ Point v2 = new Point(0, v.y, 0);
+ Point v3 = new Point(0, 0, v.z);
+ v = v3.minus(v2).cross(v1.minus(v2));
+ }
+ */
+ if (v.dot(Point.ORIGIN.minus(p)) < 0) v = v.times(-1);
+
+ System.out.println(v);
+ HalfSpace hs = new HalfSpace(p, v.norm());
+ halfSpaces.add(hs);
+ polygons.add(new Polygon(hs));
+ }
+ for(Polygon p : polygons) {
+ System.out.println(p.plane.norm + " " + p.plane.dvalue);
+ for(HalfSpace hs : halfSpaces) {
+ if (p.plane==hs) continue;
+ p = p.intersect(hs);
+ }
+ p.tesselate(mesh);
+ }
+ }
+
+ private void quad(Mesh mesh, Matrix m, Point p1_, Point p2_, Point p3_, Point p4_) {
+ Point p1 = m.times(p1_);
+ Point p2 = m.times(p2_);
+ Point p3 = m.times(p3_);
+ Point p4 = m.times(p4_);
+ Point c = new Point((p1.x+p2.x+p3.x+p4.x)/4,
+ (p1.y+p2.y+p3.y+p4.y)/4,
+ (p1.z+p2.z+p3.z+p4.z)/4);
+ mesh.newT(p1, p2, c, null, 0);
+ mesh.newT(p2, p3, c, null, 0);
+ mesh.newT(p3, p4, c, null, 0);
+ mesh.newT(p4, p1, c, null, 0);
+ }
public Main(StlFile stlf, Frame f) {
super(f);
}
// rotate to align major axis -- this probably needs to be done by a human.
- goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2)));
+ //goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2)));
+
float goal_width = goal.diagonal().dot(new Vec(1, 0, 0));
float goal_height = goal.diagonal().dot(new Vec(0, 1, 0));
float height = (float)0.08;
float depth = (float)0.3;
*/
- float width = (float)0.7;
+
+ float width = (float)0.8;
float depth = (float)0.08;
float height = (float)0.4;
float rshift = width/2;
float lshift = -(width/2);
-
- //float halfup = height/2;
float halfup = 0;
-
+ //float shift = height/2;
+ //width = (width*2)/3;
+ float shift = 0;
translations = new Matrix[] {
- Matrix.translate(new Vec(lshift, depth, halfup)),
- Matrix.translate(new Vec(rshift, depth, halfup)),
- Matrix.translate(new Vec(lshift, -depth, halfup)),
- Matrix.translate(new Vec(rshift, -depth, halfup)),
+ Matrix.translate(new Vec(lshift/2, depth, -shift)),
+ Matrix.translate(new Vec(rshift/2, depth, -shift)),
+ Matrix.translate(new Vec(lshift/2, -depth, -shift)),
+ Matrix.translate(new Vec(rshift/2, -depth, -shift)),
+ Matrix.translate(new Vec(lshift, depth/2, -shift)),
+ Matrix.translate(new Vec(rshift, depth/2, -shift)),
+ Matrix.translate(new Vec(lshift, -depth/2, -shift)),
+ Matrix.translate(new Vec(rshift, -depth/2, -shift)),
+
+
+ /*
+ Matrix.translate(new Vec(lshift, depth, -shift)),
+ Matrix.translate(new Vec(rshift, depth, -shift)),
+ Matrix.translate(new Vec(lshift, -depth, -shift)),
+ Matrix.translate(new Vec(rshift, -depth, -shift)),
+ */
/*
- Matrix.translate(new Vec(0, depth, halfup)),
- Matrix.translate(new Vec(0, -depth, halfup)),
+ Matrix.translate(new Vec(lshift, depth, shift)),
+ Matrix.translate(new Vec(rshift, depth, shift)),
+ Matrix.translate(new Vec(lshift, -depth, shift)),
+ Matrix.translate(new Vec(rshift, -depth, shift)),
*/
+ //Matrix.translate(new Vec(0, depth, 0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+ //Matrix.translate(new Vec(0, -depth, 0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+ //Matrix.translate(new Vec(0, 0, height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+ //Matrix.translate(new Vec(0, 0, -height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+
+ //Matrix.translate(new Vec(0, depth, 0)),
+ //Matrix.translate(new Vec(0, -depth, 0)),
+ Matrix.translate(new Vec(0, 0, height)),
+ Matrix.translate(new Vec(0, 0, -height)),
+
+ //Matrix.translate(new Vec(lshift, depth, height/2)),
+ //Matrix.translate(new Vec(lshift, depth, -height/2)),
+ //Matrix.translate(new Vec(rshift, -depth, height/2)),
+ //Matrix.translate(new Vec(rshift, -depth, -height/2)),
+ //Matrix.translate(new Vec(rshift, 0, height)),
+ //Matrix.translate(new Vec(rshift, 0, -height)),
- Matrix.translate(new Vec(lshift, 0, height)),
- Matrix.translate(new Vec(rshift, 0, height)),
- Matrix.translate(new Vec(lshift, 0, -height)),
- Matrix.translate(new Vec(rshift, 0, -height)),
+ Matrix.translate(new Vec( width, 0, 0)),
+ Matrix.translate(new Vec(-width, 0, 0)),
+
+ Matrix.ONE
+ };
+
+ float unit = 0.1f;
+ float r = unit/2;
+ float sin = (float)(unit * Math.sin(Math.PI/3));
+ float cos = (float)(unit * Math.cos(Math.PI/3));
+ float x = (float)(r*Math.tan(Math.PI/6));
+ float z = (float)(r/Math.cos(Math.PI/6));
+ height = 2*r*(float)Math.sqrt(2f/3f);
+
+
+ r *= 0.3f;
+ cos *= 0.3f;
+ unit *= 0.3f;
+
+
+ /*
+ sin *= 0.3f;
+ x *= 0.3f;
+ z *= 0.3f;
+ */
+ translations = new Matrix[] {
+ Matrix.translate(new Vec(-unit, 0, 0)),
+ Matrix.translate(new Vec( unit, 0, 0)),
+ Matrix.translate(new Vec(-cos, 0, sin)),
+ Matrix.translate(new Vec( cos, 0, sin)),
+ Matrix.translate(new Vec(-cos, 0, -sin)),
+ Matrix.translate(new Vec( cos, 0, -sin)),
+ Matrix.translate(new Vec( 0, height, z)),
+ Matrix.translate(new Vec(-r, height, -x)),
+ Matrix.translate(new Vec( r, height, -x)),
+ Matrix.translate(new Vec( 0, -height, -z)),
+ Matrix.translate(new Vec(-r, -height, x)),
+ Matrix.translate(new Vec( r, -height, x)),
+ };
+ /*
+ translations = new Matrix[] {
+
+ //Matrix.translate(new Vec(lshift, depth, halfup)),
+ //Matrix.translate(new Vec(rshift, depth, halfup)),
+ //Matrix.translate(new Vec(lshift, -depth, halfup)),
+ //Matrix.translate(new Vec(rshift, -depth, halfup)),
+
+
+ //Matrix.translate(new Vec(0, depth, 0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+ //Matrix.translate(new Vec(0, -depth, 0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+
+ Matrix.translate(new Vec(0, 0, height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+ Matrix.translate(new Vec(0, 0, -height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+
+ //Matrix.translate(new Vec(0, depth, 0)),
+ //Matrix.translate(new Vec(0, -depth, 0)),
+ //Matrix.translate(new Vec(0, 0, height)),
+ //Matrix.translate(new Vec(0, 0, -height)),
+
+ //Matrix.translate(new Vec(lshift, depth, height/2)),
+ //Matrix.translate(new Vec(lshift, depth, -height/2)),
+ //Matrix.translate(new Vec(rshift, -depth, height/2)),
+ //Matrix.translate(new Vec(rshift, -depth, -height/2)),
+ //Matrix.translate(new Vec(rshift, 0, height)),
+ //Matrix.translate(new Vec(rshift, 0, -height)),
+
Matrix.translate(new Vec( width, 0, 0)),
Matrix.translate(new Vec(-width, 0, 0)),
};
-
+ */
//
+ //generateTile(translations, tile);
Point ltf = new Point(lshift, (depth/2), (height/2));
Point mtf = new Point( 0.0, (depth/2), (height/2));
mbn,
rbn
};
-
+ /*
// top
tile.newT(ltf, mtf, mtc, null, 1);
tile.newT(mbf, ltf, lbf, null, 6);
tile.newT(rtf, mtf, rbf, null, 6);
tile.newT(rbf, mtf, mbf, null, 6);
+*/
+ /*
+ HashSet<Mesh.E> es = new HashSet<Mesh.E>();
+ for(Mesh.T t : tile) {
+ es.add(t.e1());
+ es.add(t.e2());
+ es.add(t.e3());
+ }
+ for(Mesh.E e : es) {
+ if (e.p1.p.x == e.p2.p.x && e.p1.p.y == e.p2.p.y) continue;
+ if (e.p1.p.z == e.p2.p.z && e.p1.p.y == e.p2.p.y) continue;
+ if (e.p1.p.x == e.p2.p.x && e.p1.p.z == e.p2.p.z) continue;
+ e.shatter();
+ }
+ */
+
+
+ height = 4;
+ width = 4;
+ depth = 1;
+
+ Matrix mm = Matrix.scale(0.1f);
+ // top
+ quad(tile, mm,
+ new Point( 2, 2, 0),
+ new Point( 1, 1, -1),
+ new Point(-1, 1, -1),
+ new Point(-2, 2, 0));
+ quad(tile, mm,
+ new Point(-2, 2, 0),
+ new Point(-1, 1, 1),
+ new Point( 1, 1, 1),
+ new Point( 2, 2, 0));
+ quad(tile, mm,
+ new Point( 1, 1, -1),
+ new Point( 1, 1, 1),
+ new Point(-1, 1, 1),
+ new Point(-1, 1, -1));
+
+ // bottom
+ quad(tile, mm,
+ new Point(-2, -2, 0),
+ new Point(-1, -1, -1),
+ new Point( 1, -1, -1),
+ new Point( 2, -2, 0));
+ quad(tile, mm,
+ new Point( 2, -2, 0),
+ new Point( 1, -1, 1),
+ new Point(-1, -1, 1),
+ new Point(-2, -2, 0));
+ quad(tile, mm,
+ new Point(-1, -1, -1),
+ new Point(-1, -1, 1),
+ new Point( 1, -1, 1),
+ new Point( 1, -1, -1));
+
+ // left
+ quad(tile, mm,
+ new Point( 2, -2, 0),
+ new Point( 1, -1, -1),
+ new Point( 1, 1, -1),
+ new Point( 2, 2, 0));
+ quad(tile, mm,
+ new Point( 2, 2, 0),
+ new Point( 1, 1, 1),
+ new Point( 1, -1, 1),
+ new Point( 2, -2, 0));
+ quad(tile, mm,
+ new Point( 1, -1, -1),
+ new Point( 1, -1, 1),
+ new Point( 1, 1, 1),
+ new Point( 1, 1, -1));
+
+ // bottom
+ quad(tile, mm,
+ new Point(-2, 2, 0),
+ new Point(-1, 1, -1),
+ new Point(-1, -1, -1),
+ new Point(-2, -2, 0));
+ quad(tile, mm,
+ new Point(-2, -2, 0),
+ new Point(-1, -1, 1),
+ new Point(-1, 1, 1),
+ new Point(-2, 2, 0));
+ quad(tile, mm,
+ new Point(-1, 1, -1),
+ new Point(-1, 1, 1),
+ new Point(-1, -1, 1),
+ new Point(-1, -1, -1));
+
+
+
+ translations = new Matrix[] {
+ /*
+ Matrix.translate(new Vec(0, 0.2f,0))
+ .times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))),
+
+ Matrix.translate(new Vec(0,-0.2f,0))
+ .times(Matrix.rotate(new Vec(0,1,0), (float)(-1*Math.PI/2))),
+
+ Matrix.translate(new Vec( 0.2f,0,0))
+ .times(Matrix.rotate(new Vec(1,0,0), (float)( 1*Math.PI/2))),
- for(Matrix m : translations) {
+ Matrix.translate(new Vec(-0.2f,0,0))
+ .times(Matrix.rotate(new Vec(1,0,0), (float)(-1*Math.PI/2))),
+ */
+
+ /*
+ Matrix.rotate(new Vec(0,0,1), (float)(1*Math.PI/2)),
+ Matrix.rotate(new Vec(0,0,1), (float)(2*Math.PI/2)),
+ Matrix.rotate(new Vec(0,0,1), (float)(3*Math.PI/2)),
+ */
+ Matrix.rotate(new Vec(1,0,0), (float)(2*Math.PI/2)),
+
+ //Matrix.rotate(new Vec(0,0,1), (float)(2*Math.PI/2)),
+ //Matrix.scale(1,-1,1),
+
+ //Matrix.translate(new Vec( 0.2f, 0,0))
+ //.times(Matrix.rotate(new Vec(0,0,1), (float)( 1*Math.PI/2)))
+ //.times(Matrix.rotate(new Vec(0,1,0), (float)( 3*Math.PI/2))),
+
+ //Matrix.translate(new Vec(-0.2f, 0,0))
+ //.times(Matrix.rotate(new Vec(0,0,1), (float)( 3*Math.PI/2)))
+ //.times(Matrix.rotate(new Vec(0,1,0), (float)( 3*Math.PI/2))),
+
+ //Matrix.rotate(new Vec(0,0,1), (float)( 0*Math.PI/2))
+ //.times(Matrix.translate(new Vec(0, -0.2f, 0)))
+ //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))),
+ //Matrix.rotate(new Vec(0,0,1), (float)( 1*Math.PI/2))
+ //.times(Matrix.translate(new Vec(0, -0.2f, 0)))
+ //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))),
+
+ //Matrix.rotate(new Vec(0,0,1), (float)( 0*Math.PI/2))
+ //.times(Matrix.translate(new Vec(0, -0.2f, 0)))
+ //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))),
+ //Matrix.rotate(new Vec(0,0,1), (float)( 0*Math.PI/2))
+ //.times(Matrix.translate(new Vec(0, -0.2f, 0)))
+ //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))),
+
+ Matrix.ONE,
+ };
+
+
+
+ for(Matrix m1 : translations) {
+ for(Matrix m2 : translations) {
for(Mesh.T t1 : tile) {
for(Mesh.T t2 : tile) {
if (t1==t2) continue;
- if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
- (t1.v2().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
- (t1.v3().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e1().bindEdge(t2.e3());
- t1.e2().bindEdge(t2.e2());
- t1.e3().bindEdge(t2.e1());
+ Matrix m = m1.inverse().times(m2);
+ if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+ (t1.v2().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) &&
+ (t1.v3().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) {
+ t2.e3().bindEdge(t1.e1(), m);
+ t2.e2().bindEdge(t1.e2(), m);
+ t2.e1().bindEdge(t1.e3(), m);
+ }
+ if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+ (t1.v3().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) &&
+ (t1.v1().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) {
+ t2.e3().bindEdge(t1.e2(), m);
+ t2.e2().bindEdge(t1.e3(), m);
+ t2.e1().bindEdge(t1.e1(), m);
+ }
+ if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+ (t1.v1().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) &&
+ (t1.v2().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) {
+ t2.e3().bindEdge(t1.e3(), m);
+ t2.e2().bindEdge(t1.e1(), m);
+ t2.e1().bindEdge(t1.e2(), m);
+ }
+
+ if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+ (t1.v2().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON) &&
+ (t1.v3().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON)) {
+ t2.e1().bindEdge(t1.e1().pair, m);
+ t2.e2().bindEdge(t1.e2().pair, m);
+ t2.e3().bindEdge(t1.e3().pair, m);
}
- if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
- (t1.v3().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
- (t1.v1().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e2().bindEdge(t2.e3());
- t1.e3().bindEdge(t2.e2());
- t1.e1().bindEdge(t2.e1());
+ if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+ (t1.v3().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON) &&
+ (t1.v1().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON)) {
+ t2.e2().bindEdge(t1.e1().pair, m);
+ t2.e3().bindEdge(t1.e2().pair, m);
+ t2.e1().bindEdge(t1.e3().pair, m);
}
- if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
- (t1.v1().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
- (t1.v2().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
- t1.e3().bindEdge(t2.e3());
- t1.e1().bindEdge(t2.e2());
- t1.e2().bindEdge(t2.e1());
+ if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+ (t1.v1().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON) &&
+ (t1.v2().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON)) {
+ t2.e3().bindEdge(t1.e1().pair, m);
+ t2.e1().bindEdge(t1.e2().pair, m);
+ t2.e2().bindEdge(t1.e3().pair, m);
}
}
}
}
+ }
//xMesh.Vertex mid = lbf.getE(mbn).shatter();
// rescale to match volume
+
+
float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
- goal.transform(Matrix.scale(factor));
+ goal.transform(Matrix.scale(factor/2.4f));
+ goal.transform(Matrix.rotate(new Vec(0, 1, 0), (float)(Math.PI/2)));
// translate to match centroid
goal.transform(Matrix.translate(tile.centroid().minus(goal.centroid())));
Thread.yield();
repaint();
}
- for(int i=0; i<Math.min(oldverts,200); i++) {
+ for(int i=0; i<Math.min(oldverts,50); i++) {
Mesh.E e = es.poll();
verts++;
//System.out.println("shatter " + e);
+ //e.shatter(e.midpoint(), null, null, true, true);
e.shatter();
Thread.yield();
repaint();
tile.rebindPoints();
}
- public synchronized void rand(float temp, Mesh.Vertex p) {
+ public synchronized void rand(double temp, Mesh.Vertex p) {
p.reComputeErrorAround();
double tile_error = tile.error();
double goal_error = goal.error();
- float max = p.averageEdgeLength()/10;
+ //float max = p.averageEdgeLength()/10;
+ float max = 0.01f;
+
Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
v = v.norm().times((random.nextFloat() - 0.5f) * max);
//System.out.println(max + " " + p.averageEdgeLength() + " " + v.mag());
Matrix m = Matrix.translate(v);
+ //System.out.println(v.mag() + " " + max);
boolean good = p.move(m, false);
- if (!good) { /*misses++;*/ return; }
+ //if (!good) { /*misses++;*/ return; }
double new_tile_error = tile.error();
double new_goal_error = goal.error();
double tile_delta = (new_tile_error - tile_error) / tile_error;
double goal_delta = (new_goal_error - goal_error) / goal_error;
double delta = tile_delta + goal_delta;
- double swapProbability = Math.exp((-1 * delta) / (((double)temp)/1000000));
+ double swapProbability = Math.exp((-1 * delta) / temp);
+ //System.out.println(swapProbability);
boolean doSwap = good && (Math.random() < swapProbability);
//boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
//boolean doSwap = good && (tile_delta + goal_delta <= 0);
+
+ //if (temp < 0.000001) doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
+
if (doSwap) {
tile_error = new_tile_error;
goal_error = new_goal_error;
float hits = 0;
float misses = 0;
public void anneal() throws Exception {
- float hightemp = 1;
- float temp = hightemp;
- float last = 10;
+ double hightemp = 1;
+ double temp = hightemp;
+ double last = 10;
boolean seek_upward = false;
double acceptance = 1;
while(true) {
double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses));
hits = 0;
misses = 0;
- float gamma = 1;
+ double gamma = 1;
acceptance = (ratio+acceptance)/2;
accepts = (int)(Math.ceil(ratio*100));
temps = (int)(Math.ceil(temp*1000));
breakit();
}
seek_upward = true;
- } else if (acceptance > 0.96) gamma = 0.4f;
- else if (acceptance > 0.9) gamma = 0.5f;
- else if (acceptance > 0.8) gamma = 0.65f;
- else if (acceptance > 0.6) gamma = 0.7f;
- else if (acceptance > 0.3) gamma = 0.8f;
+ } else if (acceptance > 0.96) gamma = 0.1f;
+ else if (acceptance > 0.9) gamma = 0.2f;
+ else if (acceptance > 0.8) gamma = 0.3f;
+ else if (acceptance > 0.6) gamma = 0.4f;
+ else if (acceptance > 0.3) gamma = 0.6f;
else if (acceptance > 0.15) gamma = 0.9f;
- else if (acceptance > 0.05) gamma = 0.95f;
+ else if (acceptance > 0.05) gamma = 0.94f;
else if (acceptance > 0.01) gamma = 0.98f;
else { /*breaks++;*/ }
+ /*
if (seek_upward) {
if (acceptance > 0.2) seek_upward = false;
else gamma = 2-gamma;
}
+ */
- temp = temp * gamma;
+ if (anneal)
+ temp = temp * gamma;
HashSet<Mesh.Vertex> hs = new HashSet<Mesh.Vertex>();
int count = 0;
long then = System.currentTimeMillis();
- for(int i=0; i<40; i++) {
+ for(int i=0; i<400; i++) {
if (anneal) {
count++;
Mesh.Vertex v = pts[Math.abs(random.nextInt()) % pts.length];
Thread.yield();
repaint();
}
+
+ /*
PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
for(Mesh.T t : tile) {
float max = 5;
if (t.aspect() < 0.1 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
}
}
-
for(int i=0; i<5; i++) {
Mesh.E e = es.poll();
if (e==null) break;
e.shatter();
}
+
+
tile.rebindPoints();
+ */
+
System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +
"points_per_second=" +
(count*1000)/((double)(System.currentTimeMillis()-then)));
-
for(Mesh.Vertex p : goal.vertices()) p.recomputeFundamentalQuadricIfNeighborChanged();
synchronized(safeTriangles) {
safeTriangles.clear();
for(Mesh.T t : tile)
- if (t.shouldBeDrawn())
+ //if (t.shouldBeDrawn())
safeTriangles.add(t);
}
}
public static void main(String[] s) throws Exception {
StlFile stlf = new StlFile();
- stlf.load("fish.stl");
+ stlf.load("torus.stl");
+ //stlf.load("fish.stl");
//stlf.load("monkey.stl");
Frame f = new Frame();
Main main = new Main(stlf, f);
projects / anneal.git / blobdiff