# HG changeset patch # User michael # Date 1159094485 0 # Node ID 882cf925ff7aaa1b9b39d55a2d086b3110cf0523 # Parent 6f219b6839ba6eb96c277cedfbcef3bc0b32c618 cosmetic diff -r 6f219b6839ba -r 882cf925ff7a eval.c --- a/eval.c Sun Sep 24 10:38:14 2006 +0000 +++ b/eval.c Sun Sep 24 10:41:25 2006 +0000 @@ -113,12 +113,12 @@ else if( strmatch(next, "squish") ) d= 1/(1+exp(4*d)); else if( strmatch(next, "gauss" ) ) d= exp(-d*d/2)/sqrt(2*M_PI); else if( strmatch(next, "abs" ) ) d= fabs(d); - else if( strmatch(next, "max" ) ) d= d > d2 ? d : d2; - else if( strmatch(next, "min" ) ) d= d < d2 ? d : d2; - else if( strmatch(next, "gt" ) ) d= d > d2 ? 1.0 : 0.0; - else if( strmatch(next, "gte" ) ) d= d >= d2 ? 1.0 : 0.0; - else if( strmatch(next, "lt" ) ) d= d > d2 ? 0.0 : 1.0; - else if( strmatch(next, "lte" ) ) d= d >= d2 ? 0.0 : 1.0; + else if( strmatch(next, "max" ) ) d= d > d2 ? d : d2; + else if( strmatch(next, "min" ) ) d= d < d2 ? d : d2; + else if( strmatch(next, "gt" ) ) d= d > d2 ? 1.0 : 0.0; + else if( strmatch(next, "gte" ) ) d= d >= d2 ? 1.0 : 0.0; + else if( strmatch(next, "lt" ) ) d= d > d2 ? 0.0 : 1.0; + else if( strmatch(next, "lte" ) ) d= d >= d2 ? 0.0 : 1.0; else if( strmatch(next, "eq" ) ) d= d == d2 ? 1.0 : 0.0; else if( strmatch(next, "(" ) ) d= d; // else if( strmatch(next, "l1" ) ) d= 1 + d2*(d - 1);