--- parser3/src/classes/math.C 2001/10/19 12:43:29 1.7 +++ parser3/src/classes/math.C 2002/02/08 07:27:40 1.12 @@ -1,13 +1,12 @@ /** @file Parser: @b math parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: math.C,v 1.7 2001/10/19 12:43:29 parser Exp $ + $Id: math.C,v 1.12 2002/02/08 07:27:40 paf Exp $ */ -#include "pa_config_includes.h" #include "pa_common.h" #include "pa_vint.h" #include "pa_vmath.h" @@ -46,16 +45,13 @@ static void _random(Request& r, const St "bad range [0..%u]", max); Value& result=*new(pool) VInt(pool, (int)( - ((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * (max + 1))); + ((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * max )); result.set_name(method_name); r.write_no_lang(result); } typedef double (*math1_func_ptr)(double); -static double round(double param) { return floor(param+0.5); } -static double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); } -static double trunc(double param) { return param > 0? floor(param) : ceil(param); } static double frac(double param) { return param-trunc(param); } static double degrees(double param) { return param /PI *180; } static double radians(double param) { return param /180 *PI; }