Mercurial > hg > wm
comparison Meerwald/wm_koch_e.c @ 17:824d192e5614
bug fix; mse minimization still missing
author | pmeerw@pan |
---|---|
date | Thu, 29 Jan 2009 18:28:05 +0100 |
parents | 4987db85cfae |
children | 3bdb67e76858 |
comparison
equal
deleted
inserted
replaced
16:4987db85cfae | 17:824d192e5614 |
---|---|
220 // using mean square error to minimize error | 220 // using mean square error to minimize error |
221 if (get_signature_bit(n)) { | 221 if (get_signature_bit(n)) { |
222 if (diff < quality) { | 222 if (diff < quality) { |
223 // we have to impose the relationship, does not occur naturally | 223 // we have to impose the relationship, does not occur naturally |
224 w1 = (v1 > 0.0) ? (v1 + abs_diff) : (v1 - abs_diff); | 224 w1 = (v1 > 0.0) ? (v1 + abs_diff) : (v1 - abs_diff); |
225 w2 = (v2 > 0.0) ? (v2 - abs_diff) : (v2 + abs_diff); | 225 w2 = v2; |
226 } | 226 } |
227 else { | 227 else { |
228 w1 = v1; | 228 w1 = v1; |
229 w2 = v2; | 229 w2 = v2; |
230 } | 230 } |
231 } | 231 } |
232 else { | 232 else { |
233 if (diff > -quality) { | 233 if (diff > -quality) { |
234 // force the relationship | 234 // force the relationship |
235 w1 = (v1 > 0.0) ? (v1 - abs_diff) : (v1 + abs_diff); | 235 w1 = v1; |
236 w2 = (v2 > 0.0) ? (v2 + abs_diff) : (v2 - abs_diff); | 236 w2 = (v2 > 0.0) ? (v2 + abs_diff) : (v2 - abs_diff); |
237 } | 237 } |
238 else { | 238 else { |
239 w1 = v1; | 239 w1 = v1; |
240 w2 = v2; | 240 w2 = v2; |