Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[8184] trunk/octave-forge/main/optiminterp
|
From: <aba...@us...> - 2011-03-25 09:55:07
|
Revision: 8184
http://octave.svn.sourceforge.net/octave/?rev=8184&view=rev
Author: abarth93
Date: 2011-03-25 09:55:01 +0000 (Fri, 25 Mar 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/octave-forge/main/optiminterp/DESCRIPTION
trunk/octave-forge/main/optiminterp/inst/optiminterp2.m
trunk/octave-forge/main/optiminterp/inst/optiminterp3.m
trunk/octave-forge/main/optiminterp/inst/optiminterp4.m
trunk/octave-forge/main/optiminterp/inst/optiminterpn.m
trunk/octave-forge/main/optiminterp/src/example_optiminterp.F90
trunk/octave-forge/main/optiminterp/src/optimal_interpolation.F90
trunk/octave-forge/main/optiminterp/src/optiminterp.cc
trunk/octave-forge/main/optiminterp/src/optiminterp_wrapper.F90
Modified: trunk/octave-forge/main/optiminterp/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/optiminterp/DESCRIPTION 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/DESCRIPTION 2011-03-25 09:55:01 UTC (rev 8184)
@@ -1,8 +1,8 @@
Name: optiminterp
-Version: 0.3.2
-Date: 2009-05-03
-Author: Alexander Barth <ab...@ma...>, Aida Alvera-Azc\xE1rate <aa...@ma...>
-Maintainer: Alexander Barth <ab...@ma...>
+Version: 0.3.3
+Date: 2011-03-25
+Author: Alexander Barth <bar...@gm...>, Aida Alvera-Azc\xE1rate <aa...@ma...>
+Maintainer: Alexander Barth <bar...@gm...>
Title: optiminterp
Description: An optimal interpolation toolbox for octave. This package provides functions to perform a n-dimensional optimal interpolations of arbitrarily distributed data points.
Depends: octave (>= 2.9.9)
Modified: trunk/octave-forge/main/optiminterp/inst/optiminterp2.m
===================================================================
--- trunk/octave-forge/main/optiminterp/inst/optiminterp2.m 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/inst/optiminterp2.m 2011-03-25 09:55:01 UTC (rev 8184)
@@ -38,7 +38,7 @@
## @end deftypefn
## Copyright (C) 2006, Alexander Barth
-## Author: Alexander Barth <ab...@ma...>
+## Author: Alexander Barth <bar...@gm...>
function [fi,vari] = optiminterp2(x,y,f,var,lenx,leny,m,xi,yi)
Modified: trunk/octave-forge/main/optiminterp/inst/optiminterp3.m
===================================================================
--- trunk/octave-forge/main/optiminterp/inst/optiminterp3.m 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/inst/optiminterp3.m 2011-03-25 09:55:01 UTC (rev 8184)
@@ -40,7 +40,7 @@
## @end deftypefn
## Copyright (C) 2006, Alexander Barth
-## Author: Alexander Barth <ab...@ma...>
+## Author: Alexander Barth <bar...@gm...>
function [fi,vari] = optiminterp3(x,y,z,f,var,lenx,leny,lenz,m,xi,yi,zi)
Modified: trunk/octave-forge/main/optiminterp/inst/optiminterp4.m
===================================================================
--- trunk/octave-forge/main/optiminterp/inst/optiminterp4.m 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/inst/optiminterp4.m 2011-03-25 09:55:01 UTC (rev 8184)
@@ -41,7 +41,7 @@
## Copyright (C) 2007 Aida Alvera-Azcárate
## Author: Aida Alvera-Azcárate <aa...@ma...>
-## Author: Alexander Barth <ab...@ma...>
+## Author: Alexander Barth <bar...@gm...>
function [fi,vari] = optiminterp4(x,y,z,t,f,var,lenx,leny,lenz,lent,m,xi,yi,zi,ti)
Modified: trunk/octave-forge/main/optiminterp/inst/optiminterpn.m
===================================================================
--- trunk/octave-forge/main/optiminterp/inst/optiminterpn.m 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/inst/optiminterpn.m 2011-03-25 09:55:01 UTC (rev 8184)
@@ -38,13 +38,13 @@
## @end deftypefn
## Copyright (C) 2008, Alexander Barth
-## Author: Alexander Barth <ab...@ma...>
+## Author: Alexander Barth <bar...@gm...>
# {[@var{fi},@var{vari}] = } optiminterpn(@var{x},@var{y},@var{...},@var{f},@var{var},@var{lenx},@var{leny},@var{len...},@var{m},@var{xi},@var{yi},@var{...})
function [fi,vari] = optiminterpn(varargin)
-if nargin < 6 | mod(nargin-3,3) ~= 0
+if nargin < 6 || mod(nargin-3,3) ~= 0
error('optiminterpn: wrong number of arguments');
end
@@ -83,14 +83,14 @@
var = var*ones(size(x));
end
-if isvector(f) & size(f,1) == 1
+if isvector(f) && size(f,1) == 1
f = f';
end
% is this correct?
nf = size(f,n+1);
-if (on*nf ~= numel(f) & on ~= numel(var))
+if (on*nf ~= numel(f) && on ~= numel(var))
error('optiminterpn: x,y,...,var must have the same number of elements');
end
Modified: trunk/octave-forge/main/optiminterp/src/example_optiminterp.F90
===================================================================
--- trunk/octave-forge/main/optiminterp/src/example_optiminterp.F90 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/src/example_optiminterp.F90 2011-03-25 09:55:01 UTC (rev 8184)
@@ -1,6 +1,6 @@
!
! Example for using the n-dimentional optimal interpolation Fortran module
-! Copyright (C) 2005 Alexander Barth <ab...@ma...>
+! Copyright (C) 2005 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
@@ -16,7 +16,7 @@
! along with this program; if not, see <http://www.gnu.org/licenses/>.
!
-! Author: Alexander Barth <ab...@ma...>
+! Author: Alexander Barth <bar...@gm...>
program test_optiminterp
use optimal_interpolation
Modified: trunk/octave-forge/main/optiminterp/src/optimal_interpolation.F90
===================================================================
--- trunk/octave-forge/main/optiminterp/src/optimal_interpolation.F90 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/src/optimal_interpolation.F90 2011-03-25 09:55:01 UTC (rev 8184)
@@ -1,6 +1,6 @@
! Fortran 90 module for n-dimensional optimal interpolation.
-! Copyright (C) 2005 Alexander Barth <ab...@ma...>
+! Copyright (C) 2005 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
Modified: trunk/octave-forge/main/optiminterp/src/optiminterp.cc
===================================================================
--- trunk/octave-forge/main/optiminterp/src/optiminterp.cc 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/src/optiminterp.cc 2011-03-25 09:55:01 UTC (rev 8184)
@@ -1,6 +1,6 @@
/*
n-dimensional optimal interpolation
- Copyright (C) 2005 Alexander Barth <ab...@ma...>
+ Copyright (C) 2005 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
@@ -16,7 +16,7 @@
along with this program; If not, see <http://www.gnu.org/licenses/>.
- Author: Alexander Barth <ab...@ma...>
+ Author: Alexander Barth <bar...@gm...>
*/
Modified: trunk/octave-forge/main/optiminterp/src/optiminterp_wrapper.F90
===================================================================
--- trunk/octave-forge/main/optiminterp/src/optiminterp_wrapper.F90 2011-03-25 09:36:19 UTC (rev 8183)
+++ trunk/octave-forge/main/optiminterp/src/optiminterp_wrapper.F90 2011-03-25 09:55:01 UTC (rev 8184)
@@ -1,6 +1,6 @@
!
! n-dimentional optimal interpolation
-! Copyright (C) 2005 Alexander Barth <ab...@ma...>
+! Copyright (C) 2005 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
@@ -16,7 +16,7 @@
! along with this program; if not, see <http://www.gnu.org/licenses/>.
!
-! Author: Alexander Barth <ab...@ma...>
+! Author: Alexander Barth <bar...@gm...>
subroutine optiminterpwrapper(n,nf,gn,on,nparam,ox,of,ovar, &
param,m,gx,gf,gvar)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
