Commit 20dc79a7 authored by Rafael Laboissière's avatar Rafael Laboissière
Browse files

New upstream version 6.0.56

parent e5c9446e

FFNet/FFNet_Matrix.h

+6 −6
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ 


/* The Matrix organization is as follows:									*/

/*																			*/

/* nx = numberOfUnitsInLayer[layer]												*/

/* ny = numberOfUnitsInLayer[layer-1]+1											*/

/* xmin = 1 xmax = nx														*/

/* ymin = 1 ymax = ny														*/

/* dx = dy = 1																*/

/* x1 = y1 = 1																*/

/* nx == numberOfUnitsInLayer[layer]										*/

/* ny == numberOfUnitsInLayer[layer-1]+1									*/

/* xmin == 1, xmax == nx													*/

/* ymin == 1, ymax == ny													*/

/* dx == dy == 1															*/

/* x1 == y1 == 1															*/

/*																			*/



autoMatrix FFNet_weightsToMatrix (FFNet me, integer layer, bool deltaWeights);

FFNet/FFNet_PatternList_ActivationList.cpp

+4 −4
Original line number Diff line number Diff line 
/* FFNet_PatternList_ActivationList.cpp

 *

 * Copyright (C) 1994-2018 David Weenink, 2015,2017 Paul Boersma

 * Copyright (C) 1994-2019 David Weenink, 2015,2017 Paul Boersma

 *

 * This code is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ 
#include "Graphics.h"

#include "FFNet_PatternList_ActivationList.h"



static double func (Daata object, VEC p) {

static double func (Daata object, VEC const& p) {

	FFNet me = (FFNet) object;

	Minimizer thee = my minimizer.get();

	longdouble fp = 0.0;
@@ -45,11 +45,11 @@ static double func (Daata object, VEC p) { 
		for (integer k = 1; k <= my numberOfWeights; k ++)

			my dw [k] += my dwi [k];

	}

	thy funcCalls ++;

	thy numberOfFunctionCalls ++;

	return (double) fp;

}



static void dfunc_optimized (Daata object, VEC /* p */, VEC dp) {

static void dfunc_optimized (Daata object, VEC const& /* p */, VEC const& dp) {

	FFNet me = (FFNet) object;



	integer j = 1;

LPC/Cepstrum.h

+6 −6
Original line number Diff line number Diff line
@@ -63,12 +63,12 @@ autoPowerCepstrum PowerCepstrum_create (double qmax, integer nq); 
/* Preconditions:

		nq >= 2;

	Postconditions:

		my xmin = 0;				my ymin = 1;

		my xmax = qmax;				my ymax = 1;

		my nx = nq;					my ny = 1;

		my dx = qmax / (nq -1);			my dy = 1;

		my x1 = 0;			my y1 = 1;

		my z [1..ny] [1..nx] = 0.0;

		my xmin == 0;				my ymin == 1;

		my xmax == qmax;				my ymax == 1;

		my nx == nq;					my ny == 1;

		my dx == qmax / (nq -1);			my dy == 1;

		my x1 == 0.0;			my y1 == 1.0;

		my z [1..ny] [1..nx] == 0.0;

*/



void PowerCepstrum_draw (PowerCepstrum me, Graphics g, double qmin, double qmax, double dBminimum, double dBmaximum, int garnish);

dwsys/NUM2.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1536,14 +1536,14 @@ double NUMcubicSplineInterpolation (constVEC x, constVEC y, constVEC y2, double 
	integer klo = 1, khi = x.size;

	while (khi - klo > 1) {

		integer k = (khi + klo) >> 1;

		if (x [k] > xin) {

		if (x [k] > xin)

			khi = k;

		} else {

		else

			klo = k;

	}

	}

	double h = x [khi] - x [klo];

	Melder_require (h != 0.0, U"NUMcubicSplineInterpolation: bad input value.");

	Melder_require (h != 0.0,

		U"NUMcubicSplineInterpolation: bad input value.");

	

	double a = (x [khi] - xin) / h;

	double b = (xin - x [klo]) / h;

dwsys/NUM2.h

+4 −4
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ inline double NUMmean_weighted (constVEC x, constVEC w) { 
	return inproduct / wsum;

}



inline void VECchainRows_preallocated (VEC v, MAT m) {

inline void VECchainRows_preallocated (VECVU const& v, constMATVU const& m) {

	Melder_assert (m.nrow * m.ncol == v.size);

	integer k = 1;

	for (integer irow = 1; irow <= m.nrow; irow ++)
@@ -1204,13 +1204,13 @@ inline void VECchainRows_preallocated (VEC v, MAT m) { 
			v [k ++] = m [irow] [icol];

}



inline autoVEC VECchainRows (MAT m) {

inline autoVEC VECchainRows (constMATVU const& m) {

	autoVEC result = newVECraw (m.nrow * m.ncol);

	VECchainRows_preallocated (result.get(), m);

	return result;

}



inline void VECchainColumns_preallocated (VEC v, MAT m) {

inline void VECchainColumns_preallocated (VEC const& v, constMATVU const& m) {

	Melder_assert (m.nrow * m.ncol == v.size);

	integer k = 1;

	for (integer icol = 1; icol <= m.ncol; icol ++)
@@ -1218,7 +1218,7 @@ inline void VECchainColumns_preallocated (VEC v, MAT m) { 
			v [k ++] = m [irow] [icol];

}



inline autoVEC VECchainColumns (MAT m) {

inline autoVEC VECchainColumns (constMATVU const& m) {

	autoVEC result = newVECraw (m.nrow * m.ncol);

	VECchainColumns_preallocated (result.get(), m);

	return result;