Hello community, here is the log from the commit of package octave-forge-stk for openSUSE:Factory checked in at 2015-11-12 19:41:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-14 16:45:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.octave-forge-stk.new/octave-forge-stk.changes 2015-11-12 19:41:33.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 11 15:20:54 UTC 2015 - [email protected] + +- Update to version 2.3.4 + * Bug fixes and minor changes + +------------------------------------------------------------------- Old: ---- stk-2.3.3.tar.gz New: ---- stk-2.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave-forge-stk.spec ++++++ --- /var/tmp/diff_new_pack.HsWPex/_old 2015-11-12 19:41:34.000000000 +0100 +++ /var/tmp/diff_new_pack.HsWPex/_new 2015-11-12 19:41:34.000000000 +0100 @@ -18,7 +18,7 @@ %define octpkg stk Name: octave-forge-%{octpkg} -Version: 2.3.3 +Version: 2.3.4 Release: 0 Summary: Small Octave Toolbox for Kriging License: GPL-3.0+ ++++++ stk-2.3.3.tar.gz -> stk-2.3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/ChangeLog new/stk/ChangeLog --- old/stk/ChangeLog 2015-10-11 08:36:17.000000000 +0200 +++ new/stk/ChangeLog 2015-11-06 19:05:00.000000000 +0100 @@ -1,3 +1,42 @@ +2015-11-06 Julien Bect <[email protected]> + + Makefile: Fix 'clean' target (tab instead of spaces) + + * admin/octpkg/Makefile: Fix 'clean' target (tabs instead of + spaces) + +2015-10-30 Julien Bect <[email protected]> + + Decrease unit test verbosity + + * arrays/@stk_dataframe/double.m: decrease unit test verbosity. + * arrays/@stk_dataframe/sort.m: idem + * arrays/@stk_dataframe/subsasgn.m: idem + * arrays/@stk_factorialdesign/fieldnames.m: idem + * arrays/@stk_factorialdesign/stk_factorialdesign.m: idem + * arrays/@stk_hrect/horzcat.m: idem + * misc/text/stk_sprintf_colvect_scientific.m: idem + * paramestim/stk_param_gls.m: idem + + Add a 'clean' target to the Octave package Makefile + + * admin/octpkg/Makefile: Add a 'clean target'. + +2015-10-22 Julien Bect <[email protected]> + + @stk_hrect/subsref.m: Return an stk_hrect object if possible + + * arrays/@stk_hrect/subsref.m: Make sure that the returned value + is still an stk_hrect object when the number of rows (which is + two) is unchanged. + + @stk_hrect/ismember.m: Fix two bugs + + * arrays/@stk_hrect/ismember.m: Fix a bug that prevented ismember + from working on more than one point at a time, and another bug + in the case where B is not an stk_hrect object (it was incorrectly + assumed to be an stk_dataframe in this case). + 2015-10-11 Julien Bect <[email protected]> mole/matlab/file_in_path.m: Fix two bugs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/DESCRIPTION new/stk/DESCRIPTION --- old/stk/DESCRIPTION 2015-10-11 08:36:22.000000000 +0200 +++ new/stk/DESCRIPTION 2015-11-06 19:05:05.000000000 +0100 @@ -1,8 +1,8 @@ Name: STK # -Version: 2.3.3 +Version: 2.3.4 # -Date: 11-Oct-2015 +Date: 06-Nov-2015 # Title: STK: A Small Toolbox for Kriging # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/NEWS new/stk/NEWS --- old/stk/NEWS 2015-10-11 08:36:17.000000000 +0200 +++ new/stk/NEWS 2015-11-06 19:05:00.000000000 +0100 @@ -1,3 +1,23 @@ +Changes in version 2.3.4 +======================== + +* Bug fixes + + o @stk_hrect/ismember.m: Fix a bug that prevented ismember from working on + more than one point at a time, and another bug in the case where B is not + an stk_hrect object (it was incorrectly assumed to be an stk_dataframe in + this case). + + o @stk_hrect/subsref.m: Make sure that the returned value is still an + stk_hrect object when the number of rows (which is two) is unchanged. + +* Minor changes + + o Add a 'clean' target to the Octave package Makefile. + + o Decrease unit test verbosity. + + Changes in version 2.3.3 ======================== @@ -11,7 +31,7 @@ o mole/matlab/file_in_path.m: Fix two bugs (Matlab only) -o Minor changes +* Minor changes o stk_example_doe03.m: Display pointwise credible intervals in the upper panel. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/doc/README new/stk/doc/README --- old/stk/doc/README 2015-10-11 08:36:17.000000000 +0200 +++ new/stk/doc/README 2015-11-06 19:05:00.000000000 +0100 @@ -34,7 +34,7 @@ o General information - Version: 2.3.3 + Version: 2.3.4 Authors: See AUTHORS file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_dataframe/disp.m new/stk/inst/arrays/@stk_dataframe/disp.m --- old/stk/inst/arrays/@stk_dataframe/disp.m 2015-10-11 08:36:18.000000000 +0200 +++ new/stk/inst/arrays/@stk_dataframe/disp.m 2015-11-06 19:05:01.000000000 +0100 @@ -63,7 +63,7 @@ %!test format rat; disp (x); %!test format long; disp (x); %!test format short; disp (x); -%! if ~isnan (fmt), set (0, 'Format', fmt); end +%! if ~isnan (fmt), set (0, 'Format', fmt); end %!test disp (stk_dataframe (zeros (0, 1))) %!test disp (stk_dataframe (zeros (0, 2))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_dataframe/double.m new/stk/inst/arrays/@stk_dataframe/double.m --- old/stk/inst/arrays/@stk_dataframe/double.m 2015-10-11 08:36:18.000000000 +0200 +++ new/stk/inst/arrays/@stk_dataframe/double.m 2015-11-06 19:05:01.000000000 +0100 @@ -2,9 +2,10 @@ % Copyright Notice % +% Copyright (C) 2015 CentraleSupelec % Copyright (C) 2013 SUPELEC % -% Author: Julien Bect <[email protected]> +% Author: Julien Bect <[email protected]> % Copying Permission Statement % @@ -45,7 +46,7 @@ %! assert (strcmp(class(v), 'double') && isequal(v, double(u))) %!test -%! u = uint8(rand(4, 3) * 5) +%! u = uint8 (rand (4, 3) * 5); %! x = stk_dataframe(u); %! v = double(x); %! assert (strcmp(class(v), 'double') && isequal(v, double(u))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_dataframe/sort.m new/stk/inst/arrays/@stk_dataframe/sort.m --- old/stk/inst/arrays/@stk_dataframe/sort.m 2015-10-11 08:36:18.000000000 +0200 +++ new/stk/inst/arrays/@stk_dataframe/sort.m 2015-11-06 19:05:01.000000000 +0100 @@ -76,8 +76,8 @@ %!shared x, y -%! x = stk_dataframe ([3; 2; 1], {}, {'a', 'b', 'c'}) -%! y = sort (x) +%! x = stk_dataframe ([3; 2; 1], {}, {'a', 'b', 'c'}); +%! y = sort (x); %!assert (strcmp (class (y), 'stk_dataframe')) %!assert (isequal (y.data, [1; 2; 3])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_dataframe/stk_sprintf.m new/stk/inst/arrays/@stk_dataframe/stk_sprintf.m --- old/stk/inst/arrays/@stk_dataframe/stk_sprintf.m 2015-10-11 08:36:18.000000000 +0200 +++ new/stk/inst/arrays/@stk_dataframe/stk_sprintf.m 2015-11-06 19:05:01.000000000 +0100 @@ -156,7 +156,7 @@ %!test format rat; disp (x); %!test format long; disp (x); %!test format short; disp (x); -%! if ~isnan (fmt), set (0, 'Format', fmt); end +%! if ~isnan (fmt), set (0, 'Format', fmt); end %!test disp (stk_dataframe (zeros (0, 1))) %!test disp (stk_dataframe (zeros (0, 2))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_dataframe/subsasgn.m new/stk/inst/arrays/@stk_dataframe/subsasgn.m --- old/stk/inst/arrays/@stk_dataframe/subsasgn.m 2015-10-11 08:36:18.000000000 +0200 +++ new/stk/inst/arrays/@stk_dataframe/subsasgn.m 2015-11-06 19:05:01.000000000 +0100 @@ -5,7 +5,7 @@ % Copyright (C) 2015 CentraleSupelec % Copyright (C) 2013, 2014 SUPELEC % -% Author: Julien Bect <[email protected]> +% Author: Julien Bect <[email protected]> % Copying Permission Statement % @@ -303,7 +303,7 @@ %! assert (isempty (x)); %!test % Delete the only row of a one-row dataframe -%! y1 = stk_dataframe ([1.2 3.33], {'mean', 'var'}) +%! y1 = stk_dataframe ([1.2 3.33], {'mean', 'var'}); %! y1(1, :) = []; % Remove the only row of data %! assert (isequal (size (y1), [0 2])) %! assert (isequal (y1.colnames, {'mean', 'var'})) @@ -330,7 +330,7 @@ %!error x(3, 1, 1) = 297; %!test % create a new row and a new column through subsasgn() -%! x = stk_dataframe(rand(5, 2)); x(6, 3) = 7; disp(x) +%! x = stk_dataframe (rand (5, 2)); x(6, 3) = 7; %! assert(isequal(size(x), [6, 3])); %--- tests adding row/columns through row/columns names ------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_factorialdesign/fieldnames.m new/stk/inst/arrays/@stk_factorialdesign/fieldnames.m --- old/stk/inst/arrays/@stk_factorialdesign/fieldnames.m 2015-10-11 08:36:18.000000000 +0200 +++ new/stk/inst/arrays/@stk_factorialdesign/fieldnames.m 2015-11-06 19:05:01.000000000 +0100 @@ -2,9 +2,10 @@ % Copyright Notice % +% Copyright (C) 2015 CentraleSupelec % Copyright (C) 2014 SUPELEC % -% Author: Julien Bect <[email protected]> +% Author: Julien Bect <[email protected]> % Copying Permission Statement % @@ -34,7 +35,7 @@ end % function fieldnames %!test -%! x = stk_factorialdesign ({0:1, 3:5}, {'u' 'v'}) +%! x = stk_factorialdesign ({0:1, 3:5}, {'u' 'v'}); %! fn1 = sort (fieldnames (x)); %! fn2 = {'colnames', 'data', 'info', 'levels', ... %! 'rownames', 'stk_dataframe', 'u', 'v'}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_factorialdesign/stk_factorialdesign.m new/stk/inst/arrays/@stk_factorialdesign/stk_factorialdesign.m --- old/stk/inst/arrays/@stk_factorialdesign/stk_factorialdesign.m 2015-10-11 08:36:18.000000000 +0200 +++ new/stk/inst/arrays/@stk_factorialdesign/stk_factorialdesign.m 2015-11-06 19:05:01.000000000 +0100 @@ -2,9 +2,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 % @@ -93,7 +94,7 @@ %! assert (strcmp (class (x), 'stk_factorialdesign')); %!test % constructor with two factors + column names -%! x = stk_factorialdesign ({[0 1], [1 2 3]}, {'a', 'b'}) +%! x = stk_factorialdesign ({[0 1], [1 2 3]}, {'a', 'b'}); %! assert (isequal(x.colnames, {'a', 'b'})); %! assert (isequal(get (x, 'colnames'), {'a', 'b'})); @@ -117,7 +118,7 @@ %!test format rat; disp (x); %!test format long; disp (x); %!test format short; disp (x); -%! if ~ isnan (fmt), set (0, 'Format', fmt); end +%! if ~ isnan (fmt), set (0, 'Format', fmt); end %!test disp (stk_sampling_regulargrid (0^1, 1)); %!test disp (stk_sampling_regulargrid (0^2, 2)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_hrect/horzcat.m new/stk/inst/arrays/@stk_hrect/horzcat.m --- old/stk/inst/arrays/@stk_hrect/horzcat.m 2015-10-11 08:36:19.000000000 +0200 +++ new/stk/inst/arrays/@stk_hrect/horzcat.m 2015-11-06 19:05:02.000000000 +0100 @@ -2,9 +2,10 @@ % Copyright Notice % +% Copyright (C) 2015 CentraleSupelec % Copyright (C) 2014 SUPELEC % -% Author: Julien Bect <[email protected]> +% Author: Julien Bect <[email protected]> % Copying Permission Statement % @@ -82,7 +83,7 @@ %!test %! lastwarn ('') -%! y4 = horzcat (x1, x3) +%! y4 = horzcat (x1, x3); %! assert (isequal (size (y4), [2 2*d])); %! assert (strcmp (class (y4), 'stk_dataframe')); %! [warn_msg, warn_id] = lastwarn (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_hrect/ismember.m new/stk/inst/arrays/@stk_hrect/ismember.m --- old/stk/inst/arrays/@stk_hrect/ismember.m 2015-10-11 08:36:19.000000000 +0200 +++ new/stk/inst/arrays/@stk_hrect/ismember.m 2015-11-06 19:05:02.000000000 +0100 @@ -2,9 +2,10 @@ % Copyright Notice % +% Copyright (C) 2015 CentraleSupelec % Copyright (C) 2014 SUPELEC % -% Author: Julien Bect <[email protected]> +% Author: Julien Bect <[email protected]> % Copying Permission Statement % @@ -38,23 +39,26 @@ varargout = cell (1, max (nargout, 1)); -% If A is an stk_hrect, treat it as any other stk_dataframe would be treated -if isa (A, 'stk_hrect'), A = A.stk_dataframe; end - if isa (B, 'stk_hrect'), + % If B is an stk_hrect, ismember tests whether A (or the points in A) % belong to the hyper-rectangle B + if nargout > 1, stk_error (['Cannot return member indices when testing for ' ... 'membership to an hyper-rectangle.'], 'TooManyOutputArgs'); end - Bmin = B.stk_dataframe.data(1, :); - Bmax = B.stk_dataframe.data(2, :); + A = double (A); - varargout{1} = all ((A >= Bmin) & (A <= Bmax), 2); + b1 = bsxfun (@ge, A, B.stk_dataframe.data(1, :)); + b2 = bsxfun (@le, A, B.stk_dataframe.data(2, :)); + varargout{1} = all (b1 & b2, 2); + else - % Otherwise, use @stk_dataframe/ismember - [varargout{:}] = ismember (A, B.stk_dataframe, flags{:}); + + % A is an stk_hrect, treat it as any other stk_dataframe would be treated + [varargout{:}] = ismember (A.stk_dataframe, B, flags{:}); + end end % function ismember @@ -68,3 +72,7 @@ %!assert (ismember (.5 * ones (1, 5), box)) %!assert (~ ismember (box(1, :) - 1, box)) %!assert (~ ismember (box(2, :) + 1, box)) + +%!test +%! y = double (box); y = [y; y + 2]; +%! assert (isequal (ismember (y, box), [1; 1; 0; 0])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/arrays/@stk_hrect/subsref.m new/stk/inst/arrays/@stk_hrect/subsref.m --- old/stk/inst/arrays/@stk_hrect/subsref.m 2015-10-11 08:36:19.000000000 +0200 +++ new/stk/inst/arrays/@stk_hrect/subsref.m 2015-11-06 19:05:02.000000000 +0100 @@ -2,9 +2,10 @@ % Copyright Notice % +% Copyright (C) 2015 CentraleSupelec % Copyright (C) 2014 SUPELEC % -% Author: Julien Bect <[email protected]> +% Author: Julien Bect <[email protected]> % Copying Permission Statement % @@ -30,10 +31,21 @@ switch idx(1).type - case {'()', '{}'} + case '()' t = subsref (x.stk_dataframe, idx); + if size (t, 1) == 2 + x.stk_dataframe = t; + t = x; + end + + case '{}' + + % Currently {}-indexing is not supported for + % stk_dataframe objects, but who knows... + t = subsref (x.stk_dataframe, idx); + case '.' t = get (x, idx(1).subs); @@ -45,3 +57,15 @@ end end % function subsref + +%!test +%! B = stk_hrect ([0 0 0 0; 1 2 3 4]); +%! B = B(:, [1 3 4]); +%! assert (strcmp (class (B), 'stk_hrect')); +%! assert (isequal (double (B), [0 0 0; 1 3 4])); + +%!test +%! B = stk_hrect ([0 0 0 0; 1 2 3 4]); +%! B = B(1, :); +%! assert (strcmp (class (B), 'stk_dataframe')); +%! assert (isequal (double (B), [0 0 0 0])); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/misc/benchmarks/stk_benchmark_bivnorm.m new/stk/inst/misc/benchmarks/stk_benchmark_bivnorm.m --- old/stk/inst/misc/benchmarks/stk_benchmark_bivnorm.m 2015-10-11 08:36:20.000000000 +0200 +++ new/stk/inst/misc/benchmarks/stk_benchmark_bivnorm.m 2015-11-06 19:05:03.000000000 +0100 @@ -1,3 +1,31 @@ +% STK_BENCHMARK_BIVNORM + +% Copyright Notice +% +% Copyright (C) 2014 SUPELEC +% +% Author: Julien Bect <[email protected]> + +% Copying Permission Statement +% +% This file is part of +% +% STK: a Small (Matlab/Octave) Toolbox for Kriging +% (http://sourceforge.net/projects/kriging) +% +% STK is free software: you can redistribute it and/or modify it under +% the terms of the GNU General Public License as published by the Free +% Software Foundation, either version 3 of the License, or (at your +% option) any later version. +% +% STK is distributed in the hope that it will be useful, but WITHOUT +% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +% or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +% License for more details. +% +% You should have received a copy of the GNU General Public License +% along with STK. If not, see <http://www.gnu.org/licenses/>. + mu = [1 2]; % means sigma = [3 4]; % standard deviations rho = 0.37; % correlation coefficients diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/misc/text/stk_sprintf_colvect_scientific.m new/stk/inst/misc/text/stk_sprintf_colvect_scientific.m --- old/stk/inst/misc/text/stk_sprintf_colvect_scientific.m 2015-10-11 08:36:22.000000000 +0200 +++ new/stk/inst/misc/text/stk_sprintf_colvect_scientific.m 2015-11-06 19:05:05.000000000 +0100 @@ -2,9 +2,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 % @@ -201,28 +202,28 @@ %!shared x, s %! x = [0.9; 0.91; 0.99; 0.999]; -%!test s = stk_sprintf_colvect_scientific (x, 4) +%!test s = stk_sprintf_colvect_scientific (x, 4); %!assert (isequal(s, ['####'; '####'; '####'; '####'])) -%!test s = stk_sprintf_colvect_scientific (x, 5) +%!test s = stk_sprintf_colvect_scientific (x, 5); %!assert (isequal(s, ['9e-01'; '9e-01'; '1e+00'; '1e+00'])) -%!test s = stk_sprintf_colvect_scientific (x, 6) +%!test s = stk_sprintf_colvect_scientific (x, 6); %!assert (isequal(s, ['9e-01'; '9e-01'; '1e+00'; '1e+00'])) -%!test s = stk_sprintf_colvect_scientific (x, 7) +%!test s = stk_sprintf_colvect_scientific (x, 7); %!assert (isequal(s, ['9.0e-01'; '9.1e-01'; '9.9e-01'; '1.0e+00'])) -%!test s = stk_sprintf_colvect_scientific (x, 8) +%!test s = stk_sprintf_colvect_scientific (x, 8); %!assert (isequal(s, ['9.00e-01'; '9.10e-01'; '9.90e-01'; '9.99e-01'])) %!shared x, s %! x = [0.9; -0.91; 0.99; 0.999]; -%!test s = stk_sprintf_colvect_scientific (x, 4) +%!test s = stk_sprintf_colvect_scientific (x, 4); %!assert (isequal(s, ['####'; '####'; '####'; '####'])) -%!test s = stk_sprintf_colvect_scientific (x, 5) +%!test s = stk_sprintf_colvect_scientific (x, 5); %!assert (isequal(s, ['#####'; '#####'; '#####'; '#####'])) -%!test s = stk_sprintf_colvect_scientific (x, 6) +%!test s = stk_sprintf_colvect_scientific (x, 6); %!assert (isequal(s, [' 9e-01'; '-9e-01'; ' 1e+00'; ' 1e+00'])) -%!test s = stk_sprintf_colvect_scientific (x, 7) +%!test s = stk_sprintf_colvect_scientific (x, 7); %!assert (isequal(s, [' 9e-01'; '-9e-01'; ' 1e+00'; ' 1e+00'])) -%!test s = stk_sprintf_colvect_scientific (x, 8) +%!test s = stk_sprintf_colvect_scientific (x, 8); %!assert (isequal(s, [' 9.0e-01'; '-9.1e-01'; ' 9.9e-01'; ' 1.0e+00'])) %!test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/inst/paramestim/stk_param_gls.m new/stk/inst/paramestim/stk_param_gls.m --- old/stk/inst/paramestim/stk_param_gls.m 2015-10-11 08:36:22.000000000 +0200 +++ new/stk/inst/paramestim/stk_param_gls.m 2015-11-06 19:05:05.000000000 +0100 @@ -26,11 +26,12 @@ % Copyright Notice % +% Copyright (C) 2015 CentraleSupelec % Copyright (C) 2014 SUPELEC & A. Ravisankar % Copyright (C) 2011-2013 SUPELEC % -% Authors: Julien Bect <[email protected]> -% Emmanuel Vazquez <[email protected]> +% Authors: Julien Bect <[email protected]> +% Emmanuel Vazquez <[email protected]> % Ashwin Ravisankar <[email protected]> % Copying Permission Statement @@ -100,7 +101,7 @@ %!test %! model.order = -1; -%! [beta, sigma2] = stk_param_gls (model, xi, zi) +%! [beta, sigma2] = stk_param_gls (model, xi, zi); %!assert (isequal (beta, zeros (0, 1))) %!assert (stk_isequal_tolabs (sigma2, 0.3977993, 1e-6)) 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-10-11 08:36:22.000000000 +0200 +++ new/stk/inst/stk_version.m 2015-11-06 19:05:05.000000000 +0100 @@ -29,6 +29,6 @@ function v = stk_version () -v = '2.3.3'; +v = '2.3.4'; end % function stk_version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/post_install.m new/stk/post_install.m --- old/stk/post_install.m 2015-10-11 08:36:22.000000000 +0200 +++ new/stk/post_install.m 2015-11-06 19:05:05.000000000 +0100 @@ -1,3 +1,32 @@ +# POST_INSTALL is run after the installation of the package + +# Copyright Notice +# +# Copyright (C) 2014 SUPELEC +# Copyright (C) 2015 CentraleSupelec +# +# Author: Julien Bect <[email protected]> + +# Copying Permission Statement +# +# This file is part of +# +# STK: a Small (Matlab/Octave) Toolbox for Kriging +# (http://sourceforge.net/projects/kriging) +# +# STK is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# STK is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public +# License for more details. +# +# You should have received a copy of the GNU General Public License +# along with STK. If not, see <http://www.gnu.org/licenses/>. + function post_install (desc) root = desc.dir; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stk/src/Makefile new/stk/src/Makefile --- old/stk/src/Makefile 2015-10-11 08:36:22.000000000 +0200 +++ new/stk/src/Makefile 2015-11-06 19:05:05.000000000 +0100 @@ -23,3 +23,8 @@ __%__.mex: %.c stk_mex.h $(MKOCTFILE) --mex --output $@ $< + +.PHONY: clean + +clean: + rm -f *.o *.mex
