[Octave-cvsupdate] SF.net SVN: octave:[10087] trunk/octave-forge/main/system-identification/ inst/tisean/corrdim.m

[<jpi...@us...>]

Revision: 10087
          http://octave.svn.sourceforge.net/octave/?rev=10087&view=rev
Author:   jpicarbajal
Date:     2012-03-28 20:30:21 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
system-identification: TISEAN d2 wrapper

Modified Paths:
--------------
    trunk/octave-forge/main/system-identification/inst/tisean/corrdim.m

Modified: trunk/octave-forge/main/system-identification/inst/tisean/corrdim.m
===================================================================
--- trunk/octave-forge/main/system-identification/inst/tisean/corrdim.m	2012-03-28 20:21:17 UTC (rev 10086)
+++ trunk/octave-forge/main/system-identification/inst/tisean/corrdim.m	2012-03-28 20:30:21 UTC (rev 10087)
@@ -20,13 +20,15 @@
 %%
 %% @end deftypefn
 
-function [c d h] = corrdim (data, comp=1, maxedim=10, varargin)
+function [c d h] = corrdim (data, varargin)
 
 
   [nT M] = size (data);
   # --- Parse arguments --- #
   parser = inputParser ();
   parser.FunctionName = "corrdim";
+  parser = addParamValue (parser,'Components', 1, @(x)x>0);
+  parser = addParamValue (parser,'MaxEdim', 10, @(x)x>0);
   parser = addParamValue (parser,'Delay', 1, @(x)x>0);
   parser = addParamValue (parser,'TheilerWindow', 0, @(x)x>=0);
   parser = addParamValue (parser,'ScaleSpan', nT*[1e-3 1], @(x)all(x>0));
@@ -50,7 +52,8 @@
   %% Prepare format of the embedding vector
   syscmd = sprintf ("d2 -d%d -M%d,%d -t%d -r%d -R%d -#%d -N%d %s -o%s -V0 %s", ...
                         parser.Results.Delay, ...
-                        comp, maxedim, ...
+                        parser.Results.Components, ...
+                        parser.Results.MaxEdim, ...
                         parser.Results.TheilerWindow, ...
                         parser.Results.ScaleSpan, ...
                         parser.Results.EpsilonCount, ...

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.