Menu
▾
▴
octave-cvsupdate — CVS update notifications
This list is closed, nobody may subscribe to it.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(10) |
Aug
(5) |
Sep
(3) |
Oct
(41) |
Nov
(41) |
Dec
(33) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(75) |
Feb
(10) |
Mar
(170) |
Apr
(174) |
May
(66) |
Jun
(11) |
Jul
(10) |
Aug
(44) |
Sep
(73) |
Oct
(28) |
Nov
(139) |
Dec
(52) |
| 2003 |
Jan
(35) |
Feb
(93) |
Mar
(62) |
Apr
(10) |
May
(55) |
Jun
(70) |
Jul
(37) |
Aug
(16) |
Sep
(56) |
Oct
(31) |
Nov
(57) |
Dec
(83) |
| 2004 |
Jan
(85) |
Feb
(67) |
Mar
(27) |
Apr
(37) |
May
(75) |
Jun
(85) |
Jul
(160) |
Aug
(68) |
Sep
(104) |
Oct
(25) |
Nov
(39) |
Dec
(23) |
| 2005 |
Jan
(10) |
Feb
(45) |
Mar
(43) |
Apr
(19) |
May
(108) |
Jun
(31) |
Jul
(41) |
Aug
(23) |
Sep
(65) |
Oct
(58) |
Nov
(44) |
Dec
(54) |
| 2006 |
Jan
(96) |
Feb
(27) |
Mar
(69) |
Apr
(59) |
May
(67) |
Jun
(35) |
Jul
(13) |
Aug
(461) |
Sep
(160) |
Oct
(399) |
Nov
(32) |
Dec
(72) |
| 2007 |
Jan
(316) |
Feb
(305) |
Mar
(318) |
Apr
(54) |
May
(194) |
Jun
(173) |
Jul
(282) |
Aug
(91) |
Sep
(227) |
Oct
(365) |
Nov
(168) |
Dec
(18) |
| 2008 |
Jan
(71) |
Feb
(111) |
Mar
(155) |
Apr
(173) |
May
(70) |
Jun
(67) |
Jul
(55) |
Aug
(83) |
Sep
(32) |
Oct
(68) |
Nov
(80) |
Dec
(29) |
| 2009 |
Jan
(46) |
Feb
(18) |
Mar
(95) |
Apr
(76) |
May
(140) |
Jun
(98) |
Jul
(84) |
Aug
(123) |
Sep
(94) |
Oct
(131) |
Nov
(142) |
Dec
(125) |
| 2010 |
Jan
(128) |
Feb
(158) |
Mar
(172) |
Apr
(134) |
May
(94) |
Jun
(84) |
Jul
(32) |
Aug
(127) |
Sep
(167) |
Oct
(109) |
Nov
(69) |
Dec
(78) |
| 2011 |
Jan
(39) |
Feb
(58) |
Mar
(52) |
Apr
(47) |
May
(56) |
Jun
(76) |
Jul
(55) |
Aug
(54) |
Sep
(165) |
Oct
(255) |
Nov
(328) |
Dec
(263) |
| 2012 |
Jan
(82) |
Feb
(147) |
Mar
(400) |
Apr
(216) |
May
(209) |
Jun
(160) |
Jul
(86) |
Aug
(141) |
Sep
(156) |
Oct
(6) |
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(2) |
| 2016 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(4) |
Jun
(8) |
Jul
(2) |
Aug
(5) |
Sep
(9) |
Oct
|
Nov
|
Dec
|
|
From: <aba...@us...> - 2012-07-03 14:57:31
|
Revision: 10723
http://octave.svn.sourceforge.net/octave/?rev=10723&view=rev
Author: abarth93
Date: 2012-07-03 14:57:21 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
add license
Modified Paths:
--------------
trunk/octave-forge/extra/ncArray/DESCRIPTION
trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m
trunk/octave-forge/extra/ncArray/inst/cached_decompress.m
trunk/octave-forge/extra/ncArray/inst/ncCatArray.m
trunk/octave-forge/extra/ncArray/inst/nccoord.m
trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
Added Paths:
-----------
trunk/octave-forge/extra/ncArray/INDEX
Modified: trunk/octave-forge/extra/ncArray/DESCRIPTION
===================================================================
--- trunk/octave-forge/extra/ncArray/DESCRIPTION 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/DESCRIPTION 2012-07-03 14:57:21 UTC (rev 10723)
@@ -5,7 +5,8 @@
Maintainer: Alexander Barth <bar...@gm...>
Title: ncArray
Description: Subsetting and concatenating of NetCDF files
-Depends: octave (>= 3.4.0)
+Categories: IO
+Depends: octave (>= 3.4.0), octcdf (>= 1.1.5)
Autoload: yes
License: GPL version 2 or later
-Url: http://octave.sf.net
+Url: http://octave.sf.net, http://modb.oce.ulg.ac.be/mediawiki/index.php/ncArray
Added: trunk/octave-forge/extra/ncArray/INDEX
===================================================================
--- trunk/octave-forge/extra/ncArray/INDEX (rev 0)
+++ trunk/octave-forge/extra/ncArray/INDEX 2012-07-03 14:57:21 UTC (rev 10723)
@@ -0,0 +1,5 @@
+ncarray >> ncArray
+ncArray
+ ncCatArray
+ ncArray
+ nccoord
\ No newline at end of file
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m 2012-07-03 14:57:21 UTC (rev 10723)
@@ -1,4 +1,5 @@
-% sz size of the array (with at least two elements)
+% create a BaseArray of size size sz
+% sz has at least two elements.
function retval = BaseArray(sz)
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m 2012-07-03 14:57:21 UTC (rev 10723)
@@ -1,3 +1,5 @@
+% make full (dense) array
+
function F = full(self);
n = length(self.sz);
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m 2012-07-03 14:57:21 UTC (rev 10723)
@@ -1,3 +1,4 @@
+
function s = prod(self,varargin)
funred = @times;
Modified: trunk/octave-forge/extra/ncArray/inst/cached_decompress.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/cached_decompress.m 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/inst/cached_decompress.m 2012-07-03 14:57:21 UTC (rev 10723)
@@ -1,19 +1,17 @@
+% Decompress a file using a cache.
% [fname,success]=cached_decompress(filename)
%
-% Decompress a file if it is not already in cache
-%
% Input:
% filename: name of the file which is possibly compressed
%
% Output:
% fname: the filename of the uncompressed file
-%
% Alexander Barth, 2012-06-13
%
+function [fname]=cached_decompress(url)
-function [fname]=cached_decompress(url)
global CASHED_GUNZIP_DIR
global CASHED_GUNZIP_LOG_FID
Modified: trunk/octave-forge/extra/ncArray/inst/ncCatArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/ncCatArray.m 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/inst/ncCatArray.m 2012-07-03 14:57:21 UTC (rev 10723)
@@ -1,3 +1,5 @@
+% Create an array that represent a concatenated NetCDF variables.
+%
% C = ncCatArray(dim,filenames,varname)
% C = ncCatArray(dim,pattern,varname)
% C = ncCatArray(dim,filenamefun,varname,range)
Modified: trunk/octave-forge/extra/ncArray/inst/nccoord.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/nccoord.m 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/inst/nccoord.m 2012-07-03 14:57:21 UTC (rev 10723)
@@ -1,6 +1,14 @@
+% Coordinate of a NetCDF variable
% coord = nccoord(filename,varname)
-% get coordinates of a variables using CF convention
+% get coordinates of the variable varname in the
+% netcdf file called filename. The netcdf is assumed to
+% follow the CF convention.
+% coord is an array of structures with the field 'name'
+% for the variable name and 'dims' with a cell-array of the
+% netcdf dimensions.
+% Author: Alexander Barth (bar...@gm...)
+
function [dims,coord] = nccoord(filename,varname)
finfo = ncinfo(filename);
Modified: trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/test_ncarray.m 2012-07-03 13:59:38 UTC (rev 10722)
+++ trunk/octave-forge/extra/ncArray/inst/test_ncarray.m 2012-07-03 14:57:21 UTC (rev 10723)
@@ -1,5 +1,5 @@
-%function test_ncarray()
% test ncBaseArray, ncCatArray and ncArray
+function test_ncarray()
varname = 'SST';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 13:59:47
|
Revision: 10722
http://octave.svn.sourceforge.net/octave/?rev=10722&view=rev
Author: abarth93
Date: 2012-07-03 13:59:38 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/octave-forge/main/optiminterp/inst/test_optiminterp.m
Modified: trunk/octave-forge/main/optiminterp/inst/test_optiminterp.m
===================================================================
--- trunk/octave-forge/main/optiminterp/inst/test_optiminterp.m 2012-07-03 13:38:39 UTC (rev 10721)
+++ trunk/octave-forge/main/optiminterp/inst/test_optiminterp.m 2012-07-03 13:59:38 UTC (rev 10722)
@@ -13,7 +13,7 @@
%% You should have received a copy of the GNU General Public License along with
%% this program; if not, see <http://www.gnu.org/licenses/>.
-% Tests 1D, 2D and 3D optimal interpolation.
+% Tests 1D, 2D, 3D and 4D optimal interpolation.
% All tests should pass; any error indicates that either
% there is a bug in the optimal interpolation package or
% that it is incrorrectly installed.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 13:38:51
|
Revision: 10721
http://octave.svn.sourceforge.net/octave/?rev=10721&view=rev
Author: abarth93
Date: 2012-07-03 13:38:39 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
add license
Modified Paths:
--------------
trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/end.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/mean.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/reduce.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/size.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/std.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/sumsq.m
trunk/octave-forge/extra/ncArray/inst/@BaseArray/var.m
trunk/octave-forge/extra/ncArray/inst/@CatArray/CatArray.m
trunk/octave-forge/extra/ncArray/inst/@CatArray/display.m
trunk/octave-forge/extra/ncArray/inst/@CatArray/idx_global_local_.m
trunk/octave-forge/extra/ncArray/inst/@CatArray/subsasgn.m
trunk/octave-forge/extra/ncArray/inst/@CatArray/subsref.m
trunk/octave-forge/extra/ncArray/inst/@ncArray/coord.m
trunk/octave-forge/extra/ncArray/inst/@ncArray/ncArray.m
trunk/octave-forge/extra/ncArray/inst/@ncArray/subsasgn.m
trunk/octave-forge/extra/ncArray/inst/@ncArray/subsref.m
trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/display.m
trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncBaseArray.m
trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncsub.m
trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsasgn.m
trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsref.m
trunk/octave-forge/extra/ncArray/inst/cached_decompress.m
trunk/octave-forge/extra/ncArray/inst/ncCatArray.m
trunk/octave-forge/extra/ncArray/inst/nccoord.m
trunk/octave-forge/extra/ncArray/inst/private/ncarray_example_file.m
trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/BaseArray.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -4,4 +4,21 @@
self.sz = sz;
-retval = class(self,'BaseArray');
\ No newline at end of file
+retval = class(self,'BaseArray');
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/end.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/end.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/end.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -1,3 +1,21 @@
function e = end(self,k,n)
e = size(self,k);
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/full.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -7,4 +7,21 @@
idx.subs{i} = ':';
end
-F = subsref(self,idx);
\ No newline at end of file
+F = subsref(self,idx);
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/max.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -11,3 +11,21 @@
funelem = @(x) x;
s = reduce(self,funred,funelem,varargin{:});
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/mean.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/mean.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/mean.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -14,3 +14,21 @@
else
s = s/n;
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/min.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -11,3 +11,21 @@
funelem = @(x) x;
s = reduce(self,funred,funelem,varargin{:});
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/prod.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -8,3 +8,21 @@
if isempty(s)
s = 1;
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/reduce.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/reduce.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/reduce.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -32,3 +32,21 @@
s = funred(s,funelem(subsref(self,idx)));
end
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/size.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/size.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/size.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -10,3 +10,21 @@
end
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/std.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/std.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/std.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -5,3 +5,21 @@
function s = std(self,varargin)
s = sqrt(var(self,varargin{:}));
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/sum.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -13,3 +13,21 @@
if isempty(s)
s = 0;
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/sumsq.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/sumsq.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/sumsq.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -13,3 +13,21 @@
if isempty(s)
s = 1;
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@BaseArray/var.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@BaseArray/var.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@BaseArray/var.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -27,3 +27,21 @@
s = s/n;
end
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@CatArray/CatArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@CatArray/CatArray.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@CatArray/CatArray.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -68,3 +68,21 @@
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@CatArray/display.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@CatArray/display.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@CatArray/display.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -3,4 +3,21 @@
for i=1:self.na
display(self.arrays{i})
end
-
\ No newline at end of file
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@CatArray/idx_global_local_.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@CatArray/idx_global_local_.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@CatArray/idx_global_local_.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -56,3 +56,21 @@
end
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@CatArray/subsasgn.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@CatArray/subsasgn.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@CatArray/subsasgn.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -11,4 +11,21 @@
% set subset in j-th array
subsasgn(self.arrays{j},idx_local{j},subset);
-end
\ No newline at end of file
+end
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@CatArray/subsref.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@CatArray/subsref.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@CatArray/subsref.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -78,4 +78,21 @@
B = subsasgn(B,idx_global{j},subset);
end
-end
\ No newline at end of file
+end
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncArray/coord.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncArray/coord.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncArray/coord.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -1,3 +1,20 @@
function c = coord(self)
c = self.coord;
-%'her'
\ No newline at end of file
+%'her'
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncArray/ncArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncArray/ncArray.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncArray/ncArray.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -64,3 +64,21 @@
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncArray/subsasgn.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncArray/subsasgn.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncArray/subsasgn.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -1,3 +1,21 @@
function self = subsasgn(self,idx,x)
self = subsasgn(self.var,idx,x);
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncArray/subsref.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncArray/subsref.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncArray/subsref.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -29,4 +29,21 @@
else
% pass subsref to underlying ncBaseArray
varargout{1} = subsref(self.var,idx);
-end
\ No newline at end of file
+end
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/display.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/display.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/display.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -2,3 +2,21 @@
disp([self.varname ' from ' self.filename]);
%self.vinfo
%self.dims
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncBaseArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncBaseArray.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncBaseArray.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -60,3 +60,21 @@
retval = class(self,'ncBaseArray',BaseArray(self.sz));
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncsub.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncsub.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/ncsub.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -58,4 +58,21 @@
start = start(1:n);
stride = stride(1:n);
end
-end
\ No newline at end of file
+end
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsasgn.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsasgn.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsasgn.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -8,3 +8,21 @@
if all(count ~= 0)
ncwrite(self.filename,self.varname,x,start,stride);
end
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsref.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsref.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/@ncBaseArray/subsref.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -62,4 +62,21 @@
else
error('not supported');
-end
\ No newline at end of file
+end
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/cached_decompress.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/cached_decompress.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/cached_decompress.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -113,4 +113,21 @@
if status ~= 0
error(['command "' cmd '" failed: ' output]);
end
-end
\ No newline at end of file
+end
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/ncCatArray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/ncCatArray.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/ncCatArray.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -92,6 +92,10 @@
CA = CatArray(dim,arrays);
end
+
+
+
+
% Copyright (C) 2012 Alexander Barth <bar...@gm...>
%
% This program is free software; you can redistribute it and/or modify
@@ -107,5 +111,3 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-
-
Modified: trunk/octave-forge/extra/ncArray/inst/nccoord.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/nccoord.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/nccoord.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -51,4 +51,21 @@
end
end
-end
\ No newline at end of file
+end
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/private/ncarray_example_file.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/private/ncarray_example_file.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/private/ncarray_example_file.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -32,4 +32,21 @@
% global attributes
nc{'SST'}(:) = permute(data,[3 2 1]);
-close(nc)
\ No newline at end of file
+close(nc)
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
Modified: trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/test_ncarray.m 2012-07-03 13:28:45 UTC (rev 10720)
+++ trunk/octave-forge/extra/ncArray/inst/test_ncarray.m 2012-07-03 13:38:39 UTC (rev 10721)
@@ -80,9 +80,9 @@
% sum
-momentSST = moment(SST,2,1);
-momentSSTref = moment(SST_ref,2,1);
-assert(isequalwithequalnans(momentSST, momentSSTref))
+%momentSST = moment(SST,2,1);
+%momentSSTref = moment(SST_ref,2,1);
+%assert(isequalwithequalnans(momentSST, momentSSTref))
sumSST = sum(SST,1);
@@ -338,3 +338,21 @@
assert(strcmp(CA2.units,'degC'));
disp('All tests passed.')
+
+
+
+% Copyright (C) 2012 Alexander Barth <bar...@gm...>
+%
+% This program 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 2 of the License, or
+% (at your option) any later version.
+%
+% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 13:28:55
|
Revision: 10720
http://octave.svn.sourceforge.net/octave/?rev=10720&view=rev
Author: abarth93
Date: 2012-07-03 13:28:45 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/octave-forge/extra/ncArray/inst/cached_decompress.m
trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
Modified: trunk/octave-forge/extra/ncArray/inst/cached_decompress.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/cached_decompress.m 2012-07-03 13:21:20 UTC (rev 10719)
+++ trunk/octave-forge/extra/ncArray/inst/cached_decompress.m 2012-07-03 13:28:45 UTC (rev 10720)
@@ -8,9 +8,7 @@
% Output:
% fname: the filename of the uncompressed file
%
-% Example:
-%
-%
+
% Alexander Barth, 2012-06-13
%
Modified: trunk/octave-forge/extra/ncArray/inst/test_ncarray.m
===================================================================
--- trunk/octave-forge/extra/ncArray/inst/test_ncarray.m 2012-07-03 13:21:20 UTC (rev 10719)
+++ trunk/octave-forge/extra/ncArray/inst/test_ncarray.m 2012-07-03 13:28:45 UTC (rev 10720)
@@ -79,6 +79,12 @@
% sum
+
+momentSST = moment(SST,2,1);
+momentSSTref = moment(SST_ref,2,1);
+assert(isequalwithequalnans(momentSST, momentSSTref))
+
+
sumSST = sum(SST,1);
sumSSTref = sum(SST_ref,1);
assert(isequalwithequalnans(sumSST, sumSSTref))
@@ -99,11 +105,11 @@
prodSSTref = prod(SST_ref);
assert(isequalwithequalnans(prodSST, prodSSTref))
+% only for octave
+%sumsqSST = sumsq(SST);
+%sumsqSSTref = sumsq(SST_ref); % does not work in matlab
+%assert(isequalwithequalnans(sumsqSST, sumsqSSTref))
-sumsqSST = sumsq(SST);
-sumsqSSTref = sumsq(SST_ref);
-assert(isequalwithequalnans(sumsqSST, sumsqSSTref))
-
meanSST = mean(SST);
meanSSTref = mean(SST_ref);
assert(isequalwithequalnans(meanSST, meanSSTref))
@@ -231,6 +237,10 @@
ind = floor(numel(SST_ref) * rand(100,1))+1;
assert(isequalwithequalnans(CA2(ind),SST_ref(ind)))
+meanSST = mean(CA2,3);
+meanSSTref = mean(SST_ref,3);
+assert(isequalwithequalnans(meanSST, meanSSTref))
+
% writing
for i=1:3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 13:21:30
|
Revision: 10719
http://octave.svn.sourceforge.net/octave/?rev=10719&view=rev
Author: abarth93
Date: 2012-07-03 13:21:20 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/octave-forge/main/octcdf/inst/ncinfo.m
trunk/octave-forge/main/octcdf/inst/ncwrite.m
Modified: trunk/octave-forge/main/octcdf/inst/ncinfo.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/ncinfo.m 2012-07-03 12:55:44 UTC (rev 10718)
+++ trunk/octave-forge/main/octcdf/inst/ncinfo.m 2012-07-03 13:21:20 UTC (rev 10719)
@@ -55,3 +55,19 @@
end
+
+
+%% Copyright (C) 2012 Alexander Barth
+%%
+%% This program 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 2 of the License, or
+%% (at your option) any later version.
+%%
+%% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
Modified: trunk/octave-forge/main/octcdf/inst/ncwrite.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/ncwrite.m 2012-07-03 12:55:44 UTC (rev 10718)
+++ trunk/octave-forge/main/octcdf/inst/ncwrite.m 2012-07-03 13:21:20 UTC (rev 10719)
@@ -71,3 +71,18 @@
nv = subsasgn(nv,subsr,x);
close(nc)
+
+%% Copyright (C) 2012 Alexander Barth
+%%
+%% This program 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 2 of the License, or
+%% (at your option) any later version.
+%%
+%% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 12:55:53
|
Revision: 10718
http://octave.svn.sourceforge.net/octave/?rev=10718&view=rev
Author: abarth93
Date: 2012-07-03 12:55:44 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/octave-forge/main/octcdf/inst/ncinfo.m
trunk/octave-forge/main/octcdf/inst/ncread.m
trunk/octave-forge/main/octcdf/inst/ncwrite.m
Modified: trunk/octave-forge/main/octcdf/inst/ncinfo.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/ncinfo.m 2012-07-03 12:45:00 UTC (rev 10717)
+++ trunk/octave-forge/main/octcdf/inst/ncinfo.m 2012-07-03 12:55:44 UTC (rev 10718)
@@ -1,7 +1,7 @@
% finfo = ncinfo(filename)
% vinfo = ncinfo(filename,varname)
-% return information about variable varname in netCDF
-% file filename
+% return information about complete netCDF file (filename) or about
+% the specific variable varname.
function info = ncinfo(filename,varname)
Modified: trunk/octave-forge/main/octcdf/inst/ncread.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/ncread.m 2012-07-03 12:45:00 UTC (rev 10717)
+++ trunk/octave-forge/main/octcdf/inst/ncread.m 2012-07-03 12:55:44 UTC (rev 10718)
@@ -1,6 +1,9 @@
% x = ncread(filename,varname)
% x = ncread(filename,varname,start,count,stride)
% read the variable varname from file filename.
+% The parameter start contains the starting indices, count
+% is the number of elements and stride the increment between
+% two successive elements (default 1).
function x = ncread(filename,varname,start,count,stride)
@@ -74,3 +77,19 @@
x = permute(x,[ndims(x):-1:1]);
x = reshape(x,count);
close(nc)
+
+
+%% Copyright (C) 2012 Alexander Barth
+%%
+%% This program 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 2 of the License, or
+%% (at your option) any later version.
+%%
+%% This program 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 this program; If not, see <http://www.gnu.org/licenses/>.
Modified: trunk/octave-forge/main/octcdf/inst/ncwrite.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/ncwrite.m 2012-07-03 12:45:00 UTC (rev 10717)
+++ trunk/octave-forge/main/octcdf/inst/ncwrite.m 2012-07-03 12:55:44 UTC (rev 10718)
@@ -1,6 +1,9 @@
% ncwrite(filename,varname,x)
% ncwrite(filename,varname,x,start,stride)
% write the variable varname to file filename.
+% The parameter start contains the starting indices
+% and stride the increment between
+% two successive elements (default 1).
function ncwrite(filename,varname,x,start,stride)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-07-03 12:45:09
|
Revision: 10717
http://octave.svn.sourceforge.net/octave/?rev=10717&view=rev
Author: paramaniac
Date: 2012-07-03 12:45:00 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
control: remove custom lapack
Removed Paths:
-------------
trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack
trunk/octave-forge/main/control/devel/lapack-3.4.1.tgz
Deleted: trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack
===================================================================
--- trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack 2012-07-03 12:39:16 UTC (rev 10716)
+++ trunk/octave-forge/main/control/devel/Makefile.ReferenceLapack 2012-07-03 12:45:00 UTC (rev 10717)
@@ -1,77 +0,0 @@
-MKOCTFILE ?= mkoctfile
-
-ifndef LAPACK_LIBS
-LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
-endif
-ifndef BLAS_LIBS
-BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS)
-endif
-ifndef FLIBS
-FLIBS := $(shell $(MKOCTFILE) -p FLIBS)
-endif
-MKOCTFILE ?= mkoctfile
-
-# LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
-# BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS)
-FLIBS := $(shell $(MKOCTFILE) -p FLIBS)
-
-all: control_slicot_functions.oct \
- is_real_scalar.oct \
- is_real_vector.oct \
- is_real_matrix.oct \
- is_real_square_matrix.oct
-
-# TODO: Private oct-files for control package.
-
-# unpack and compile SLICOT library
-# Note that TG04BX is a custom routine.
-# It has the extension .fortran such that
-# it is not deleted by rm *.f when using
-# the developer makefile makefile_control.m
-slicotlibrary.a: slicot.tar.gz
- tar -xzf slicot.tar.gz
- mv slicot/src/*.f .
- mv slicot/src_aux/*.f .
- cp TG04BX.fortran TG04BX.f
- $(MKOCTFILE) -c *.f
- ar -rc slicotlibrary.a *.o
- rm -rf *.o *.f slicot
-
-# reference lapack is just included for debugging purposes
-# it will be removed again before an official release of the control package
-lapacklibrary.a: lapack-3.4.1.tgz
- tar -xzf lapack-3.4.1.tgz
- mv lapack-3.4.1/BLAS/SRC/*.f .
- mv lapack-3.4.1/INSTALL/*.f .
- mv lapack-3.4.1/SRC/*.f .
- $(MKOCTFILE) -c *.f
- ar -rc lapacklibrary.a *.o
- rm -rf *.o *.f lapack-3.4.1
-
-# slicot functions
-control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a lapacklibrary.a
- $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \
- ${FLIBS}
-# slicot functions
-#control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a
-# $(MKOCTFILE) control_slicot_functions.cc common.cc slicotlibrary.a \
-# ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS}
-
-# helpers
-is_real_scalar.oct: is_real_scalar.cc
- $(MKOCTFILE) is_real_scalar.cc
-
-is_real_vector.oct: is_real_vector.cc
- $(MKOCTFILE) is_real_vector.cc
-
-is_real_matrix.oct: is_real_matrix.cc
- $(MKOCTFILE) is_real_matrix.cc
-
-is_real_square_matrix.oct: is_real_square_matrix.cc
- $(MKOCTFILE) is_real_square_matrix.cc
-
-clean:
- rm -rf *.o core octave-core *.oct *~ *.f slicot lapack-3.4.1
-
-realclean: clean
- rm -rf *.a
\ No newline at end of file
Deleted: trunk/octave-forge/main/control/devel/lapack-3.4.1.tgz
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 12:39:22
|
Revision: 10716
http://octave.svn.sourceforge.net/octave/?rev=10716&view=rev
Author: abarth93
Date: 2012-07-03 12:39:16 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Added Paths:
-----------
trunk/octave-forge/main/octcdf/NEWS
Added: trunk/octave-forge/main/octcdf/NEWS
===================================================================
--- trunk/octave-forge/main/octcdf/NEWS (rev 0)
+++ trunk/octave-forge/main/octcdf/NEWS 2012-07-03 12:39:16 UTC (rev 10716)
@@ -0,0 +1,7 @@
+Summary of important user-visible changes for octcdf 1.1.5:
+-------------------------------------------------------------------
+
+ ** The following functions are new:
+ ncread
+ ncwrite
+ ncinfo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 12:38:44
|
Revision: 10715
http://octave.svn.sourceforge.net/octave/?rev=10715&view=rev
Author: abarth93
Date: 2012-07-03 12:38:34 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/octave-forge/main/octcdf/DESCRIPTION
Modified: trunk/octave-forge/main/octcdf/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/octcdf/DESCRIPTION 2012-07-03 12:35:14 UTC (rev 10714)
+++ trunk/octave-forge/main/octcdf/DESCRIPTION 2012-07-03 12:38:34 UTC (rev 10715)
@@ -1,6 +1,6 @@
Name: octcdf
Version: 1.1.5
-Date: 2012-04-30
+Date: 2012-07-03
Author: Alexander Barth <bar...@gm...>
Maintainer: Alexander Barth <bar...@gm...>
Title: octcdf
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aba...@us...> - 2012-07-03 12:35:21
|
Revision: 10714
http://octave.svn.sourceforge.net/octave/?rev=10714&view=rev
Author: abarth93
Date: 2012-07-03 12:35:14 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/octave-forge/main/octcdf/DESCRIPTION
trunk/octave-forge/main/octcdf/inst/ncread.m
trunk/octave-forge/main/octcdf/src/Makeconf.in
trunk/octave-forge/main/octcdf/src/Makefile
trunk/octave-forge/main/octcdf/src/configure.base
Modified: trunk/octave-forge/main/octcdf/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/octcdf/DESCRIPTION 2012-07-03 12:06:21 UTC (rev 10713)
+++ trunk/octave-forge/main/octcdf/DESCRIPTION 2012-07-03 12:35:14 UTC (rev 10714)
@@ -1,6 +1,6 @@
Name: octcdf
-Version: 1.1.4
-Date: 2012-02-17
+Version: 1.1.5
+Date: 2012-04-30
Author: Alexander Barth <bar...@gm...>
Maintainer: Alexander Barth <bar...@gm...>
Title: octcdf
Modified: trunk/octave-forge/main/octcdf/inst/ncread.m
===================================================================
--- trunk/octave-forge/main/octcdf/inst/ncread.m 2012-07-03 12:06:21 UTC (rev 10713)
+++ trunk/octave-forge/main/octcdf/inst/ncread.m 2012-07-03 12:35:14 UTC (rev 10714)
@@ -21,14 +21,18 @@
stride = ones(1,nd);
end
+% replace inf in count
+i = count == inf;
+count(i) = (sz(i)-start(i))./stride(i) + 1;
+
% end index
endi = start + (count-1).*stride;
% replace inf in count
-i = endi == inf;
-endi(i) = sz(i);
+%i = endi == inf;
+%endi(i) = sz(i);
% load data
@@ -68,5 +72,5 @@
end
x = permute(x,[ndims(x):-1:1]);
-
+x = reshape(x,count);
close(nc)
Modified: trunk/octave-forge/main/octcdf/src/Makeconf.in
===================================================================
--- trunk/octave-forge/main/octcdf/src/Makeconf.in 2012-07-03 12:06:21 UTC (rev 10713)
+++ trunk/octave-forge/main/octcdf/src/Makeconf.in 2012-07-03 12:35:14 UTC (rev 10714)
@@ -36,18 +36,18 @@
# cannot use mkoctfile directly can request the flags that mkoctfile
# would use as follows:
# FLAG = $(shell $(MKOCTFILE) -p FLAG)
-# The following flags are for compiling programs that are independent
-# of Octave. How confusing.
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CPICFLAG = @CPICFLAG@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CXXPICFLAG = @CXXPICFLAG@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPICFLAG = @FPICFLAG@
+# # The following flags are for compiling programs that are independent
+# # of Octave. How confusing.
+# CC = @CC@
+# CFLAGS = @CFLAGS@
+# CPPFLAGS = @CPPFLAGS@
+# CPICFLAG = @CPICFLAG@
+# CXX = @CXX@
+# CXXFLAGS = @CXXFLAGS@
+# CXXPICFLAG = @CXXPICFLAG@
+# F77 = @F77@
+# FFLAGS = @FFLAGS@
+# FPICFLAG = @FPICFLAG@
OCTAVE = @OCTAVE@
OCTAVE_VERSION = @OCTAVE_VERSION@
Modified: trunk/octave-forge/main/octcdf/src/Makefile
===================================================================
--- trunk/octave-forge/main/octcdf/src/Makefile 2012-07-03 12:06:21 UTC (rev 10713)
+++ trunk/octave-forge/main/octcdf/src/Makefile 2012-07-03 12:35:14 UTC (rev 10714)
@@ -70,5 +70,4 @@
$(MFILES): nctype.m4
m4 --define=TYPE=$(patsubst nc%.m,%,$@) nctype.m4 > $@
-clean: ; -$(RM) *.o core* octave-core *.oct *~ *.nc
-
+clean: ; -$(RM) -R *.o core* octave-core *.oct *~ *.nc autom4te.cache
Modified: trunk/octave-forge/main/octcdf/src/configure.base
===================================================================
--- trunk/octave-forge/main/octcdf/src/configure.base 2012-07-03 12:06:21 UTC (rev 10713)
+++ trunk/octave-forge/main/octcdf/src/configure.base 2012-07-03 12:35:14 UTC (rev 10714)
@@ -152,41 +152,51 @@
dnl *******************************************************************
+dnl Get LDFLAGS and CPPFLAGS set by user
+dnl These flags will be added to the mkoctfile command line
+OCTCDF_LIBS="$LDFLAGS"
+OCTCDF_CFLAGS="$CPPFLAGS"
+
+
dnl XXX FIXME XXX Should we allow the user to override these?
dnl Do we even need them? The individual makefiles can call mkoctfile -p
dnl themselves, so the only reason to keep them is for configure, and
dnl for those things which are not built using mkoctfile (e.g., aurecord)
dnl but it is not clear we should be using octave compile flags for those.
-dnl C compiler and flags
-AC_MSG_RESULT([retrieving compile and link flags from $MKOCTFILE])
-CC=`$MKOCTFILE -p CC`
-CFLAGS=`$MKOCTFILE -p CFLAGS`
-CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
-CPICFLAG=`$MKOCTFILE -p CPICFLAG`
-LDFLAGS=`$MKOCTFILE -p LDFLAGS`
-LIBS=`$MKOCTFILE -p LIBS`
-AC_SUBST(CC)
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(CPICFLAG)
+dnl octcdf does not need CFLAGS, CPPFLAGS,... from mkoctfile
+dnl -> comment corresponding lines
-dnl Fortran compiler and flags
-F77=`$MKOCTFILE -p F77`
-FFLAGS=`$MKOCTFILE -p FFLAGS`
-FPICFLAG=`$MKOCTFILE -p FPICFLAG`
-AC_SUBST(F77)
-AC_SUBST(FFLAGS)
-AC_SUBST(FPICFLAG)
+# dnl C compiler and flags
+# AC_MSG_RESULT([retrieving compile and link flags from $MKOCTFILE])
+# CC=`$MKOCTFILE -p CC`
+# CFLAGS=`$MKOCTFILE -p CFLAGS`
+# CPPFLAGS=`$MKOCTFILE -p CPPFLAGS`
+# CPPFLAGS="not used"
+# CPICFLAG=`$MKOCTFILE -p CPICFLAG`
+# LDFLAGS=`$MKOCTFILE -p LDFLAGS`
+# LIBS=`$MKOCTFILE -p LIBS`
+# AC_SUBST(CC)
+# AC_SUBST(CFLAGS)
+# AC_SUBST(CPPFLAGS)
+# AC_SUBST(CPICFLAG)
-dnl C++ compiler and flags
-CXX=`$MKOCTFILE -p CXX`
-CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
-CXXPICFLAG=`$MKOCTFILE -p CXXPICFLAG`
-AC_SUBST(CXX)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(CXXPICFLAG)
+# dnl Fortran compiler and flags
+# F77=`$MKOCTFILE -p F77`
+# FFLAGS=`$MKOCTFILE -p FFLAGS`
+# FPICFLAG=`$MKOCTFILE -p FPICFLAG`
+# AC_SUBST(F77)
+# AC_SUBST(FFLAGS)
+# AC_SUBST(FPICFLAG)
+# dnl C++ compiler and flags
+# CXX=`$MKOCTFILE -p CXX`
+# CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
+# CXXPICFLAG=`$MKOCTFILE -p CXXPICFLAG`
+# AC_SUBST(CXX)
+# AC_SUBST(CXXFLAGS)
+# AC_SUBST(CXXPICFLAG)
+
dnl *******************************************************************
dnl Check for features of your version of mkoctfile.
@@ -298,13 +308,6 @@
;;
esac
-AC_SUBST(HAVE_NETCDF)
-AC_SUBST(OCTCDF_LIBS)
-AC_SUBST(OCTCDF_CFLAGS)
-
-OCTCDF_LIBS="$LDFLAGS"
-OCTCDF_CFLAGS="$CPPFLAGS"
-
dnl first checking for nc-config, then nc-dap
AC_MSG_CHECKING([for nc-config])
@@ -328,6 +331,7 @@
AC_MSG_RESULT([no])
dnl if no opendap, checking if the NetCDF library exists.
+ dnl AC_CHECK_LIB takes the value of LDFLAGS into account
AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
@@ -335,11 +339,17 @@
OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
dnl we have the libraries, no we have also the headers?
+ dnl AC_CHECK_HEADER takes the value of CPPFLAGS into account
+
AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
fi
fi
fi
+AC_SUBST(HAVE_NETCDF)
+AC_SUBST(OCTCDF_LIBS)
+AC_SUBST(OCTCDF_CFLAGS)
+
if test $HAVE_NETCDF = yes ; then
OCTCDFSTATUS=yes
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-07-03 12:06:32
|
Revision: 10713
http://octave.svn.sourceforge.net/octave/?rev=10713&view=rev
Author: paramaniac
Date: 2012-07-03 12:06:21 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
control-devel: remove custom lapack from makefile
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/src/Makefile
Removed Paths:
-------------
trunk/octave-forge/extra/control-devel/src/lapack-3.4.1.tgz
Modified: trunk/octave-forge/extra/control-devel/src/Makefile
===================================================================
--- trunk/octave-forge/extra/control-devel/src/Makefile 2012-07-03 09:56:20 UTC (rev 10712)
+++ trunk/octave-forge/extra/control-devel/src/Makefile 2012-07-03 12:06:21 UTC (rev 10713)
@@ -1,7 +1,16 @@
-# LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
-# BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
-FLIBS := $(shell mkoctfile -p FLIBS)
+MKOCTFILE ?= mkoctfile
+ifndef LAPACK_LIBS
+LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS)
+endif
+ifndef BLAS_LIBS
+BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS)
+endif
+ifndef FLIBS
+FLIBS := $(shell $(MKOCTFILE) -p FLIBS)
+endif
+LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+
all: devel_slicot_functions.oct \
is_matrix.oct
@@ -10,30 +19,21 @@
tar -xzf slicot.tar.gz
mv slicot/src/*.f .
mv slicot/src_aux/*.f .
- mkoctfile -c *.f
+ $(MKOCTFILE) -c *.f
ar -rc slicotlibrary.a *.o
rm -rf *.o *.f slicot
-lapacklibrary.a: lapack-3.4.1.tgz
- tar -xzf lapack-3.4.1.tgz
- mv lapack-3.4.1/BLAS/SRC/*.f .
- mv lapack-3.4.1/INSTALL/*.f .
- mv lapack-3.4.1/SRC/*.f .
- mkoctfile -c *.f
- ar -rc lapacklibrary.a *.o
- rm -rf *.o *.f lapack-3.4.1
-
# slicot functions
-devel_slicot_functions.oct: devel_slicot_functions.cc slicotlibrary.a lapacklibrary.a
- mkoctfile devel_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \
- ${FLIBS}
+devel_slicot_functions.oct: devel_slicot_functions.cc slicotlibrary.a
+ LFLAGS="$(LFLAGS)" \
+ $(MKOCTFILE) devel_slicot_functions.cc common.cc slicotlibrary.a
# helpers
is_matrix.oct: is_matrix.cc
- mkoctfile is_matrix.cc
+ $(MKOCTFILE) is_matrix.cc
clean:
- rm -rf *.o core octave-core *.oct *~ *.f slicot lapack-3.4.1
+ rm -rf *.o core octave-core *.oct *~ *.f slicot
realclean: clean
rm -rf *.a
\ No newline at end of file
Deleted: trunk/octave-forge/extra/control-devel/src/lapack-3.4.1.tgz
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pau...@us...> - 2012-07-03 09:56:26
|
Revision: 10712
http://octave.svn.sourceforge.net/octave/?rev=10712&view=rev
Author: pauldreik
Date: 2012-07-03 09:56:20 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
modifed the AF_LOCAL macro on win32 platforms, which was misspelled.
Credit to Carlo de Falco for spotting it.
Also, made it use the newer octave>3.2 variant of DEFUNX_DLD macro.
windows users of older octave versions may not be able to see the function
which is most likely not a big problem.
Modified Paths:
--------------
trunk/octave-forge/main/sockets/src/sockets.cc
Modified: trunk/octave-forge/main/sockets/src/sockets.cc
===================================================================
--- trunk/octave-forge/main/sockets/src/sockets.cc 2012-07-02 12:24:31 UTC (rev 10711)
+++ trunk/octave-forge/main/sockets/src/sockets.cc 2012-07-03 09:56:20 UTC (rev 10712)
@@ -240,8 +240,9 @@
// PKG_ADD: autoload ("AF_LOCAL", "sockets.oct");
DEFUN_DLD_SOCKET_CONSTANT(AF_LOCAL, "socket constant" );
#else
-DEFUNX_DLD ( "AF_LOCAL", FAFL_OCAL, FSAF_LOCAL, args, nargout, "socket constant" )
-{ error( "AF_LOCAL address family not supported on this platform" ); return octave_value(); };
+DEFUNX_DLD ("AF_LOCAL", FAF_LOCAL, GAF_LOCAL, args, nargout, "(not supported)")
+{ error( "AF_LOCAL address family not supported on this platform" );
+ return octave_value(); };
#endif
// PKG_ADD: autoload ("AF_INET", "sockets.oct");
DEFUN_DLD_SOCKET_CONSTANT(AF_INET, "socket constant" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-07-02 12:24:41
|
Revision: 10711
http://octave.svn.sourceforge.net/octave/?rev=10711&view=rev
Author: paramaniac
Date: 2012-07-02 12:24:31 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
control-devel: use weaker kalman matrix in pH example
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/INDEX
trunk/octave-forge/extra/control-devel/inst/@iddata/resample.m
Added Paths:
-----------
trunk/octave-forge/extra/control-devel/devel/pH2.m
Modified: trunk/octave-forge/extra/control-devel/INDEX
===================================================================
--- trunk/octave-forge/extra/control-devel/INDEX 2012-07-01 18:50:12 UTC (rev 10710)
+++ trunk/octave-forge/extra/control-devel/INDEX 2012-07-02 12:24:31 UTC (rev 10711)
@@ -11,6 +11,7 @@
@iddata/merge
@iddata/nkshift
@iddata/plot
+ @iddata/resample
@iddata/set
@iddata/size
System Identification
Added: trunk/octave-forge/extra/control-devel/devel/pH2.m
===================================================================
--- trunk/octave-forge/extra/control-devel/devel/pH2.m (rev 0)
+++ trunk/octave-forge/extra/control-devel/devel/pH2.m 2012-07-02 12:24:31 UTC (rev 10711)
@@ -0,0 +1,74 @@
+%{
+Contributed by:
+ Jairo Espinosa
+ K.U.Leuven ESAT-SISTA
+ K.Mercierlaan 94
+ B3001 Heverlee
+ Jai...@es...
+
+Description:
+ Simulation data of a pH neutralization process in a constant volume
+ stirring tank.
+ Volume of the tank 1100 liters
+ Concentration of the acid solution (HAC) 0.0032 Mol/l
+ Concentration of the base solution (NaOH) 0,05 Mol/l
+Sampling:
+ 10 sec
+Number:
+ 2001
+Inputs:
+ u1: Acid solution flow in liters
+ u2: Base solution flow in liters
+
+Outputs:
+ y: pH of the solution in the tank
+
+References:
+ T.J. Mc Avoy, E.Hsu and S.Lowenthal, Dynamics of pH in controlled
+ stirred tank reactor, Ind.Eng.Chem.Process Des.Develop.11(1972)
+ 71-78
+
+Properties:
+ Highly non-linear system.
+
+Columns:
+ Column 1: time-steps
+ Column 2: input u1
+ Column 3: input u2
+ Column 4: output y
+
+Category:
+ Process industry systems
+
+%}
+
+clear all, close all, clc
+
+load pHdata.dat
+U=pHdata(:,2:3);
+Y=pHdata(:,4);
+
+
+dat = iddata (Y, U)
+
+[sys, x0, info] = moen4 (dat, 's', 15, 'n', 6) % s=15, n=6
+
+l = lqe (sys, info.Q, 100*info.Ry)
+
+[a, b, c, d] = ssdata (sys);
+
+sys = ss ([a-l*c], [b-l*d, l], c, [d, 0], -1)
+
+
+[y, t] = lsim (sys, [U, Y], [], x0);
+
+err = norm (Y - y, 1) / norm (Y, 1)
+st = isstable (sys)
+
+figure (1)
+plot (t, Y(:,1), 'b', t, y(:,1), 'r')
+ylim ([0, 15])
+title ('DaISy [96-014]: pH neutralization process in a stirring tank - highly non-linear')
+legend ('y measured', 'y simulated', 'location', 'southeast')
+
+
Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/resample.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/resample.m 2012-07-01 18:50:12 UTC (rev 10710)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/resample.m 2012-07-02 12:24:31 UTC (rev 10711)
@@ -16,8 +16,8 @@
## along with LTI Syncope. If not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
-## @deftypefn {Function File} {@var{dat} =} diff (@var{dat})
-## @deftypefnx {Function File} {@var{dat} =} diff (@var{dat}, @var{k})
+## @deftypefn {Function File} {@var{dat} =} resample (@var{dat}, @var{p}, @var{q})
+## @deftypefnx {Function File} {@var{dat} =} resample (@var{dat}, @var{p}, @var{q}, @var{n})
## Return @var{k}-th difference of outputs and inputs of dataset @var{dat}.
## If @var{k} is not specified, default value 1 is taken.
## @end deftypefn
@@ -32,6 +32,8 @@
print_usage ();
endif
+ ## requires signal package
+
h = fir1 (n, 1/q);
dat.y = cellfun (@(y) resample (y, p, q, h), dat.y, "uniformoutput", false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-07-01 18:50:22
|
Revision: 10710
http://octave.svn.sourceforge.net/octave/?rev=10710&view=rev
Author: paramaniac
Date: 2012-07-01 18:50:12 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
control-devel: add nkshift iddata method
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/INDEX
Added Paths:
-----------
trunk/octave-forge/extra/control-devel/inst/@iddata/nkshift.m
Modified: trunk/octave-forge/extra/control-devel/INDEX
===================================================================
--- trunk/octave-forge/extra/control-devel/INDEX 2012-06-30 18:46:04 UTC (rev 10709)
+++ trunk/octave-forge/extra/control-devel/INDEX 2012-07-01 18:50:12 UTC (rev 10710)
@@ -9,6 +9,7 @@
@iddata/get
@iddata/ifft
@iddata/merge
+ @iddata/nkshift
@iddata/plot
@iddata/set
@iddata/size
Added: trunk/octave-forge/extra/control-devel/inst/@iddata/nkshift.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/nkshift.m (rev 0)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/nkshift.m 2012-07-01 18:50:12 UTC (rev 10710)
@@ -0,0 +1,55 @@
+## Copyright (C) 2012 Lukas F. Reichlin
+##
+## This file is part of LTI Syncope.
+##
+## LTI Syncope 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.
+##
+## LTI Syncope 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 LTI Syncope. If not, see <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {@var{dat} =} nkshift (@var{dat}, @var{nk})
+## @deftypefnx {Function File} {@var{dat} =} detrend (@var{dat}, @var{nk} @var{'append'})
+## Detrend outputs and inputs of dataset @var{dat} by
+## removing the best fit of a polynomial of order @var{ord}.
+## If @var{ord} is not specified, default value 0 is taken.
+## This corresponds to removing a constant.
+## @end deftypefn
+
+## Author: Lukas Reichlin <luk...@gm...>
+## Created: July 2012
+## Version: 0.1
+
+function dat = nkshift (dat, nk = 0)
+
+ if (nargin != 2)
+ print_usage ();
+ endif
+
+ if (! is_real_scalar (nk))
+ error ("iddata: nkshift: ");
+ endif
+
+ ## TODO: - nk per inputs
+ ## - padding with zeros
+
+ snk = sign (nk);
+ nk = abs (nk);
+
+ if (snk >= 0)
+ dat.y = cellfun (@(y) y(nk+1:end, :), dat.y, "uniformoutput", false);
+ dat.u = cellfun (@(u) u(1:end-nk, :), dat.u, "uniformoutput", false);
+ else
+ dat.y = cellfun (@(y) y(1:end-nk, :), dat.y, "uniformoutput", false);
+ dat.u = cellfun (@(u) u(nk+1:end, :), dat.u, "uniformoutput", false);
+ endif
+
+endfunction
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-30 18:46:10
|
Revision: 10709
http://octave.svn.sourceforge.net/octave/?rev=10709&view=rev
Author: benjf5
Date: 2012-06-30 18:46:04 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
Added lombcoeff, going to add tests to functions and clean up documentation shortly.
Modified Paths:
--------------
trunk/octave-forge/extra/lssa/fastlsreal.cc
trunk/octave-forge/extra/lssa/lscomplex.m
Added Paths:
-----------
trunk/octave-forge/extra/lssa/lombcoeff.m
Modified: trunk/octave-forge/extra/lssa/fastlsreal.cc
===================================================================
--- trunk/octave-forge/extra/lssa/fastlsreal.cc 2012-06-29 16:40:57 UTC (rev 10708)
+++ trunk/octave-forge/extra/lssa/fastlsreal.cc 2012-06-30 18:46:04 UTC (rev 10709)
@@ -188,7 +188,6 @@
}
}
iota_record_current->stored_data = true;
- std::cout << "Precomputed " << iota_record_current << std::endl;
k++;
}
tau_h += ( 2 * delta_tau );
Added: trunk/octave-forge/extra/lssa/lombcoeff.m
===================================================================
--- trunk/octave-forge/extra/lssa/lombcoeff.m (rev 0)
+++ trunk/octave-forge/extra/lssa/lombcoeff.m 2012-06-30 18:46:04 UTC (rev 10709)
@@ -0,0 +1,31 @@
+## Copyright (C) 2012 Benjamin Lewis <be...@gm...>
+##
+## This program 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 2 of the License, or (at your option) any later
+## version.
+##
+## This program 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
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {c =} lombcoeff (time, mag, freq)
+##
+## Return the coefficient of the Lomb periodogram (unnormalized) for the
+## (@var{time},@var{mag}) series for the @var{freq} provided.
+##
+## @seealso{lombnormcoeff}
+## @end deftypefn
+
+
+function coeff = lombcoeff(T, X, o)
+ theta = atan2(sum(sin(2 .* o .* T )), sum(cos(2.*o.*T)))/ (2 * o );
+ coeff = ( sum(X .* cos(o .* T - tau))**2)/(sum(cos(o.*T-tau).**2)) +
+ ( sum(X .* sin(o .* T - tau))**2)/(sum(sin(o.*T-tau).**2));
+end function
+
Modified: trunk/octave-forge/extra/lssa/lscomplex.m
===================================================================
--- trunk/octave-forge/extra/lssa/lscomplex.m 2012-06-29 16:40:57 UTC (rev 10708)
+++ trunk/octave-forge/extra/lssa/lscomplex.m 2012-06-30 18:46:04 UTC (rev 10709)
@@ -26,15 +26,13 @@
function transform = lscomplex( t , x , omegamax , ncoeff , noctave )
n = length(t); ## VECTOR ONLY, and since t and x have the same number of entries, there's no problem.
- n1 = 1 / n;
transform = zeros(1,ncoeff*noctave);
o = omegamax;
omul = 2 ^ ( - 1 / ncoeff );
for iter = 1:ncoeff*noctave
ot = o .* t;
- transform(iter) = sum( ( cos(ot) .- ( sin(ot) .* i ) ) .* x ); ## See the paper for the expression
+ transform(iter) = sum( ( cos(ot) - ( sin(ot) .* i ) ) .* x ) / n; ## See the paper for the expression
o *= omul; ## To advance the transform to the next coefficient in the octave
endfor
- transform ./ n;
endfunction
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <prn...@us...> - 2012-06-29 16:41:08
|
Revision: 10708
http://octave.svn.sourceforge.net/octave/?rev=10708&view=rev
Author: prnienhuis
Date: 2012-06-29 16:40:57 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
More input validation and (ML compatible) allowing cellstr arrays to specify multi-line messages
Modified Paths:
--------------
trunk/octave-forge/extra/java/inst/errordlg.m
trunk/octave-forge/extra/java/inst/helpdlg.m
trunk/octave-forge/extra/java/inst/inputdlg.m
trunk/octave-forge/extra/java/inst/msgbox.m
trunk/octave-forge/extra/java/inst/questdlg.m
trunk/octave-forge/extra/java/inst/warndlg.m
Modified: trunk/octave-forge/extra/java/inst/errordlg.m
===================================================================
--- trunk/octave-forge/extra/java/inst/errordlg.m 2012-06-29 16:39:30 UTC (rev 10707)
+++ trunk/octave-forge/extra/java/inst/errordlg.m 2012-06-29 16:40:57 UTC (rev 10708)
@@ -17,21 +17,34 @@
## @deftypefn {Function file} {@var{P} =} errordlg (@var{MESSAGE} [,@var{TITLE}])
##
## Displays the @var{MESSAGE} using an error dialog box.
-## The @var{TITLE} can be used optionally to decorate the dialog caption.
+## @var{TITLE} (character string or cell string array for multi-line text) can
+## be used optionally to decorate the dialog caption.
## The return value is always 1.
##
## @end deftypefn
## @seealso{helpdlg, inputdlg, listdlg, questdlg, warndlg}
-function ret = errordlg(message,varargin)
-
+function ret = errordlg (message, varargin)
+
+ if (! ischar (message))
+ if (iscell (message))
+ message = cell2mlstr (message);
+ else
+ error ("errordlg: character string or cellstr array expected for message");
+ endif
+ endif
+
switch length (varargin)
case 0
- title = "Error Dialog";
+ title = "Error Dialog";
otherwise
- title = varargin{1};
+ title = varargin{1};
endswitch
+ if (! ischar (title))
+ error ("errordlg: character string expected for title");
+ endif
+
ret = java_invoke ("org.octave.JDialogBox", "errordlg", message, title);
endfunction
Modified: trunk/octave-forge/extra/java/inst/helpdlg.m
===================================================================
--- trunk/octave-forge/extra/java/inst/helpdlg.m 2012-06-29 16:39:30 UTC (rev 10707)
+++ trunk/octave-forge/extra/java/inst/helpdlg.m 2012-06-29 16:40:57 UTC (rev 10708)
@@ -16,23 +16,42 @@
## -*- texinfo -*-
## @deftypefn {Function file} {@var{P} =} helpdlg (@var{MESSAGE} [,@var{TITLE}])
##
-## Displays a @var{MESSAGE} in a help dialog box.
-## The help message can have multiple lines, separated by a newline character '\n'.
-## The @var{TITLE} can be used optionally to decorate the dialog caption.
+## Displays a @var{MESSAGE} in a help dialog box.
+##
+## @var{message} can have multiple lines separated by newline characters
+## ("\n"), or it can be a cellstr array (one element for each line).
+## The optional @var{TITLE} (character string) can be used to decorate the
+## dialog caption.
## The return value is always 1.
##
## @end deftypefn
## @seealso{errordlg, inputdlg, listdlg, questdlg, warndlg}
-function ret = helpdlg(message,varargin)
+function ret = helpdlg (message, varargin)
+
+ if (! ischar (message))
+ if (iscell (message))
+ message = cell2mlstr (message);
+ else
+ error ("helpdlg: character string or cellstr array expected for message");
+ endif
+ endif
switch length (varargin)
case 0
title = "Help Dialog";
otherwise
- title = varargin{1};
+ if (ischar (varargin {1}))
+ title = varargin{1};
+ else
+ error ("helpdlg: character string expected for title");
+ endif
endswitch
+ if (! ischar (title))
+ error ("helpdlg: character string expected for title");
+ endif
+
ret = java_invoke ("org.octave.JDialogBox", "helpdlg", message, title);
endfunction
Modified: trunk/octave-forge/extra/java/inst/inputdlg.m
===================================================================
--- trunk/octave-forge/extra/java/inst/inputdlg.m 2012-06-29 16:39:30 UTC (rev 10707)
+++ trunk/octave-forge/extra/java/inst/inputdlg.m 2012-06-29 16:40:57 UTC (rev 10708)
@@ -39,27 +39,39 @@
## @end deftypefn
## @seealso{errordlg, helpdlg, listdlg, questdlg, warndlg}
-function varargout = inputdlg(prompt,varargin)
-
+function varargout = inputdlg (prompt, varargin)
+
+ if (iscell (prompt))
+ % Silently extract only char elements
+ prompt = prompt (find (cellfun ("ischar", prompt)));
+ elseif (ischar (prompt))
+ prompt = {prompt};
+ else
+ error ("inputdlg: character string or cellstr array expected for prompt");
+ endif
+
switch length (varargin)
case 0
title = "Input Dialog";
lineNo = 1;
- defaults = cellstr(cell(size(prompt)));
+ defaults = cellstr (cell( size (prompt)));
case 1
title = varargin{1};
lineNo = 1;
- defaults = cellstr(cell(size(prompt)));
+ defaults = cellstr (cell (size (prompt)));
case 2
title = varargin{1};
lineNo = varargin{2};
- defaults = cellstr(cell(size(prompt)));
+ defaults = cellstr (cell (size (prompt)));
otherwise
title = varargin{1};
lineNo = varargin{2};
defaults = varargin{3};
end
+ if (! ischar (title))
+ error ("inputdlg: character string expected for title");
+ endif
% specification of text field sizes as in Matlab
% Matlab requires a matrix for lineNo, not a cell array...
Modified: trunk/octave-forge/extra/java/inst/msgbox.m
===================================================================
--- trunk/octave-forge/extra/java/inst/msgbox.m 2012-06-29 16:39:30 UTC (rev 10707)
+++ trunk/octave-forge/extra/java/inst/msgbox.m 2012-06-29 16:40:57 UTC (rev 10708)
@@ -17,7 +17,11 @@
## @deftypefn {Function file} {@var{P} =} msgbox (@var{MESSAGE} [,@var{TITLE} [,@var{ICON}]])
##
## Displays the @var{MESSAGE} using a message dialog.
-## The @var{TITLE} is an optional string, which can be used to decorate the dialog caption.
+##
+## @var{message} can have multiple lines separated by newline characters
+## ("\n"), or it can be a cellstr array (one element for each line).
+## The optional @var{TITLE} (character string) can be used to decorate the
+## dialog caption.
## The @var{ICON} can be used optionally to select a dialog icon.
## It can be one of @code{'error'}, @code{'help'} or @code{'warn'}.
## The return value is always 1.
@@ -25,30 +29,42 @@
## @end deftypefn
## @seealso{helpdlg, questdlg, warndlg}
-function ret = msgbox(message,varargin)
+function ret = msgbox (message, varargin)
+
+ if (! ischar (message))
+ if (iscell (message))
+ message = cell2mlstr (message);
+ else
+ error ("msgbox: character string or cellstr array expected for message");
+ endif
+ endif
switch length (varargin)
- case 0
- title = "";
- dlg = 'emptydlg';
- case 1
- title = varargin{1};
- dlg = 'emptydlg';
- otherwise
- % two or more arguments
- title = varargin{1};
- icon = varargin{2};
- if strcmp(icon,'error') == 1
- dlg = 'errordlg';
- elseif strcmp(icon,'help') == 1
- dlg = 'helpdlg';
- elseif strcmp(icon,'warn') == 1
- dlg = 'warndlg';
- else
+ case 0
+ title = "";
dlg = 'emptydlg';
- end
+ case 1
+ title = varargin{1};
+ dlg = 'emptydlg';
+ otherwise
+ % two or more arguments
+ title = varargin{1};
+ icon = varargin{2};
+ if strcmp (icon,'error') == 1
+ dlg = 'errordlg';
+ elseif strcmp (icon,'help') == 1
+ dlg = 'helpdlg';
+ elseif strcmp (icon,'warn') == 1
+ dlg = 'warndlg';
+ else
+ dlg = 'emptydlg';
+ end
endswitch
+ if (! ischar (title))
+ error ("questdlg: character string expected for title");
+ endif
+
ret = java_invoke ('org.octave.JDialogBox', dlg, message, title );
endfunction
Modified: trunk/octave-forge/extra/java/inst/questdlg.m
===================================================================
--- trunk/octave-forge/extra/java/inst/questdlg.m 2012-06-29 16:39:30 UTC (rev 10707)
+++ trunk/octave-forge/extra/java/inst/questdlg.m 2012-06-29 16:40:57 UTC (rev 10708)
@@ -23,7 +23,10 @@
## The dialog contains two or three buttons which all close the dialog.
## It returns the caption of the activated button.
##
-## The @var{TITLE} can be used optionally to decorate the dialog caption.
+## @var{message} can have multiple lines separated by newline characters
+## ("\n"), or it can be a cellstr array (one element for each line).
+## The optional @var{TITLE} (character string) can be used to decorate the
+## dialog caption.
## The string @var{DEFAULT} identifies the default button,
## which is activated by pressing the ENTER key.
## It must match one of the strings given in @var{BTN1}, @var{BTN2} or @var{BTN3}.
@@ -37,9 +40,9 @@
## @end deftypefn
## @seealso{errordlg, helpdlg, inputdlg, listdlg, warndlg}
-function ret = questdlg(question,varargin)
+function ret = questdlg (question, varargin)
- if length(varargin) < 1
+ if length (varargin) < 1
print_usage();
end
@@ -48,8 +51,15 @@
options{3} = 'Cancel'; % button3
options{4} = 'Yes'; % default
+ if (! ischar (question))
+ if (iscell (question))
+ question = cell2mlstr (question);
+ else
+ error ("questdlg: character string or cellstr array expected for message");
+ endif
+ endif
- switch length(varargin)
+ switch length (varargin)
case 1
% title was given
title = varargin{1};
@@ -75,6 +85,9 @@
print_usage();
end
+ if (! ischar (title))
+ error ("questdlg: character string expected for title");
+ endif
ret = java_invoke ('org.octave.JDialogBox', 'questdlg', question, title, options);
Modified: trunk/octave-forge/extra/java/inst/warndlg.m
===================================================================
--- trunk/octave-forge/extra/java/inst/warndlg.m 2012-06-29 16:39:30 UTC (rev 10707)
+++ trunk/octave-forge/extra/java/inst/warndlg.m 2012-06-29 16:40:57 UTC (rev 10708)
@@ -15,20 +15,35 @@
## -*- texinfo -*-
## @deftypefn {Function file} {@var{P} =} warndlg (@var{MESSAGE} [,@var{TITLE}])
-##
## Displays the @var{MESSAGE} using a warning dialog box.
-## The @var{TITLE} can be used optionally to decorate the dialog caption.
##
+## @var{message} can have multiple lines separated by newline characters
+## ("\n"), or it can be a cellstr array (one element for each line).
+## The optional @var{TITLE} (character string) can be used to decorate the
+## dialog caption.
+##
## @end deftypefn
## @seealso{helpdlg, inputdlg, listdlg, questiondlg}
-function ret = warndlg(message,varargin)
+function ret = warndlg (message, varargin)
+
+ if (! ischar (message))
+ if (iscell (message))
+ message = cell2mlstr (message);
+ else
+ error ("warndlg: character string or cellstr array expected for message");
+ endif
+ endif
switch length (varargin)
case 0
title = 'Warning Dialog';
otherwise
- title = varargin{1};
+ if (ischar (varargin{1}))
+ title = varargin{1};
+ else
+ error ("warndlg: character string expected for title");
+ endif
endswitch
ret = java_invoke ('org.octave.JDialogBox', 'warndlg', message, title);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <prn...@us...> - 2012-06-29 16:39:39
|
Revision: 10707
http://octave.svn.sourceforge.net/octave/?rev=10707&view=rev
Author: prnienhuis
Date: 2012-06-29 16:39:30 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Utility function for dialogs; transforms cellstr arrays into multiline char arrays separated by newline chars
Added Paths:
-----------
trunk/octave-forge/extra/java/inst/cell2mlstr.m
Added: trunk/octave-forge/extra/java/inst/cell2mlstr.m
===================================================================
--- trunk/octave-forge/extra/java/inst/cell2mlstr.m (rev 0)
+++ trunk/octave-forge/extra/java/inst/cell2mlstr.m 2012-06-29 16:39:30 UTC (rev 10707)
@@ -0,0 +1,34 @@
+## Copyright (C) 2012 Philip Nienhuis <prn...@us...>
+##
+## This program 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.
+##
+## This program 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 Octave; see the file COPYING. If not, see
+## <http://www.gnu.org/licenses/>.
+
+## cell2mlstr - convert text cells in cellstr arrray to multiline text
+## separated by EOL
+
+## Author: Philip <Philip@DESKPRN>
+## Created: 2012-06-29
+
+function [ ret ] = cell2mlstr (cstr)
+
+ if (! iscellstr (cstr))
+ ## Only use char elements
+ cstr = cstr (find (cellfun ("ischar", cstr)));
+ endif
+ ## Treat cell string array as multi-line text
+ cstr(1:2:2*numel (cstr)) = cstr;
+ cstr(2:2:numel (cstr)) = "\n";
+ ret = [cstr{:}];
+
+endfunction
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <prn...@us...> - 2012-06-29 16:37:56
|
Revision: 10706
http://octave.svn.sourceforge.net/octave/?rev=10706&view=rev
Author: prnienhuis
Date: 2012-06-29 16:37:50 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Allow dlgtest.m to run w/o JAVA_HOME setting when not reinstalling Java pkg
Modified Paths:
--------------
trunk/octave-forge/extra/java/inst/dlgtest.m
Modified: trunk/octave-forge/extra/java/inst/dlgtest.m
===================================================================
--- trunk/octave-forge/extra/java/inst/dlgtest.m 2012-06-29 09:03:08 UTC (rev 10705)
+++ trunk/octave-forge/extra/java/inst/dlgtest.m 2012-06-29 16:37:50 UTC (rev 10706)
@@ -29,7 +29,7 @@
return
end
- if ! exist (java_home, "dir")
+ if (reinstall && (! exist (java_home, "dir")))
disp(['Java JDK home directory ', java_home,' does not exist.']);
disp('Please adapt java_home in dlgtest.m.');
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-06-29 09:03:19
|
Revision: 10705
http://octave.svn.sourceforge.net/octave/?rev=10705&view=rev
Author: paramaniac
Date: 2012-06-29 09:03:08 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
control-devel: support frequency domain datasets (3)
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m
trunk/octave-forge/extra/control-devel/inst/@iddata/set.m
Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m 2012-06-29 08:14:29 UTC (rev 10704)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m 2012-06-29 09:03:08 UTC (rev 10705)
@@ -75,7 +75,7 @@
## ifft (x, n, dim=1) because x could be a row vector (n=1)
% dat.w = cellfun (@(n, tsam) (0:fix(n/2)).' * (2*pi/abs(tsam)/n), n, dat.tsam, "uniformoutput", false);
- dat.w = {};
+ dat.w = {}; % dat.w = repmat ({[]}, e, 1); ???
## abs(tsam) because of -1 for undefined sampling times
dat.timedomain = true;
Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/set.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/set.m 2012-06-29 08:14:29 UTC (rev 10704)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/set.m 2012-06-29 09:03:08 UTC (rev 10705)
@@ -95,9 +95,13 @@
case {"tsam", "ts"}
dat.tsam = __adjust_iddata_tsam__ (val, e);
case {"w", "frequency"}
- if (! isempty (val) && (! is_real_vector (val) || any (val < 0) \
- || ! issorted (val) || val(1) > val(end) \
- || length (unique (val)) != length (val)))
+ if (! iscell (val))
+ val = {val};
+ endif
+
+ if (any (cellfun (@(w) ! isempty (w) && (! is_real_vector (w) || any (w < 0) \
+ || ! issorted (w) || w(1) > w(end) \
+ || length (unique (w)) != length (w)), val)))
error ("iddata: set: w must be a vector of positive real values in ascending order");
endif
dat.w = val;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-06-29 08:14:38
|
Revision: 10704
http://octave.svn.sourceforge.net/octave/?rev=10704&view=rev
Author: paramaniac
Date: 2012-06-29 08:14:29 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
control-devel: support frequency domain datasets (2)
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m
trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m
trunk/octave-forge/extra/control-devel/inst/arx.m
trunk/octave-forge/extra/control-devel/inst/moen4.m
Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m 2012-06-29 07:33:00 UTC (rev 10703)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m 2012-06-29 08:14:29 UTC (rev 10704)
@@ -53,6 +53,14 @@
return;
endif
+ if (any (cellfun (@(w) w(1) >= eps, dat.w)))
+ error ("iddata: ifft: first frequency must be zero");
+ endif
+
+ if (any (cellfun (@(w) any (abs (diff (w, 2)) > 1e-4*w(2:end-1)), dat.w)))
+ error ("iddata: ifft: require linearly spaced frequency vectors");
+ endif
+
[x, ~, ~, e] = size (dat);
x = x(:);
Modified: trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m 2012-06-29 07:33:00 UTC (rev 10703)
+++ trunk/octave-forge/extra/control-devel/inst/__slicot_identification__.m 2012-06-29 08:14:29 UTC (rev 10704)
@@ -38,8 +38,8 @@
error ("ident: invalid method"); # should never happen
endswitch
- if (! isa (dat, "iddata"))
- error ("%s: first argument must be an 'iddata' dataset", method);
+ if (! isa (dat, "iddata") || ! dat.timedomain)
+ error ("%s: first argument must be a time-domain 'iddata' dataset", method);
endif
if (nargin > 2) # ident (dat, ...)
Modified: trunk/octave-forge/extra/control-devel/inst/arx.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/arx.m 2012-06-29 07:33:00 UTC (rev 10703)
+++ trunk/octave-forge/extra/control-devel/inst/arx.m 2012-06-29 08:14:29 UTC (rev 10704)
@@ -25,7 +25,7 @@
## @strong{Inputs}
## @table @var
## @item dat
-## iddata set containing the measurements.
+## iddata set containing the measurements, i.e. time-domain signals.
## @item n
## The desired order of the resulting model @var{sys}.
## @item @dots{}
@@ -89,8 +89,8 @@
print_usage ();
endif
- if (! isa (dat, "iddata"))
- error ("arx: first argument must be an iddata dataset");
+ if (! isa (dat, "iddata") || ! dat.timedomain)
+ error ("arx: first argument must be a time-domain iddata dataset");
endif
if (is_real_scalar (varargin{1})) # arx (dat, n, ...)
Modified: trunk/octave-forge/extra/control-devel/inst/moen4.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/moen4.m 2012-06-29 07:33:00 UTC (rev 10703)
+++ trunk/octave-forge/extra/control-devel/inst/moen4.m 2012-06-29 08:14:29 UTC (rev 10704)
@@ -27,7 +27,7 @@
## @strong{Inputs}
## @table @var
## @item dat
-## iddata set containing the measurements.
+## iddata set containing the measurements, i.e. time-domain signals.
## @item n
## The desired order of the resulting state-space system @var{sys}.
## If not specified, @var{n} is chosen automatically according
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-06-29 07:33:07
|
Revision: 10703
http://octave.svn.sourceforge.net/octave/?rev=10703&view=rev
Author: paramaniac
Date: 2012-06-29 07:33:00 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
control-devel: support frequency domain datasets
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m
trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m
trunk/octave-forge/extra/control-devel/inst/@iddata/set.m
trunk/octave-forge/extra/control-devel/inst/__iddata_dim__.m
Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m 2012-06-29 06:08:32 UTC (rev 10702)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/iddata.m 2012-06-29 07:33:00 UTC (rev 10703)
@@ -141,6 +141,10 @@
dat = set (dat, varargin{:});
endif
+ if (dat.timedomain && ! is_real_matrix (dat.y{:}, dat.u{:}))
+ error ("iddata: require real-valued input and output signals for time domain datasets");
+ endif
+
endfunction
Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m 2012-06-29 06:08:32 UTC (rev 10702)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/ifft.m 2012-06-29 07:33:00 UTC (rev 10703)
@@ -67,6 +67,7 @@
## ifft (x, n, dim=1) because x could be a row vector (n=1)
% dat.w = cellfun (@(n, tsam) (0:fix(n/2)).' * (2*pi/abs(tsam)/n), n, dat.tsam, "uniformoutput", false);
+ dat.w = {};
## abs(tsam) because of -1 for undefined sampling times
dat.timedomain = true;
Modified: trunk/octave-forge/extra/control-devel/inst/@iddata/set.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/@iddata/set.m 2012-06-29 06:08:32 UTC (rev 10702)
+++ trunk/octave-forge/extra/control-devel/inst/@iddata/set.m 2012-06-29 07:33:00 UTC (rev 10703)
@@ -94,6 +94,14 @@
dat.expname = __adjust_labels__ (val, e);
case {"tsam", "ts"}
dat.tsam = __adjust_iddata_tsam__ (val, e);
+ case {"w", "frequency"}
+ if (! isempty (val) && (! is_real_vector (val) || any (val < 0) \
+ || ! issorted (val) || val(1) > val(end) \
+ || length (unique (val)) != length (val)))
+ error ("iddata: set: w must be a vector of positive real values in ascending order");
+ endif
+ dat.w = val;
+ dat.timedomain = false;
case "name"
if (ischar (val))
sys.name = val;
Modified: trunk/octave-forge/extra/control-devel/inst/__iddata_dim__.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/__iddata_dim__.m 2012-06-29 06:08:32 UTC (rev 10702)
+++ trunk/octave-forge/extra/control-devel/inst/__iddata_dim__.m 2012-06-29 07:33:00 UTC (rev 10703)
@@ -30,8 +30,8 @@
function [p, m] = __experiment_dim__ (y, u = [])
- if (! is_real_matrix (y, u))
- error ("iddata: inputs and outputs must be real");
+ if (! is_matrix (y, u))
+ error ("iddata: inputs and outputs must be real or complex matrices");
endif
[ly, p] = size (y);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-06-29 06:08:38
|
Revision: 10702
http://octave.svn.sourceforge.net/octave/?rev=10702&view=rev
Author: paramaniac
Date: 2012-06-29 06:08:32 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
control-devel: work on draft code
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/inst/arx.m
trunk/octave-forge/extra/control-devel/src/Makefile
Added Paths:
-----------
trunk/octave-forge/extra/control-devel/src/is_matrix.cc
Modified: trunk/octave-forge/extra/control-devel/inst/arx.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/arx.m 2012-06-29 06:07:27 UTC (rev 10701)
+++ trunk/octave-forge/extra/control-devel/inst/arx.m 2012-06-29 06:08:32 UTC (rev 10702)
@@ -16,8 +16,65 @@
## along with LTI Syncope. If not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
-## @deftypefn {Function File} {@var{sys} =} arx (@var{dat}, @var{na}, @var{nb})
+## @deftypefn {Function File} {[@var{sys}, @var{x0}] =} arx (@var{dat}, @var{n}, @dots{})
+## @deftypefnx {Function File} {[@var{sys}, @var{x0}] =} arx (@var{dat}, @var{n}, @var{opt}, @dots{})
+## @deftypefnx {Function File} {[@var{sys}, @var{x0}] =} arx (@var{dat}, @var{opt}, @dots{})
+## @deftypefnx {Function File} {[@var{sys}, @var{x0}] =} arx (@var{dat}, @var{'na'}, @var{na}, @var{'nb'}, @var{nb})
## ARX
+##
+## @strong{Inputs}
+## @table @var
+## @item dat
+## iddata set containing the measurements.
+## @item n
+## The desired order of the resulting model @var{sys}.
+## @item @dots{}
+## Optional pairs of keys and values. @code{'key1', value1, 'key2', value2}.
+## @item opt
+## Optional struct with keys as field names.
+## Struct @var{opt} can be created directly or
+## by command @command{options}. @code{opt.key1 = value1, opt.key2 = value2}.
+## @end table
+##
+##
+## @strong{Outputs}
+## @table @var
+## @item sys
+## Discrete-time transfer function model.
+## If the second output argument @var{x0} is returned,
+## @var{sys} becomes a state-space model.
+## @item x0
+## Initial state vector. If @var{dat} is a multi-experiment dataset,
+## @var{x0} becomes a cell vector containing an initial state vector
+## for each experiment.
+## @end table
+##
+##
+##
+## @strong{Option Keys and Values}
+## @table @var
+## @item 'na'
+## The desired order of the resulting state-space system @var{sys}.
+## @var{s} > @var{n} > 0.
+##
+## @item 'nb'
+## The desired order of the resulting state-space system @var{sys}.
+## @var{s} > @var{n} > 0.
+## @end table
+##
+##
+## @strong{Algorithm}@*
+## Uses the formulae given in [1] on pages 318-319,
+## 'Solving for the LS Estimate by QR Factorization'.
+## For the initial conditions, SLICOT IB01CD is used by courtesy of
+## @uref{http://www.slicot.org, NICONET e.V.}
+##
+## @strong{References}@*
+## [1] Ljung, L. (1999)
+## System Identification - Theory for the User
+## Second Edition
+## Prentice Hall, New Jersey.
+##
## @end deftypefn
## Author: Lukas Reichlin <luk...@gm...>
@@ -36,15 +93,14 @@
error ("arx: first argument must be an iddata dataset");
endif
-% if (nargin > 2) # arx (dat, ...)
- if (is_real_scalar (varargin{1})) # arx (dat, n, ...)
- varargin = horzcat (varargin(2:end), {"na"}, varargin(1), {"nb"}, varargin(1));
- endif
- if (isstruct (varargin{1})) # arx (dat, opt, ...), arx (dat, n, opt, ...)
- varargin = horzcat (__opt2cell__ (varargin{1}), varargin(2:end));
- endif
-% endif
+ if (is_real_scalar (varargin{1})) # arx (dat, n, ...)
+ varargin = horzcat (varargin(2:end), {"na"}, varargin(1), {"nb"}, varargin(1));
+ endif
+ if (isstruct (varargin{1})) # arx (dat, opt, ...), arx (dat, n, opt, ...)
+ varargin = horzcat (__opt2cell__ (varargin{1}), varargin(2:end));
+ endif
+
nkv = numel (varargin); # number of keys and values
if (rem (nkv, 2))
Modified: trunk/octave-forge/extra/control-devel/src/Makefile
===================================================================
--- trunk/octave-forge/extra/control-devel/src/Makefile 2012-06-29 06:07:27 UTC (rev 10701)
+++ trunk/octave-forge/extra/control-devel/src/Makefile 2012-06-29 06:08:32 UTC (rev 10702)
@@ -2,7 +2,8 @@
# BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
FLIBS := $(shell mkoctfile -p FLIBS)
-all: devel_slicot_functions.oct
+all: devel_slicot_functions.oct \
+ is_matrix.oct
# unpack and compile SLICOT library
slicotlibrary.a: slicot.tar.gz
@@ -27,6 +28,10 @@
mkoctfile devel_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \
${FLIBS}
+# helpers
+is_matrix.oct: is_matrix.cc
+ mkoctfile is_matrix.cc
+
clean:
rm -rf *.o core octave-core *.oct *~ *.f slicot lapack-3.4.1
Added: trunk/octave-forge/extra/control-devel/src/is_matrix.cc
===================================================================
--- trunk/octave-forge/extra/control-devel/src/is_matrix.cc (rev 0)
+++ trunk/octave-forge/extra/control-devel/src/is_matrix.cc 2012-06-29 06:08:32 UTC (rev 10702)
@@ -0,0 +1,60 @@
+/*
+
+Copyright (C) 2012 Lukas F. Reichlin
+
+This file is part of LTI Syncope.
+
+LTI Syncope 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.
+
+LTI Syncope 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 LTI Syncope. If not, see <http://www.gnu.org/licenses/>.
+
+Return true if argument is a real matrix.
+
+Author: Lukas Reichlin <luk...@gm...>
+Created: June 2012
+Version: 0.1
+
+*/
+
+#include <octave/oct.h>
+
+DEFUN_DLD (is_matrix, args, nargout,
+ "-*- texinfo -*-\n\
+@deftypefn {Loadable Function} {} is_matrix (@var{a}, @dots{})\n\
+Return true if argument is a matrix.\n\
+@var{[]} is a valid matrix.\n\
+Avoid nasty stuff like @code{true = isreal (\"a\")}\n\
+@seealso{is_real_matrix, is_real_square_matrix, is_real_vector, is_real_scalar}\n\
+@end deftypefn")
+{
+ octave_value retval = true;
+ int nargin = args.length ();
+
+ if (nargin == 0)
+ {
+ print_usage ();
+ }
+ else
+ {
+ for (int i = 0; i < nargin; i++)
+ {
+ if (args(i).ndims () != 2 || ! args(i).is_numeric_type ()
+ || ! (args(i).is_complex_type () || args(i).is_real_type ()))
+ {
+ retval = false;
+ break;
+ }
+ }
+ }
+
+ return retval;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-06-29 06:07:33
|
Revision: 10701
http://octave.svn.sourceforge.net/octave/?rev=10701&view=rev
Author: paramaniac
Date: 2012-06-29 06:07:27 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
control: add comment
Modified Paths:
--------------
trunk/octave-forge/main/control/devel/RELEASE_PACKAGE
Modified: trunk/octave-forge/main/control/devel/RELEASE_PACKAGE
===================================================================
--- trunk/octave-forge/main/control/devel/RELEASE_PACKAGE 2012-06-27 20:33:49 UTC (rev 10700)
+++ trunk/octave-forge/main/control/devel/RELEASE_PACKAGE 2012-06-29 06:07:27 UTC (rev 10701)
@@ -7,6 +7,7 @@
* update NEWS
* adapt version number in control.tex
* update doc/control.pdf
+ * update doc/control.tex & doc/functions.texi
* copy-paste entire block at once to the terminal
* follow instructions on <http://octave.sourceforge.net/developers.html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pau...@us...> - 2012-06-27 20:33:56
|
Revision: 10700
http://octave.svn.sourceforge.net/octave/?rev=10700&view=rev
Author: pauldreik
Date: 2012-06-27 20:33:49 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
Removed unused member function is_data_available() which was undefined
Removed unused variable.
Modified Paths:
--------------
trunk/octave-forge/main/sockets/src/sockets.cc
Modified: trunk/octave-forge/main/sockets/src/sockets.cc
===================================================================
--- trunk/octave-forge/main/sockets/src/sockets.cc 2012-06-27 15:29:06 UTC (rev 10699)
+++ trunk/octave-forge/main/sockets/src/sockets.cc 2012-06-27 20:33:49 UTC (rev 10700)
@@ -148,7 +148,7 @@
bool print_as_scalar (void) const { return true;}
// Still undefined.
- bool is_data_available() {};
+ //bool is_data_available() {};
/**
* Overloaded methods to print the fd as the socket id
@@ -825,7 +825,6 @@
"associated information in a struct info.\n"
"See the accept() man pages for details.\n")
{
- int retval = 0;
struct sockaddr_in clientInfo;
socklen_t clientLen = sizeof(struct sockaddr_in);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <par...@us...> - 2012-06-27 15:29:16
|
Revision: 10699
http://octave.svn.sourceforge.net/octave/?rev=10699&view=rev
Author: paramaniac
Date: 2012-06-27 15:29:06 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
control-devel: work on doc
Modified Paths:
--------------
trunk/octave-forge/extra/control-devel/inst/moen4.m
Modified: trunk/octave-forge/extra/control-devel/inst/moen4.m
===================================================================
--- trunk/octave-forge/extra/control-devel/inst/moen4.m 2012-06-27 15:05:30 UTC (rev 10698)
+++ trunk/octave-forge/extra/control-devel/inst/moen4.m 2012-06-27 15:29:06 UTC (rev 10699)
@@ -109,14 +109,29 @@
## @item 'noise'
## The desired type of noise input channels.
## @table @var
+## @item 'n'
+## No error inputs. Default value.
+## @iftex
+## @tex
+## $$ x_{k+1} = A x_k + B u_k $$
+## $$ y_k = C x_k + D u_k $$
+## @end tex
+## @end iftex
+## @ifnottex
+## @example
+## x[k+1] = A x[k] + B u[k]
+## y[k] = C x[k] + D u[k]
+## @end example
+## @end ifnottex
+##
## @item 'e'
## Return @var{sys} as a (p-by-m+p) state-space model with
## both measured input channels u and noise channels e
## with covariance matrix @var{Ry}.
## @iftex
## @tex
-## $$ x[k+1] = A x[k] + B u[k] + K e[k] $$
-## $$ y[k] = C x[k] + D u[k] + e[k] $$
+## $$ x_{k+1} = A x_k + B u_k + K e_k $$
+## $$ y_k = C x_k + D u_k + e_k $$
## @end tex
## @end iftex
## @ifnottex
@@ -132,9 +147,9 @@
## with identity covariance matrix.
## @iftex
## @tex
-## $$ x[k+1] = A x[k] + B u[k] + K L v[k] $$
-## $$ y[k] = C x[k] + D u[k] + L v[k] $$
-## $$ e = L v, \\ L L^T = Ry $$
+## $$ x_{k+1} = A x_k + B u_k + K L v_k $$
+## $$ y_k = C x_k + D u_k + L v_k $$
+## $$ e = L v, \\ L L^T = R_y $$
## @end tex
## @end iftex
## @ifnottex
@@ -145,12 +160,12 @@
## @end example
## @end ifnottex
##
-## @item 'n'
-## No error inputs. Default value.
+## @item 'k'
+## Return @var{sys} as a Kalman predictor for simulation.
## @iftex
## @tex
-## $$ x[k+1] = A x[k] + B u[k] $$
-## $$ y[k] = C x[k] + D u[k] $$
+## $$ \\widehat{x}_{k+1} = A \\widehat{x}_k + B u_k + K (y_k - \\widehat{y}_k) $$
+## $$ \\widehat{y}_k = C \\widehat{x}_k + D u_k $$
## @end tex
## @end iftex
## @ifnottex
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
48 messages has been excluded from this view by a project administrator.
