chiark
/
gitweb
/
~ian
/
moebius2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adjusted costs for 64
[moebius2.git]
/
energy.c
diff --git
a/energy.c
b/energy.c
index 368abc4b29f78621cd707056a0ac99aec01fc726..164dcdf04b74487f804bafcde44e58c8db63e4fd 100644
(file)
--- a/
energy.c
+++ b/
energy.c
@@
-48,13
+48,13
@@
static const CostContribution costs[]= {
#if XBITS==4
#define STOP_EPSILON 1e-6
COST( 3e5, line_bending_cost)
#if XBITS==4
#define STOP_EPSILON 1e-6
COST( 3e5, line_bending_cost)
- COST( 10e
2
, edge_length_variation_cost)
- COST( 9.0e
1
, rim_proximity_cost) // 5e1 is too much
+ COST( 10e
3
, edge_length_variation_cost)
+ COST( 9.0e
3
, rim_proximity_cost) // 5e1 is too much
// 2.5e1 is too little
// 0.2e1 grows compared to previous ?
// 0.6e0 shrinks compared to previous ?
// 2.5e1 is too little
// 0.2e1 grows compared to previous ?
// 0.6e0 shrinks compared to previous ?
- COST( 1e12, edge_angle_cost)
+
//
COST( 1e12, edge_angle_cost)
#define EDGE_ANGLE_COST_CIRCCIRCRAT (0.5/1.3)
COST( 1e18, noncircular_rim_cost)
#endif
#define EDGE_ANGLE_COST_CIRCCIRCRAT (0.5/1.3)
COST( 1e18, noncircular_rim_cost)
#endif