chiark
/
gitweb
/
~ian
/
moebius2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a87b04c
)
scale 125 seems to work ish although could be more bowl-like
author
Ian Jackson
<ian@turbine>
Mon, 20 Oct 2008 23:57:23 +0000
(
00:57
+0100)
committer
Ian Jackson
<ian@turbine>
Mon, 20 Oct 2008 23:57:23 +0000
(
00:57
+0100)
energy.c
patch
|
blob
|
history
diff --git
a/energy.c
b/energy.c
index 448fefaa56d3536ef2dfacd2aea6f043cbdb5395..2f8a854cde076656b02c3c0799cc2fbdd5634cf1 100644
(file)
--- a/
energy.c
+++ b/
energy.c
@@
-53,7
+53,7
@@
static const CostContribution costs[]= {
#define STOP_EPSILON 5e-3
COST( 3e4, vertex_displacement_cost) // NB this is probably wrong now
COST( 3e4, vertex_edgewise_displ_cost) // we have changed the power
#define STOP_EPSILON 5e-3
COST( 3e4, vertex_displacement_cost) // NB this is probably wrong now
COST( 3e4, vertex_edgewise_displ_cost) // we have changed the power
- COST(
0.2e3
, rim_proximity_cost)
+ COST(
2e2
, rim_proximity_cost)
COST( 1e4, rim_twist_cost)
COST( 1e12, noncircular_rim_cost)
COST( 10e1, nonequilateral_triangles_cost)
COST( 1e4, rim_twist_cost)
COST( 1e12, noncircular_rim_cost)
COST( 10e1, nonequilateral_triangles_cost)
@@
-63,7
+63,7
@@
static const CostContribution costs[]= {
#endif
#if XBITS==5
#endif
#if XBITS==5
-#define STOP_EPSILON
1e-5
+#define STOP_EPSILON
7e-4
COST( 3e4, vertex_displacement_cost)
COST( 3e4, vertex_edgewise_displ_cost)
COST( 2e-1, rim_proximity_cost)
COST( 3e4, vertex_displacement_cost)
COST( 3e4, vertex_edgewise_displ_cost)
COST( 2e-1, rim_proximity_cost)
@@
-77,10
+77,10
@@
static const CostContribution costs[]= {
#if XBITS==6
#define STOP_EPSILON 1.2e-4
#if XBITS==6
#define STOP_EPSILON 1.2e-4
- COST( 3e
3
, vertex_displacement_cost)
- COST( 3e
3
, vertex_edgewise_displ_cost)
- COST(
0.02e0
, rim_proximity_cost)
- COST( 1e
4
, rim_twist_cost)
+ COST( 3e
4
, vertex_displacement_cost)
+ COST( 3e
4
, vertex_edgewise_displ_cost)
+ COST(
2e-1
, rim_proximity_cost)
+ COST( 1e
3
, rim_twist_cost)
COST( 1e12, noncircular_rim_cost)
COST( 10e1, nonequilateral_triangles_cost)
// COST( 1e1, small_triangles_cost)
COST( 1e12, noncircular_rim_cost)
COST( 10e1, nonequilateral_triangles_cost)
// COST( 1e1, small_triangles_cost)