You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "moments.h"
}
if (max_moment >= MOMENT_KURTOSIS && kurtosis != NULL && w > 3.)
{
- double g2 = ((w * (w + 1.) * d4
- - 3. * pow2 (d2) * (w - 1.))
- / ((w - 1.) * (w - 2.) * (w - 3.) * pow2 (s2)));
+ double den = (w - 2.) * (w - 3.) * pow2 (s2);
+ double g2 = (w * (w + 1) * d4 / (w - 1.) / den
+ - 3. * pow2 (d2) / den);
if (finite (g2))
*kurtosis = g2;
}
*values = NULL;
*weights = NULL;
*cnt = 0;
- while (token == T_NUM)
+ while (lex_is_number ())
{
double value = tokval;
double weight = 1.;
lex_get ();
if (lex_match ('*'))
{
- if (token != T_NUM)
+ if (!lex_is_number ())
{
lex_error (_("expecting weight value"));
return 0;