Hello community, here is the log from the commit of package octave-forge-stk for openSUSE:Factory checked in at 2015-10-14 16:45:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave-forge-stk (Old) and /work/SRC/openSUSE:Factory/.octave-forge-stk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-stk" Changes: -------- --- /work/SRC/openSUSE:Factory/octave-forge-stk/octave-forge-stk.changes 2015-07-12 22:53:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-stk.new/octave-forge-stk.changes 2015-10-14 16:45:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 13 06:08:14 UTC 2015 - [email protected] + +- Update to version 2.3.3 + * Bug fixes and minor changes + +------------------------------------------------------------------- Old: ---- stk-2.3.2.tar.gz New: ---- stk-2.3.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave-forge-stk.spec ++++++ --- /var/tmp/diff_new_pack.KvH37A/_old 2015-10-14 16:45:27.000000000 +0200 +++ /var/tmp/diff_new_pack.KvH37A/_new 2015-10-14 16:45:27.000000000 +0200 @@ -18,7 +18,7 @@ %define octpkg stk Name: octave-forge-%{octpkg} -Version: 2.3.2 +Version: 2.3.3 Release: 0 Summary: Small Octave Toolbox for Kriging License: GPL-3.0+ ++++++ stk-2.3.2.tar.gz -> stk-2.3.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/ChangeLog new/stk/ChangeLog --- old/stk/ChangeLog 2015-06-30 22:02:49.000000000 +0200 +++ new/stk/ChangeLog 2015-10-11 08:36:17.000000000 +0200 @@ -1,3 +1,47 @@ +2015-10-11 Julien Bect <[email protected]> + + mole/matlab/file_in_path.m: Fix two bugs + + * misc/mole/matlab/file_in_path.m: Fix two bugs. + +2015-10-10 Julien Bect <[email protected]> + + stk_example_doe03.m: Use the appropriate flag for maximization + + * examples/02_design_of_experiments/stk_example_doe03.m: Use the + appropriate flag for maximization. Also, use stk_plot1d for the + upper panel plot to display pointwise credible intervals. + +2015-09-25 Julien Bect <[email protected]> + + Don't use UTF-8 in m-files + + * misc/design/stk_phipcrit.m: Müller -> Muller + * misc/dist/stk_filldist.m: Idem + * misc/dist/stk_filldist_exact.m: Idem + +2015-09-15 Julien Bect <[email protected]> + + README: Fix a typo + + * README: Fix a typo + +2015-07-20 Julien Bect <[email protected]> + + Use size_t for computations on positive indices + + * misc/dist/private/stk_dist_matrixx.c: Use size_t for + computations on positive indices, otherwise we can get very + unpleasant surprises (aka segfaults) as a consequence of negative + indices... + * misc/dist/private/stk_dist_matrixy.c: idem + * misc/dist/private/stk_dist_pairwise.c: idem + * misc/dist/private/stk_filldist_discr_mex.c: idem + * misc/dist/private/stk_gpquadform_matrixx.c: idem + * misc/dist/private/stk_gpquadform_matrixy.c: idem + * misc/dist/private/stk_gpquadform_pairwise.c: idem + * misc/dist/private/stk_mindist_mex.c: idem + 2015-06-30 Julien Bect <[email protected]> build_octpkg.m: Fix the generated DESCRIPTION file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/DESCRIPTION new/stk/DESCRIPTION --- old/stk/DESCRIPTION 2015-06-30 22:02:53.000000000 +0200 +++ new/stk/DESCRIPTION 2015-10-11 08:36:22.000000000 +0200 @@ -1,8 +1,8 @@ Name: STK # -Version: 2.3.2 +Version: 2.3.3 # -Date: 30-Jun-2015 +Date: 11-Oct-2015 # Title: STK: A Small Toolbox for Kriging # @@ -12,7 +12,7 @@ and Emmanuel VAZQUEZ <[email protected]> # Description: The STK is a (not so) Small Toolbox for Kriging. Its primary - focus in on the interpolation/regression technique known as kriging, which + focus is on the interpolation/regression technique known as kriging, which is very closely related to Splines and Radial Basis Functions, and can be interpreted as a non-parametric Bayesian method using a Gaussian Process (GP) prior. The STK also provides tools for the sequential and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/NEWS new/stk/NEWS --- old/stk/NEWS 2015-06-30 22:02:49.000000000 +0200 +++ new/stk/NEWS 2015-10-11 08:36:17.000000000 +0200 @@ -1,3 +1,22 @@ +Changes in version 2.3.3 +======================== + +* Bug fixes + + o stk_dist, stk_filldist, stk_gpquadform, stk_mindist: Fix segmentation + faults occuring with very large matrices (related to signed integer-based + index computation in the underlying MEX-files). + + o stk_example_doe03.m: Use the appropriate flag for maximization. + + o mole/matlab/file_in_path.m: Fix two bugs (Matlab only) + +o Minor changes + + o stk_example_doe03.m: Display pointwise credible intervals in the upper + panel. + + Changes in version 2.3.2 ======================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/doc/README new/stk/doc/README --- old/stk/doc/README 2015-06-30 22:02:49.000000000 +0200 +++ new/stk/doc/README 2015-10-11 08:36:17.000000000 +0200 @@ -34,7 +34,7 @@ o General information - Version: 2.3.2 + Version: 2.3.3 Authors: See AUTHORS file @@ -42,7 +42,7 @@ Emmanuel Vazquez <[email protected]> Description: The STK is a (not so) Small Toolbox for Kriging. Its - primary focus in on the interpolation/regression + primary focus is on the interpolation/regression technique known as kriging, which is very closely related to Splines and Radial Basis Functions, and can be interpreted as a non-parametric Bayesian method using a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/examples/02_design_of_experiments/stk_example_doe03.m new/stk/inst/examples/02_design_of_experiments/stk_example_doe03.m --- old/stk/inst/examples/02_design_of_experiments/stk_example_doe03.m 2015-06-30 22:02:51.000000000 +0200 +++ new/stk/inst/examples/02_design_of_experiments/stk_example_doe03.m 2015-10-11 08:36:20.000000000 +0200 @@ -13,9 +13,10 @@ % Copyright Notice % +% Copyright (C) 2015 CentraleSupelec % Copyright (C) 2013, 2014 SUPELEC % -% Author: Julien Bect <[email protected]> +% Author: Julien Bect <[email protected]> % Copying Permission Statement % @@ -130,10 +131,6 @@ % Iteration number iter = 0; -% Plot options -DOE_STYLE = {'ko', 'MarkerFaceColor', 'k'}; -NEXT_STYLE = {'ro', 'MarkerFaceColor', 'y'}; - while (iter < NB_ITER) && (EI_max > EI_max_stop), % Trick: add a small "regularization" noise to our model @@ -144,22 +141,22 @@ % Compute the Expected Improvement (EI) criterion % (the fourth argument indicates that we want to MAXIMIZE f) - EI = stk_distrib_normal_ei (max (data.z), z_post.mean, sqrt (z_post.var), true); + EI = stk_distrib_normal_ei (max (data.z), ... + z_post.mean, sqrt (z_post.var), false); % Pick the point where the EI is maximum as our next evaluation point [EI_max, i_max] = max (EI); % Figure: upper panel stk_subplot (2, 1, 1); cla; - plot (x_grid, z_grid); xlim (BOX); hold on; - plot (x_grid, z_post.mean, 'r-'); - plot (data.x, data.z, DOE_STYLE{:}); - plot (x_grid(i_max), z_grid(i_max), NEXT_STYLE{:}); + stk_plot1d (data.x, data.z, x_grid, z_grid, z_post); + xlim (BOX); hold on; + plot (x_grid(i_max), z_grid(i_max), 'ro', 'MarkerFaceColor', 'y'); % Figure: lower panel stk_subplot (2, 1, 2); cla; plot (x_grid, EI); xlim (BOX); hold on; - plot (x_grid(i_max), EI_max, NEXT_STYLE{:}); + plot (x_grid(i_max), EI_max, 'ro', 'MarkerFaceColor', 'y'); stk_ylabel ('EI'); if EI_max > EI_max_stop, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/misc/design/stk_phipcrit.m new/stk/inst/misc/design/stk_phipcrit.m --- old/stk/inst/misc/design/stk_phipcrit.m 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/inst/misc/design/stk_phipcrit.m 2015-10-11 08:36:20.000000000 +0200 @@ -33,7 +33,7 @@ % [2] P. Audze and V. Eglais, "New approach for planning out experiments", % Problems of Dynamics and Strengths, 35:104-107, 1977. % -% [3] Luc Pronzato and Werner G. Müller, "Design of computer +% [3] Luc Pronzato and Werner G. Muller, "Design of computer % experiments: space filling and beyond", Statistics and Computing, % 22(3):681-701, 2012. % diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/misc/dist/stk_filldist.m new/stk/inst/misc/dist/stk_filldist.m --- old/stk/inst/misc/dist/stk_filldist.m 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/inst/misc/dist/stk_filldist.m 2015-10-11 08:36:20.000000000 +0200 @@ -3,7 +3,7 @@ % CALL: FD = stk_filldist(X, BOX) % % computes the fill distance FD of the dataset X in the hyper-rectangle -% BOX, using the computational-geometric algorithm of L. Pronzato and +% BOX, using the computational-geometric algorithm of L. Pronzato and % W. G. Muller [1]. Recall that % % D = max_{Y in BOX} min_{1 <= i <= n} norm(X(i,:) - Y), (1) @@ -40,7 +40,7 @@ % % REFERENCES % -% [1] Luc Pronzato and Werner G. Müller, "Design of computer +% [1] Luc Pronzato and Werner G. Muller, "Design of computer % experiments: space filling and beyond", Statistics and Computing, % 22(3):681-701, 2012. % diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/misc/dist/stk_filldist_exact.m new/stk/inst/misc/dist/stk_filldist_exact.m --- old/stk/inst/misc/dist/stk_filldist_exact.m 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/inst/misc/dist/stk_filldist_exact.m 2015-10-11 08:36:20.000000000 +0200 @@ -3,7 +3,7 @@ % CALL: FD = stk_filldist_exact(X, BOX) % % computes the fill distance FD of the dataset X in the hyper-rectangle -% BOX, using the computational-geometric algorithm of L. Pronzato and +% BOX, using the computational-geometric algorithm of L. Pronzato and % W. G. Muller [1]. Recall that % % D = max_{Y in BOX} min_{1 <= i <= n} norm(X(i,:) - Y), (1) @@ -24,7 +24,7 @@ % % REFERENCES % -% [1] Luc Pronzato and Werner G. Müller, "Design of computer +% [1] Luc Pronzato and Werner G. Muller, "Design of computer % experiments: space filling and beyond", Statistics and Computing, % 22(3):681-701, 2012. % @@ -44,8 +44,8 @@ % % Maintainer: Julien Bect <[email protected]> % -% Guillaume Carlier and Florian Pasanisi wrote a first implementation -% of the algorithm following the paper of Pronzato & Müller (2011), +% Guillaume Carlier and Florian Pasanisi wrote a first implementation +% of the algorithm following the paper of Pronzato & Muller (2011), % which was subsequently streamlined and adapted to the STK toolbox % by Julien Bect. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/misc/pareto/essais.m new/stk/inst/misc/pareto/essais.m --- old/stk/inst/misc/pareto/essais.m 2015-06-30 22:02:53.000000000 +0200 +++ new/stk/inst/misc/pareto/essais.m 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -%% -y_ref = [1 1]; y = [0.3 0.3]; r = stk_dominatedhv (y, y_ref, 1) - -% r = -% -% sign: 1 -% xmin: [0.3000 0.3000] -% xmax: [1 1] - -%% - -y_ref = [1 1]; y = [0.3 0.7; 0.6 0.2]; -r = stk_dominatedhv (y, y_ref, 1) - -r.sign -r.xmin -r.xmax - -% ans = -% -% 1 -% 1 -% -1 -% -% -% ans = -% -% 0.3000 0.7000 -% 0.6000 0.2000 -% 0.6000 0.7000 -% -% -% ans = -% -% 1 1 -% 1 1 -% 1 1 - - -%% -y_ref = [1 1]; y = [0.2 0.8; 0.4 0.6; 0.8 0.2]; -r = stk_dominatedhv (y, y_ref, 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/stk_version.m new/stk/inst/stk_version.m --- old/stk/inst/stk_version.m 2015-06-30 22:02:53.000000000 +0200 +++ new/stk/inst/stk_version.m 2015-10-11 08:36:22.000000000 +0200 @@ -29,6 +29,6 @@ function v = stk_version () -v = '2.3.2'; +v = '2.3.3'; end % function stk_version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/get_column_number.c new/stk/src/get_column_number.c --- old/stk/src/get_column_number.c 2015-06-30 22:02:50.000000000 +0200 +++ new/stk/src/get_column_number.c 2015-10-11 08:36:18.000000000 +0200 @@ -5,7 +5,8 @@ * Copyright Notice * * * * Copyright (C) 2013 SUPELEC * - * Author: Julien Bect <[email protected]> * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/pareto.h new/stk/src/pareto.h --- old/stk/src/pareto.h 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/pareto.h 2015-10-11 08:36:21.000000000 +0200 @@ -5,8 +5,8 @@ * Copyright Notice * * * * Copyright (C) 2014 SUPELEC * - * Author: Julien Bect <[email protected]> * - * URL: http://sourceforge.net/projects/kriging/ * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_dist_matrixx.c new/stk/src/stk_dist_matrixx.c --- old/stk/src/stk_dist_matrixx.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_dist_matrixx.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,10 +4,11 @@ * * * Copyright Notice * * * + * Copyright (C) 2015 CentraleSupelec * * Copyright (C) 2011, 2012 SUPELEC * - * Authors: Julien Bect <[email protected]> * - * Emmanuel Vazquez <[email protected]> * - * URL: http://sourceforge.net/projects/kriging/ * + * * + * Authors: Julien Bect <[email protected]> * + * Emmanuel Vazquez <[email protected]> * * * * Copying Permission Statement * * * @@ -33,9 +34,9 @@ #include "stk_mex.h" -static void distance1(double* x, double* h, int nx, int dim) +static void distance1(double* x, double* h, size_t nx, size_t dim) { - int i, j, k1, k2; + size_t i, j, k1, k2; double diff, lambda; for (i = 0; i < nx; i++) { @@ -64,7 +65,7 @@ mxArray* compute_distance_xx(const mxArray* x) { - unsigned int d, n; + size_t d, n; mxArray* h; if(!stk_is_realmatrix(x)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_dist_matrixy.c new/stk/src/stk_dist_matrixy.c --- old/stk/src/stk_dist_matrixy.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_dist_matrixy.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,10 +4,11 @@ * * * Copyright Notice * * * + * Copyright (C) 2015 CentraleSupelec * * Copyright (C) 2011, 2012 SUPELEC * - * Authors: Julien Bect <[email protected]> * - * Emmanuel Vazquez <[email protected]> * - * URL: http://sourceforge.net/projects/kriging/ * + * * + * Authors: Julien Bect <[email protected]> * + * Emmanuel Vazquez <[email protected]> * * * * Copying Permission Statement * * * @@ -34,9 +35,9 @@ #include "stk_mex.h" -static void distance2(double* x, double* y, double* h, int nx, int ny, int dim) +static void distance2(double* x, double* y, double* h, size_t nx, size_t ny, size_t dim) { - int i, j, kx, ky; + size_t i, j, kx, ky; double diff, lambda; for (i = 0; i < nx; i++) { @@ -60,7 +61,7 @@ mxArray* compute_distance_xy(const mxArray* x, const mxArray* y) { - unsigned int d, mx, my; + size_t d, mx, my; mxArray* h; if((!stk_is_realmatrix(x)) || (!stk_is_realmatrix(y))) @@ -88,9 +89,9 @@ { if (nlhs > 1) /* Check number of output arguments */ mexErrMsgTxt("Too many output arguments."); - + if (nrhs != 2) /* Check number of input arguments */ mexErrMsgTxt("Incorrect number of input arguments."); - - plhs[0] = compute_distance_xy(prhs[0], prhs[1]); + + plhs[0] = compute_distance_xy(prhs[0], prhs[1]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_dist_pairwise.c new/stk/src/stk_dist_pairwise.c --- old/stk/src/stk_dist_pairwise.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_dist_pairwise.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,8 +4,10 @@ * * * Copyright Notice * * * - * Copyright (C) 2012 SUPELEC * - * Author: Julien Bect <[email protected]> * + * Copyright (C) 2015 CentraleSupelec * + * Copyright (C) 2012 SUPELEC * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * @@ -32,9 +34,9 @@ #include "stk_mex.h" -static void distance3(double* x, double* y, double* h, int n, int dim) +static void distance3(double* x, double* y, double* h, size_t n, size_t dim) { - int i, k; + size_t i, k; double diff, lambda; for (i = 0; i < n; i++) { @@ -56,7 +58,7 @@ mxArray* compute_distance_xy_pairwise(const mxArray* x, const mxArray* y) { - unsigned int d, n; + size_t d, n; mxArray* h; if((!stk_is_realmatrix(x)) || (!stk_is_realmatrix(y))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_distrib_bivnorm0_cdf.c new/stk/src/stk_distrib_bivnorm0_cdf.c --- old/stk/src/stk_distrib_bivnorm0_cdf.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_distrib_bivnorm0_cdf.c 2015-10-11 08:36:21.000000000 +0200 @@ -5,8 +5,8 @@ * Copyright Notice * * * * Copyright (C) 2014 Supelec * - * Author: Julien Bect <[email protected]> * - * URL: http://sourceforge.net/projects/kriging/ * + * * + * Author: Julien Bect <[email protected]> * * * * Based on mvndstpack.f by Yihong Ge and Alan Genz * * (see original copyright notice below) * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_filldist_discr_mex.c new/stk/src/stk_filldist_discr_mex.c --- old/stk/src/stk_filldist_discr_mex.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_filldist_discr_mex.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,8 +4,10 @@ * * * Copyright Notice * * * - * Copyright (C) 2012 SUPELEC * - * Author: Julien Bect <[email protected]> * + * Copyright (C) 2015 CentraleSupelec * + * Copyright (C) 2012 SUPELEC * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * @@ -38,17 +40,22 @@ static double compute_filldist ( - double* x, unsigned int nx, - double* y, unsigned int ny, - unsigned int dim, - unsigned int* argmax + double* x, size_t nx, + double* y, size_t ny, + size_t dim, + size_t* argmax ) { - unsigned int i, j, k1, k2, j_max; + size_t i, j, k1, k2, j_max; double diff, sqdist_max, sqdist_j, sqdist_ij; + j_max = 0; + sqdist_max = 0.0; + for (j = 0; j < ny; j++) { + sqdist_j = 0; /* prevents a "may be uninitialized" warning */ + /* Compute the sqdist from y(j, :) to the set x */ for (i = 0; i < nx; i++) { /* Compute the sqdist from y(j, :) to x(i, :) */ @@ -63,7 +70,7 @@ } /* Update sqdist_max */ - if ((j == 0) || (sqdist_j > sqdist_max)) { + if (sqdist_j > sqdist_max) { j_max = j; sqdist_max = sqdist_j; } @@ -77,7 +84,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray*prhs[]) { - unsigned int mx, my, dim, argmax; + size_t mx, my, dim, argmax; double filldist, *px, *py; if (nlhs > 2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_gpquadform_matrixx.c new/stk/src/stk_gpquadform_matrixx.c --- old/stk/src/stk_gpquadform_matrixx.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_gpquadform_matrixx.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,11 +4,10 @@ * * * Copyright Notice * * * + * Copyright (C) 2015 CentraleSupelec * * Copyright (C) 2013 SUPELEC * * * - * Author: Julien Bect <[email protected]> * - * * - * URL: http://sourceforge.net/projects/kriging/ * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * @@ -37,10 +36,10 @@ static void gpquadform_matrixx ( - double* x, double* rx2, double* h, int n, int dim + double* x, double* rx2, double* h, size_t n, size_t dim ) { - int i, j, k1, k2; + size_t i, j, k1, k2; double diff, lambda; for (i = 0; i < (n - 1); i++) @@ -71,7 +70,7 @@ const mxArray* rx ) { - unsigned int k, d, mx; + size_t k, d, mx; double u, *p, *rx2; mxArray *h; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_gpquadform_matrixy.c new/stk/src/stk_gpquadform_matrixy.c --- old/stk/src/stk_gpquadform_matrixy.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_gpquadform_matrixy.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,11 +4,10 @@ * * * Copyright Notice * * * + * Copyright (C) 2015 CentraleSupelec * * Copyright (C) 2013 SUPELEC * * * - * Author: Julien Bect <[email protected]> * - * * - * URL: http://sourceforge.net/projects/kriging/ * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * @@ -38,10 +37,10 @@ static void gpquadfrom_matrixy ( double* x, double* y, double* rx2, double* ry2, - double* h, int nx, int ny, int dim + double* h, size_t nx, size_t ny, size_t dim ) { - int i, j, kx, ky; + size_t i, j, kx, ky; double diff, lambda; for (i = 0; i < nx; i++) { @@ -71,7 +70,7 @@ const mxArray* ry ) { - unsigned int k, d, mx, my; + size_t k, d, mx, my; double u, *p, *rx2, *ry2; mxArray *h; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_gpquadform_pairwise.c new/stk/src/stk_gpquadform_pairwise.c --- old/stk/src/stk_gpquadform_pairwise.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_gpquadform_pairwise.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,11 +4,10 @@ * * * Copyright Notice * * * + * Copyright (C) 2015 CentraleSupelec * * Copyright (C) 2013 SUPELEC * * * - * Author: Julien Bect <[email protected]> * - * * - * URL: http://sourceforge.net/projects/kriging/ * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * @@ -38,10 +37,10 @@ static void gpquadform_pairwise ( double* x, double* y, double* rx, double* ry, - double* h, int m, int dim + double* h, size_t m, size_t dim ) { - int i, kx, ky; + size_t i, kx, ky; double diff, lambda, rxi, ryi; for (i = 0; i < m; i++) @@ -70,7 +69,7 @@ const mxArray* ry ) { - unsigned int d, m; + size_t d, m; mxArray *h; if((!stk_is_realmatrix(x)) || (!stk_is_realmatrix(y)) || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_isdominated_mex.c new/stk/src/stk_isdominated_mex.c --- old/stk/src/stk_isdominated_mex.c 2015-06-30 22:02:50.000000000 +0200 +++ new/stk/src/stk_isdominated_mex.c 2015-10-11 08:36:19.000000000 +0200 @@ -5,8 +5,8 @@ * Copyright Notice * * * * Copyright (C) 2014 SUPELEC * - * Author: Julien Bect <[email protected]> * - * URL: http://sourceforge.net/projects/kriging/ * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_mex.h new/stk/src/stk_mex.h --- old/stk/src/stk_mex.h 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_mex.h 2015-10-11 08:36:21.000000000 +0200 @@ -5,7 +5,8 @@ * Copyright Notice * * * * Copyright (C) 2012, 2013 SUPELEC * - * Author: Julien Bect <[email protected]> * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_mindist_mex.c new/stk/src/stk_mindist_mex.c --- old/stk/src/stk_mindist_mex.c 2015-06-30 22:02:52.000000000 +0200 +++ new/stk/src/stk_mindist_mex.c 2015-10-11 08:36:20.000000000 +0200 @@ -4,8 +4,10 @@ * * * Copyright Notice * * * - * Copyright (C) 2012 SUPELEC * - * Author: Julien Bect <[email protected]> * + * Copyright (C) 2015 CentraleSupelec * + * Copyright (C) 2012 SUPELEC * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * @@ -34,9 +36,9 @@ #define X_IN prhs[0] /* input argument */ #define H_OUT plhs[0] /* output argument */ -static double compute_mindist(double* x, int nx, int dim) +static double compute_mindist(double* x, size_t nx, size_t dim) { - int i, j, k1, k2; + size_t i, j, k1, k2; double diff, dist_squared, mindist_squared; mindist_squared = -1; @@ -64,7 +66,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray*prhs[]) { - unsigned int dim, mx; + size_t dim, mx; if (nlhs > 1) mexErrMsgTxt("Too many output arguments."); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_paretofind_mex.c new/stk/src/stk_paretofind_mex.c --- old/stk/src/stk_paretofind_mex.c 2015-06-30 22:02:50.000000000 +0200 +++ new/stk/src/stk_paretofind_mex.c 2015-10-11 08:36:19.000000000 +0200 @@ -5,8 +5,8 @@ * Copyright Notice * * * * Copyright (C) 2014 SUPELEC * - * Author: Julien Bect <[email protected]> * - * URL: http://sourceforge.net/projects/kriging/ * + * * + * Author: Julien Bect <[email protected]> * * * * Copying Permission Statement * * * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/stk_sampling_vdc_rr2.c new/stk/src/stk_sampling_vdc_rr2.c --- old/stk/src/stk_sampling_vdc_rr2.c 2015-06-30 22:02:53.000000000 +0200 +++ new/stk/src/stk_sampling_vdc_rr2.c 2015-10-11 08:36:22.000000000 +0200 @@ -6,7 +6,7 @@ * * * Copyright (C) 2013 Alexandra Krauth, Elham Rahali & SUPELEC * * * - * Authors: Julien Bect <[email protected]> * + * Authors: Julien Bect <[email protected]> * * Alexandra Krauth <[email protected]> * * Elham Rahali <[email protected]> * * *
