octave-cvsupdate — CVS update notifications

[Octave-cvsupdate] SF.net SVN: octave:[10323] trunk/octave-forge/main/statistics/inst/kmeans.m

[<car...@us...>]

Revision: 10323
          http://octave.svn.sourceforge.net/octave/?rev=10323&view=rev
Author:   carandraug
Date:     2012-04-24 16:20:55 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
kmeans: small changes of style and avoid duplication of variables

Modified Paths:
--------------
    trunk/octave-forge/main/statistics/inst/kmeans.m

Modified: trunk/octave-forge/main/statistics/inst/kmeans.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/kmeans.m	2012-04-24 16:06:07 UTC (rev 10322)
+++ trunk/octave-forge/main/statistics/inst/kmeans.m	2012-04-24 16:20:55 UTC (rev 10323)
@@ -15,18 +15,18 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 function [classes, centers, sumd, D] = kmeans (data, k, varargin)
-  [reg, prop] = parseparams(varargin);
-  
-  #defaults for options
-  emptyaction = 'error';
-  start = "sample";
-  
+  [reg, prop] = parseparams (varargin);
+
+  ## defaults for options
+  emptyaction = "error";
+  start       = "sample";
+
   #used for getting the number of samples
-  [N, D] = size (data);
+  nRows = rows (data);
+
+  ## used to hold the distances from each sample to each class
+  D = zeros (nRows, k);
   
-  #used to hold the distances from each sample to each class
-  D = zeros (N, k);
-  
   #used for convergence of the centroids
   err = 1;
   
@@ -34,40 +34,37 @@
   sumd = Inf;
   
   ## Input checking, validate the matrix and k
-  if (!ismatrix (data) || !isreal (data))
+  if (!isnumeric (data) || !ismatrix (data) || !isreal (data))
     error ("kmeans: first input argument must be a DxN real data matrix");
-  endif
-  if (!isscalar (k))
+  elseif (!isscalar (k))
     error ("kmeans: second input argument must be a scalar");
   endif
   
-  if(length(varargin) > 0)
+  if (length (varargin) > 0)
     ## check for the 'emptyaction' property
-    found = find(strcmpi(prop,'emptyaction') == 1);
-    switch(lower(prop{found+1}))
-      case 'singleton'
-        emptyaction = 'singleton';
+    found = find (strcmpi (prop, "emptyaction") == 1);
+    switch (lower (prop{found+1}))
+      case "singleton"
+        emptyaction = "singleton";
       otherwise
         error ("kmeans: unsupported empty cluster action parameter");
     endswitch
   endif
   
   ## check for the 'start' property
-  #found = find(strcmpi(prop,'start') == 1);
-  switch (lower(start))
+  switch (lower (start))
     case "sample"
-      idx = randperm (N) (1:k);
+      idx = randperm (nRows) (1:k);
       centers = data (idx, :);
     otherwise
       error ("kmeans: unsupported initial clustering parameter");
   endswitch
   
- 
   ## Run the algorithm
   while err > .001
     ## Compute distances
     for i = 1:k
-      D (:, i) = sumsq(data - repmat(centers(i, :), N, 1), 2);
+      D (:, i) = sumsq (data - repmat (centers(i, :), nRows, 1), 2);
     endfor
     
     ## Classify
@@ -75,55 +72,44 @@
     
     ## Calcualte new centroids
     for i = 1:k
-  
       ## Check for empty clusters
-      if sum(classes==i)==0 || length(mean(data(classes == i, :))) == 0
+      if (sum (classe s== i) ==0 || length (mean (data(classes == i, :))) == 0)
       
-        switch(emptyaction)
+        switch emptyaction
           ## if 'singleton', then find the point that is the
           ## farthest and add it to the empty cluster
-        case 'singleton'
-          classes(maxCostSampleIndex(data,centers(i,:))) = i;
-
-        ## if 'error' then throw the error
-        otherwise
-          error ("kmeans: empty cluster created");
+          case 'singleton'
+            classes(maxCostSampleIndex (data, centers(i,:))) = i;
+         ## if 'error' then throw the error
+          otherwise
+            error ("kmeans: empty cluster created");
         endswitch
+     endif ## end check for empty clusters
 
-      endif ## end check for empty clusters
-
       ## update the centroids
-      centers (i, :) = mean (data (classes == i, :));
-      
+      centers(i, :) = mean (data(classes == i, :));
     endfor
-    
+
     ## calculate the differnece in the sum of distances
-    err = sumd - objCost(data,classes,centers);
+    err  = sumd - objCost (data, classes, centers);
     ## update the current sum of distances
-    sumd = objCost(data,classes,centers);
-  endwhile  
+    sumd = objCost (data, classes, centers);
+  endwhile
 endfunction
 
 ## calculate the sum of distances
-function obj = objCost(data,classes,centers)
-  [N D] = size(data);
-  sum = 0;
-
-    for i=1:N
-      sum = sum + sumsq(data(i,:)-centers(classes(i),:));
+function obj = objCost (data, classes, centers)
+  obj = 0;
+    for i=1:rows (data)
+      obj = obj + sumsq (data(i,:) - centers(classes(i),:));
     endfor
-
-    obj = sum;
 endfunction
 
-function index = maxCostSampleIndex(data,centers)
-  [n m] = size(data); 
+function index = maxCostSampleIndex (data, centers)
   cost = 0;
-  index = 1;
-  for j = 1:n
-    if cost < sumsq(data(j,:) - centers)
-      cost = sumsq(data(j,:) - centers);
-      index = j;
+  for index = 1:rows (data)
+    if cost < sumsq (data(index,:) - centers)
+      cost = sumsq (data(index,:) - centers);
     endif
   endfor
 endfunction

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

[Octave-cvsupdate] SF.net SVN: octave:[10322] trunk/octave-forge/main/statistics

[<car...@us...>]

Revision: 10322
          http://octave.svn.sourceforge.net/octave/?rev=10322&view=rev
Author:   carandraug
Date:     2012-04-24 16:06:07 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
kmeans: patch by Daniel Ward <dw...@gm...>

 * expand the returned items to closer match the Matlab kmeans
 * 'emptyaction' property with the 'singleton' value
 * handle empty cluster better
 * throw an error if the user does not request and empty cluster handling, and there is an empty cluster

Modified Paths:
--------------
    trunk/octave-forge/main/statistics/NEWS
    trunk/octave-forge/main/statistics/inst/kmeans.m

Modified: trunk/octave-forge/main/statistics/NEWS
===================================================================
--- trunk/octave-forge/main/statistics/NEWS	2012-04-24 08:23:36 UTC (rev 10321)
+++ trunk/octave-forge/main/statistics/NEWS	2012-04-24 16:06:07 UTC (rev 10322)
@@ -5,6 +5,12 @@
     later) since the functions that it depended of from miscellaneous
     package have been moved to io.
 
+ ** The function `kmeans' now accepts the 'emptyaction' property with
+    the 'singleton' value. This allows for the kmeans algorithm to handle
+    empty cluster better. It also throws an error if the user does not
+    request an empty cluster handling, and there is an empty cluster.
+    Plus, the returned items are now a closer match to Matlab.
+
 Summary of important user-visible changes for statistics 1.1.1:
 -------------------------------------------------------------------
 

Modified: trunk/octave-forge/main/statistics/inst/kmeans.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/kmeans.m	2012-04-24 08:23:36 UTC (rev 10321)
+++ trunk/octave-forge/main/statistics/inst/kmeans.m	2012-04-24 16:06:07 UTC (rev 10322)
@@ -1,4 +1,5 @@
 ## Copyright (C) 2011 Soren Hauberg <so...@ha...>
+## Copyright (C) 2012 Daniel Ward <dw...@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
@@ -13,8 +14,26 @@
 ## You should have received a copy of the GNU General Public License along with
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
-function [classes, centers] = kmeans (data, k, varargin)
-  ## Input checking
+function [classes, centers, sumd, D] = kmeans (data, k, varargin)
+  [reg, prop] = parseparams(varargin);
+  
+  #defaults for options
+  emptyaction = 'error';
+  start = "sample";
+  
+  #used for getting the number of samples
+  [N, D] = size (data);
+  
+  #used to hold the distances from each sample to each class
+  D = zeros (N, k);
+  
+  #used for convergence of the centroids
+  err = 1;
+  
+  #initial sum of distances
+  sumd = Inf;
+  
+  ## Input checking, validate the matrix and k
   if (!ismatrix (data) || !isreal (data))
     error ("kmeans: first input argument must be a DxN real data matrix");
   endif
@@ -22,14 +41,20 @@
     error ("kmeans: second input argument must be a scalar");
   endif
   
-  [N, D] = size (data);
+  if(length(varargin) > 0)
+    ## check for the 'emptyaction' property
+    found = find(strcmpi(prop,'emptyaction') == 1);
+    switch(lower(prop{found+1}))
+      case 'singleton'
+        emptyaction = 'singleton';
+      otherwise
+        error ("kmeans: unsupported empty cluster action parameter");
+    endswitch
+  endif
   
-  ## (so far) Harcoded options
-  maxiter = Inf;
-  start = "sample";
-  
-  ## Find initial clusters
-  switch (lower (start))
+  ## check for the 'start' property
+  #found = find(strcmpi(prop,'start') == 1);
+  switch (lower(start))
     case "sample"
       idx = randperm (N) (1:k);
       centers = data (idx, :);
@@ -37,31 +62,70 @@
       error ("kmeans: unsupported initial clustering parameter");
   endswitch
   
+ 
   ## Run the algorithm
-  D = zeros (N, k);
-  iterations = 0;
-  prevcenters = centers;
-  while (true)
+  while err > .001
     ## Compute distances
     for i = 1:k
-      D (:, i) = sum (( data - repmat (centers (i, :), N, 1)).^2, 2);
+      D (:, i) = sumsq(data - repmat(centers(i, :), N, 1), 2);
     endfor
     
     ## Classify
     [tmp, classes] = min (D, [], 2);
     
-    ## Recompute centers
+    ## Calcualte new centroids
     for i = 1:k
+  
+      ## Check for empty clusters
+      if sum(classes==i)==0 || length(mean(data(classes == i, :))) == 0
+      
+        switch(emptyaction)
+          ## if 'singleton', then find the point that is the
+          ## farthest and add it to the empty cluster
+        case 'singleton'
+          classes(maxCostSampleIndex(data,centers(i,:))) = i;
+
+        ## if 'error' then throw the error
+        otherwise
+          error ("kmeans: empty cluster created");
+        endswitch
+
+      endif ## end check for empty clusters
+
+      ## update the centroids
       centers (i, :) = mean (data (classes == i, :));
+      
     endfor
     
-    ## Check for convergence
-    iterations++;
-    if (all (centers (:) == prevcenters (:)) || iterations >= maxiter)
-      break;
+    ## calculate the differnece in the sum of distances
+    err = sumd - objCost(data,classes,centers);
+    ## update the current sum of distances
+    sumd = objCost(data,classes,centers);
+  endwhile  
+endfunction
+
+## calculate the sum of distances
+function obj = objCost(data,classes,centers)
+  [N D] = size(data);
+  sum = 0;
+
+    for i=1:N
+      sum = sum + sumsq(data(i,:)-centers(classes(i),:));
+    endfor
+
+    obj = sum;
+endfunction
+
+function index = maxCostSampleIndex(data,centers)
+  [n m] = size(data); 
+  cost = 0;
+  index = 1;
+  for j = 1:n
+    if cost < sumsq(data(j,:) - centers)
+      cost = sumsq(data(j,:) - centers);
+      index = j;
     endif
-    prevcenters = centers;
-  endwhile
+  endfor
 endfunction
 
 %!demo
@@ -80,4 +144,3 @@
 %! plot (data (idx==2, 1), data (idx==2, 2), 'bs');
 %! plot (centers (:, 1), centers (:, 2), 'kv', 'markersize', 10);
 %! hold off
-

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

[Octave-cvsupdate] SF.net SVN: octave:[10321] trunk/octave-forge/extra/NaN/src/xptopen.cpp

[<sch...@us...>]

Revision: 10321
          http://octave.svn.sourceforge.net/octave/?rev=10321&view=rev
Author:   schloegl
Date:     2012-04-24 08:23:36 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
clean up code - get rid of some warnings

Modified Paths:
--------------
    trunk/octave-forge/extra/NaN/src/xptopen.cpp

Modified: trunk/octave-forge/extra/NaN/src/xptopen.cpp
===================================================================
--- trunk/octave-forge/extra/NaN/src/xptopen.cpp	2012-04-24 07:58:12 UTC (rev 10320)
+++ trunk/octave-forge/extra/NaN/src/xptopen.cpp	2012-04-24 08:23:36 UTC (rev 10321)
@@ -833,7 +833,7 @@
 				size_t maxlen = b_endian_u16(*(int16_t*)(H2+k*sz2+4));
 
 				ListOfVarNames[k] = VarNames+pos;
-				unsigned int n = k*sz2+8;
+				size_t n = k*sz2+8;
 				// int flagDate = (!memcmp(H2+n+48,"DATE    ",8) || !memcmp(H2+n+48,"MONNAME ",8)); // not used
 				do {
 					VarNames[pos++] = H2[n];
@@ -936,7 +936,7 @@
 		mxArray **F = (mxArray**) mxMalloc(NS*sizeof(mxArray*));
 		char **Fstr = (char**) malloc(NS*sizeof(char*));
 		size_t *MAXLEN = (size_t*) malloc(NS*sizeof(size_t*));
-		for (int16_t k = 0; k < NS; k++) {
+		for (uint16_t k = 0; k < NS; k++) {
 			Fstr[k] = NULL;
 			MAXLEN[k]=0;
 			F[k] = mxGetFieldByNumber(PInputs[2],0,k);
@@ -978,7 +978,7 @@
 		/* write OBS header line */
 		count += fwrite(LO, 1, strlen(LO), fid);
 		for (mwIndex m = 0; m < M; m++) {
-			for (int16_t k = 0; k < NS; k++) {
+			for (uint16_t k = 0; k < NS; k++) {
 
 				if (*(int16_t*)(H2+k*sz2) == b_endian_u16(1)) {
 					// numeric
@@ -1130,7 +1130,7 @@
 
 	// Set start of year to March by moving Jan. and Feb. to previous year.
   	// Correct for months > 12 by moving to subsequent years.
-  	Y += fix ((M-14.0)/12);
+  	Y += (int)fix ((M-14.0)/12);
 
   	const int monthstart[] = {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
 	// Lookup number of days since start of the current year.

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

[Octave-cvsupdate] SF.net SVN: octave:[10320] trunk/octave-forge/extra/NaN/src/xptopen.cpp

[<sch...@us...>]

Revision: 10320
          http://octave.svn.sourceforge.net/octave/?rev=10320&view=rev
Author:   schloegl
Date:     2012-04-24 07:58:12 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
better platform checks

Modified Paths:
--------------
    trunk/octave-forge/extra/NaN/src/xptopen.cpp

Modified: trunk/octave-forge/extra/NaN/src/xptopen.cpp
===================================================================
--- trunk/octave-forge/extra/NaN/src/xptopen.cpp	2012-04-24 07:23:15 UTC (rev 10319)
+++ trunk/octave-forge/extra/NaN/src/xptopen.cpp	2012-04-24 07:58:12 UTC (rev 10320)
@@ -72,12 +72,15 @@
 #define max(a,b)	(((a) > (b)) ? (a) : (b))
 #define min(a,b)	(((a) < (b)) ? (a) : (b))
 
+
 #if 0
 
 #elif defined(__linux__) 
+#  include <endian.h>
 #  include <byteswap.h>
 
 #elif defined(__GLIBC__)	// for Hurd
+#  include <endian.h>
 #  include <byteswap.h>
 
 #elif defined(__MINGW32__) 
@@ -130,8 +133,11 @@
 #  define __LITTLE_ENDIAN  	1234
 #  define __BYTE_ORDER 	__BIG_ENDIAN
 
+#else
+#  error Unknown platform
 #endif 
 
+#if defined(__MINGW32__) || defined(__sparc__) 
 
 # ifndef bswap_16
 #  define bswap_16(x)   \
@@ -159,7 +165,18 @@
       	| (((x) & 0x00000000000000ffull) << 56))
 # endif
 
+#endif
 
+
+#if !defined(__BIG_ENDIAN) && !defined(__LITTLE_ENDIAN) 
+#error  ENDIANITY is not known 
+#endif 
+
+#if !defined(bswap_16) || !defined(bswap_32) || !defined(bswap_64)
+#error SWAP operation not available 
+#endif 
+
+
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define l_endian_u16(x) ((uint16_t)bswap_16((uint16_t)(x)))
 #define l_endian_u32(x) ((uint32_t)bswap_32((uint32_t)(x)))

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

[Octave-cvsupdate] SF.net SVN: octave:[10319] trunk/octave-forge/extra/NaN/src/xptopen.cpp

[<sch...@us...>]

Revision: 10319
          http://octave.svn.sourceforge.net/octave/?rev=10319&view=rev
Author:   schloegl
Date:     2012-04-24 07:23:15 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
fix for MinGW and Apple, and eventually Hurd

Modified Paths:
--------------
    trunk/octave-forge/extra/NaN/src/xptopen.cpp

Modified: trunk/octave-forge/extra/NaN/src/xptopen.cpp
===================================================================
--- trunk/octave-forge/extra/NaN/src/xptopen.cpp	2012-04-24 06:58:30 UTC (rev 10318)
+++ trunk/octave-forge/extra/NaN/src/xptopen.cpp	2012-04-24 07:23:15 UTC (rev 10319)
@@ -72,15 +72,19 @@
 #define max(a,b)	(((a) > (b)) ? (a) : (b))
 #define min(a,b)	(((a) < (b)) ? (a) : (b))
 
-#if defined(__MINGW32__) 
+#if 0
+
+#elif defined(__linux__) 
+#  include <byteswap.h>
+
+#elif defined(__GLIBC__)	// for Hurd
+#  include <byteswap.h>
+
+#elif defined(__MINGW32__) 
    /* use local version because MINGW does not provide byteswap.h */
-#  define __BIG_ENDIAN  	 4321
-#  define __LITTLE_ENDIAN  1234
-#  define __BYTE_ORDER 	__LITTLE_ENDIAN
-#  include "win32/byteswap.h"
-#  define bswap_16(x) __bswap_16(x)
-#  define bswap_32(x) __bswap_32(x)
-#  define bswap_64(x) __bswap_64(x)
+#  define __BIG_ENDIAN		4321
+#  define __LITTLE_ENDIAN  	1234
+#  define __BYTE_ORDER 		__LITTLE_ENDIAN
 
 #elif defined(__NetBSD__)
 #  include <sys/bswap.h>
@@ -93,14 +97,18 @@
 
 #elif defined(__APPLE__)
 #  include <CoreFoundation/CFByteOrder.h>
-#  define __BIG_ENDIAN  	CFByteOrderBigEndian
-#  define __LITTLE_ENDIAN	CFByteOrderLittleEndian
-#  define __BYTE_ORDER (CFByteOrderGetCurrent)
+#  define __BIG_ENDIAN       4321
+#  define __LITTLE_ENDIAN  1234
+#if (defined(__LITTLE_ENDIAN__) && (__LITTLE_ENDIAN__ == 1))
+    #define __BYTE_ORDER __LITTLE_ENDIAN
+#else
+    #define __BYTE_ORDER __BIG_ENDIAN
+#endif
 #  define bswap_16(x) CFSwapInt16(x)
 #  define bswap_32(x) CFSwapInt32(x)
 #  define bswap_64(x) CFSwapInt64(x)
 
-#elif (defined(BSD) && (BSD >= 199103))
+#elif (defined(BSD) && (BSD >= 199103)) && !defined(__GLIBC__)
 #  include <machine/endian.h>
 #  define __BIG_ENDIAN _BIG_ENDIAN
 #  define __LITTLE_ENDIAN _LITTLE_ENDIAN

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

[Octave-cvsupdate] SF.net SVN: octave:[10318] trunk/octave-forge/main/control/devel

[<par...@us...>]

Revision: 10318
          http://octave.svn.sourceforge.net/octave/?rev=10318&view=rev
Author:   paramaniac
Date:     2012-04-24 06:58:30 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
control: draft code for James B. Rawlings

Modified Paths:
--------------
    trunk/octave-forge/main/control/devel/lqe.m

Added Paths:
-----------
    trunk/octave-forge/main/control/devel/dlqe.m

Added: trunk/octave-forge/main/control/devel/dlqe.m
===================================================================
--- trunk/octave-forge/main/control/devel/dlqe.m	                        (rev 0)
+++ trunk/octave-forge/main/control/devel/dlqe.m	2012-04-24 06:58:30 UTC (rev 10318)
@@ -0,0 +1,22 @@
+function [l, p, z, e] = dlqe (a, g, c, q, r, s = [])
+
+  if (nargin < 5 || nargin > 6)
+    print_usage ();
+  endif
+
+  if (isempty (s))
+    [~, p, e] = dlqr (a.', c.', g*q*g.', r);
+  else
+    [~, p, e] = dlqr (a.', c.', g*q*g.', r, g*s);
+  endif
+
+  ## k computed by dlqr would be
+  ## k = (r + c*p*c.') \ (c*p*a.' + s.')
+  ## such that  l = a \ k.'
+  ## what about the s term?
+    
+  l = p*c.' / (c*p*c.' + r);
+  ## z = p - p*c.' / (c*p*c.' + r) * c*p;
+  z = p - l*c*p;
+
+endfunction
\ No newline at end of file

Modified: trunk/octave-forge/main/control/devel/lqe.m
===================================================================
--- trunk/octave-forge/main/control/devel/lqe.m	2012-04-23 20:22:00 UTC (rev 10317)
+++ trunk/octave-forge/main/control/devel/lqe.m	2012-04-24 06:58:30 UTC (rev 10318)
@@ -1,15 +1,19 @@
-function [g, x, l] = lqe (a, c, q, r = [], s = [], e = [])
+function [l, p, e] = lqe (a, g, c, q = [], r = [], s = [])
 
   if (nargin < 3 || nargin > 6)
     print_usage ();
   endif
 
   if (isa (a, "lti"))
-    [g, x, l] = lqr (a.', c, q, r);  # lqr (sys.', q, r, s)
+    [l, p, e] = lqr (a.', g, c, q);         # lqe (sys.', q, r, s), g=I, works like  lqr (sys.', q, r, s).'
+  elseif (isempty (g))
+    [l, p, e] = lqr (a.', c.', q, r, s);    # lqe (a, [], c, q, r, s), g=I, works like  lqr (a.', c.', q, r, s).'
+  elseif (isempty (s))
+    [l, p, e] = lqr (a.', c.', g*q*g.', r);
   else
-    [g, x, l] = lqr (a.', c.', q, r, s, e.');
+    [l, p, e] = lqr (a.', c.', g*q*g.', r, g*s);
   endif
-  
-  g = g.'
 
+  l = l.';
+
 endfunction
\ No newline at end of file

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

[Octave-cvsupdate] SF.net SVN: octave:[10317] trunk/octave-forge/main

[<car...@us...>]

Revision: 10317
          http://octave.svn.sourceforge.net/octave/?rev=10317&view=rev
Author:   carandraug
Date:     2012-04-23 20:22:00 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
combinatorics: removing package
 * combs() moved to specfun and deprecated
 * partcnt and partint moved to miscellaneous package
 * NEWS/INDEX/Makefile files updated 

Modified Paths:
--------------
    trunk/octave-forge/main/combinatorics/DESCRIPTION
    trunk/octave-forge/main/combinatorics/NEWS
    trunk/octave-forge/main/miscellaneous/INDEX
    trunk/octave-forge/main/miscellaneous/NEWS
    trunk/octave-forge/main/miscellaneous/src/Makefile
    trunk/octave-forge/main/specfun/NEWS

Added Paths:
-----------
    trunk/octave-forge/main/combinatorics/inst/dummy
    trunk/octave-forge/main/miscellaneous/PKG_ADD
    trunk/octave-forge/main/miscellaneous/src/partint.cc
    trunk/octave-forge/main/miscellaneous/src/partint.h
    trunk/octave-forge/main/specfun/inst/combs.m

Removed Paths:
-------------
    trunk/octave-forge/main/combinatorics/INDEX
    trunk/octave-forge/main/combinatorics/PKG_ADD
    trunk/octave-forge/main/combinatorics/inst/combs.m
    trunk/octave-forge/main/combinatorics/src/

Modified: trunk/octave-forge/main/combinatorics/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/combinatorics/DESCRIPTION	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/combinatorics/DESCRIPTION	2012-04-23 20:22:00 UTC (rev 10317)
@@ -1,11 +1,11 @@
 Name: Combinatorics
 Version: 1.0.9
 Date: 2009-05-18
-Author: Torsten Finke <fi...@ig...>
-Maintainer: Torsten Finke <fi...@ig...>
+Author: various authors
+Maintainer: Octave-Forge community <oct...@li...>
 Title: Combinatorics.
 Description: Combinatorics functions, incuding partitioning.
-Depends: octave (>= 2.9.7)
+Depends: specfun (>= 1.2.0), miscellaneous (>= 1.2.0)
 Autoload: no
 License: GPLv3+
 Url: http://octave.sf.net

Deleted: trunk/octave-forge/main/combinatorics/INDEX
===================================================================
--- trunk/octave-forge/main/combinatorics/INDEX	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/combinatorics/INDEX	2012-04-23 20:22:00 UTC (rev 10317)
@@ -1,5 +0,0 @@
-combinatorics >> Combinatorics
-Partitions
- partint
- partcnt
- combs

Modified: trunk/octave-forge/main/combinatorics/NEWS
===================================================================
--- trunk/octave-forge/main/combinatorics/NEWS	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/combinatorics/NEWS	2012-04-23 20:22:00 UTC (rev 10317)
@@ -1,4 +1,20 @@
 Summary of important user-visible changes for combinatorics 2.0.0:
 -------------------------------------------------------------------
 
+ ** VERY IMPORTANT: the combinatorics package has been removed. Its
+    integer partition functions have moved to miscellaneous while
+    `combs' has been moved to the specfun package. To avoid transition
+    problems, this new release is merely a dummy package with no functions,
+    and dependent on the new version of the miscellaneous and specfun
+    packages.
+
+ ** The function `combs' (now part of the specfun package) has been
+    deprecated in favour of `nchoosek' from Octave-core which should
+    perform faster. The only difference is that it does accept string
+    arrays (which does not make a lot of sense in the first place). To
+    workaround this, the following can be used:
+    
+      char (nchoosek (double (n_string), k))
+
  ** Package is no longer automatically loaded.
+

Deleted: trunk/octave-forge/main/combinatorics/PKG_ADD
===================================================================
--- trunk/octave-forge/main/combinatorics/PKG_ADD	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/combinatorics/PKG_ADD	2012-04-23 20:22:00 UTC (rev 10317)
@@ -1 +0,0 @@
-autoload ("partcnt", fullfile (fileparts (mfilename ("fullpath")), "partint.oct"));

Deleted: trunk/octave-forge/main/combinatorics/inst/combs.m
===================================================================
--- trunk/octave-forge/main/combinatorics/inst/combs.m	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/combinatorics/inst/combs.m	2012-04-23 20:22:00 UTC (rev 10317)
@@ -1,98 +0,0 @@
-## Copyright (C) 2007 Muthiah Annamalai <mut...@ut...>
-##
-## 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
-## this program; if not, see <http://www.gnu.org/licenses/>.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} @var{rval}= {} combs(@var{sym_set},@var{k})
-## Function generates the nchoosek(N,K) combinations, and returns it.
-## compute the combinations nchoosek(length(@var{sym_set}), @var{k})
-## nchoosek()  is a much faster variant of this function.
-## @example
-## @group
-##
-##           combs([1,2,3],2)
-##           ##returns value [1 2; 1 3; 2 3]
-##
-##           combs(['a','e','i','o','u'],2)
-##           ##returns value  [['a', 'e']; ['a', 'i']; ['a','o']; ['a','u']; ['e', 'i'];
-##           ##['e','o']; ['e','u']; ['i','o']; ['i','u']; ['o', 'u'];]
-##
-## @end group
-## @end example
-## @end deftypefn
-## @seealso {perms, nchoosek}
-
-##
-## Code modified from answer by 'leapinglizard-ga' on 
-## Google Answers, posted on 01 Sep 2004 09:13 PDT,
-## 
-
-function L=combs(Set,K)
-  if ( nargin < 2 )
-    print_usage()
-  end
-
-  N=length(Set);
-  %%printf("# of combinations = %g\n",nchoosek(N,K))
-  L=comb_worker(K,1,Set,[],true);
-  return
-end
-
-##
-## sub-function
-##
-function L=comb_worker(K,P,Set,combo,is_first)
-  persistent N
-  persistent Result
-  persistent count
-
-  L={};
-
-  if isempty(N)
-    N=length(Set);
-  end
-
-  if isempty(Result)
-    Result=[];
-  end
-
-  if (K == 0)
-    count=count+1;
-    Result=[Result; combo];
-    %%combo;
-    return
-  else
-    for idx=P:N
-      C=Set(idx);
-      combo=[combo C];
-      comb_worker(K-1,idx+1,Set,combo,false);
-      combo=combo(1:end-1);
-    end
-
-    if ( is_first > 0 )
-      L=Result;
-
-      %reset
-      N=[];
-      Result=[];
-      count=[];
-
-      return
-    end
-
-    return
-  end
-end
-
-%!assert(combs([1,2,3],2),[1 2; 1 3; 2 3])

Added: trunk/octave-forge/main/combinatorics/inst/dummy
===================================================================
--- trunk/octave-forge/main/combinatorics/inst/dummy	                        (rev 0)
+++ trunk/octave-forge/main/combinatorics/inst/dummy	2012-04-23 20:22:00 UTC (rev 10317)
@@ -0,0 +1,2 @@
+## pkg install does not allow dummy packages (without files). This ensures
+## that the package is installed without polluting the user's namespace

Modified: trunk/octave-forge/main/miscellaneous/INDEX
===================================================================
--- trunk/octave-forge/main/miscellaneous/INDEX	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/miscellaneous/INDEX	2012-04-23 20:22:00 UTC (rev 10317)
@@ -19,6 +19,8 @@
  normr
  nze
  partarray
+ partcnt
+ partint
  peano_curve
  publish
  read_options

Modified: trunk/octave-forge/main/miscellaneous/NEWS
===================================================================
--- trunk/octave-forge/main/miscellaneous/NEWS	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/miscellaneous/NEWS	2012-04-23 20:22:00 UTC (rev 10317)
@@ -6,6 +6,12 @@
  ** New functions:
    truncate.m : truncates a number to a given precision.
 
+ ** The following functions have been imported from the combinatorics
+    package which has been removed:
+
+      partcnt     partint
+
+
 ===============================================================================
 miscellaneous-1.1.0   Release Date: 2012-03-24  Release Manager:
 ===============================================================================

Copied: trunk/octave-forge/main/miscellaneous/PKG_ADD (from rev 10314, trunk/octave-forge/main/combinatorics/PKG_ADD)
===================================================================
--- trunk/octave-forge/main/miscellaneous/PKG_ADD	                        (rev 0)
+++ trunk/octave-forge/main/miscellaneous/PKG_ADD	2012-04-23 20:22:00 UTC (rev 10317)
@@ -0,0 +1 @@
+autoload ("partcnt", fullfile (fileparts (mfilename ("fullpath")), "partint.oct"));

Modified: trunk/octave-forge/main/miscellaneous/src/Makefile
===================================================================
--- trunk/octave-forge/main/miscellaneous/src/Makefile	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/miscellaneous/src/Makefile	2012-04-23 20:22:00 UTC (rev 10317)
@@ -1,7 +1,9 @@
-all: cell2cell.oct partarray.oct sample.oct text_waitbar.oct 
-
 MKOCTFILE = mkoctfile -Wall
 
+PROGS = $(patsubst %.cc,%.oct,$(wildcard *.cc))
+
+all: $(PROGS)
+
 %.oct: %.cc
 	$(MKOCTFILE) $<
 

Copied: trunk/octave-forge/main/miscellaneous/src/partint.cc (from rev 10315, trunk/octave-forge/main/combinatorics/src/partint.cc)
===================================================================
--- trunk/octave-forge/main/miscellaneous/src/partint.cc	                        (rev 0)
+++ trunk/octave-forge/main/miscellaneous/src/partint.cc	2012-04-23 20:22:00 UTC (rev 10317)
@@ -0,0 +1,225 @@
+// Copyright (C) 2006 Torsten Finke <fi...@ig...>
+//
+// 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
+// this program; if not, see <http://www.gnu.org/licenses/>.
+
+#include <octave/oct.h>
+#include <octave/lo-ieee.h>
+
+#include "partint.h"
+
+unsigned long * pcnt(unsigned long n) 
+{
+    unsigned long *s = new unsigned long[n];
+    unsigned long *x = new unsigned long[n*n];
+    unsigned long **p = new unsigned long*[n];
+    for (unsigned long k=0; k<n; ++k)  {
+        p[k] = x + (k*n);
+        s[k] = 0;
+    }
+    for (unsigned long k=0; k<n*n; ++k)  x[k] = 0;
+    p[0][0] = 1;
+    for (unsigned long k=1; k<n; ++k)
+    {
+        // p[N][j] == numpart of N with max summand j
+        for (unsigned long j=1; j<=k; ++j) {
+            p[k][j] = p[k-1][j-1] + p[k-j][j];
+        }
+        for (unsigned long j=1; j<=k; ++j) {
+            s[k] += p[k][j]; // S(k) = numpart(n)
+        }
+    }
+    return s;
+}
+
+DEFUN_DLD (partcnt, args, ,
+"-*- texinfo -*-\n\
+@deftypefn{Loadable Function} {@var{p} =} partcnt(@var{n})\n\
+\n\
+@cindex partition count\n\
+\n\
+Calculate integer partition count. Argument @var{n} be scalar, vector\n\
+or matrix of non-negative numbers. A partition is the sum decomposition \n\
+of integers. \n\
+\n\
+Example:\n\
+@example \n\
+partcnt([1, 5; 17 -3])\n\
+@end example\n\
+@noindent\n\
+returns\n\
+@example\n\
+ans =\n\
+    1     7\n\
+  297   NaN\n\
+@end example\n\
+\n\
+Reference:\n\
+Joerg Arndt: Algorithms for programmers (http://www.jjj.de), 2006.\n\n\
+@end deftypefn\n\
+@seealso{partint}\n\
+")
+{
+    octave_value r;
+    
+    int nargin = args.length ();
+    if (nargin != 1) {
+        error("partcnt accepts exactly one argument");
+        return r; 
+    }
+    if ( ! args(0).is_numeric_type()) {
+        error("partcnt only accepts a numeric argument");
+        return r;
+    }
+
+    NDArray f(args(0).matrix_value());
+    RowVector m(f.max());
+    double mmax = m.max();
+    if ( mmax < 1 ) {
+        error("partcnt is only defined for non-negative arguments");
+        return r;
+    }
+
+    unsigned long n = (unsigned long) mmax + 1;
+    unsigned long *s = pcnt(n);
+    unsigned long fr = (unsigned long) f.rows();
+    unsigned long fc = (unsigned long) f.columns();
+    for (unsigned long i=0; i<fr; i++) {
+        for (unsigned long k=0; k<fc; k++) {
+            unsigned long idx = (unsigned long) f(i, k);
+            if (0 < idx && idx < n) {
+                f(i, k) = s[idx];
+            } else {
+                f(i, k) = lo_ieee_nan_value();
+            }
+        }
+    }
+    r = f;
+    return r;
+}
+
+/*
+
+%!assert(partcnt(1), 1);
+%!assert(partcnt(17), 297);
+%!fail("partcnt()", "partcnt");
+%!fail("partcnt(1,2)", "partcnt");
+%!fail("partcnt('xyz')", "partcnt");
+%!demo
+%! p = partcnt([1, 5; 17 -5])
+
+*/
+
+DEFUN_DLD (partint, args, ,
+"-*- texinfo -*-\n\
+@deftypefn{Loadable Function} {@var{p} =} partint(@var{n})\n\
+\n\
+@cindex partition\n\
+\n\
+Calculate all integer partitions. Argument @var{n} be \n\
+a positive number. A partition is the sum decomposition \n\
+of integers. \n\
+\n\
+Example:\n\
+@example \n\
+partint(4)\n\
+@end example\n\
+@noindent\n\
+returns\n\
+@example\n\
+ans =\n\
+  4  0  0  0\n\
+  2  1  0  0\n\
+  0  2  0  0\n\
+  1  0  1  0\n\
+  0  0  0  1\n\
+@end example\n\
+\n\
+This means\n\n\
+@iftex\n\
+@tex\n\
+$$\eqalign{4 & = 4 \\cdot 1 \\cr\n\
+ & = 2 \\cdot 1 + 1 \\cdot 2 \\cr\n\
+ & = 2 \\cdot 2 \\cr\n\
+ & = 1 \\cdot 1 + 1 \\cdot 3 \\cr\n\
+ & = 1 \\cdot 1 \\cr\n\
+\\cr}$$\n\
+@end tex\n\
+@end iftex\n\
+@ifinfo\n\
+@example\n\
+4 = 4 * 1\n\
+  = 2 * 1 + 1 * 2\n\
+  =         2 * 2\n\
+  = 1 * 1         + 1 * 3\n\
+  =                 1 * 4\n\
+@end example\n\
+@end ifinfo\n\
+\n\
+Note:\n\
+\n\
+partint(n) * [1:n]' == n\n\
+\n\
+Reference:\n\
+Joerg Arndt: Algorithms for programmers (http://www.jjj.de), 2006.\n\n\
+@end deftypefn\n\
+@seealso{partcnt}\n\
+")
+{
+    octave_value r;
+    
+    int nargin = args.length ();
+    if (nargin != 1 || 
+        ! args(0).is_scalar_type() ||
+        ! args(0).is_numeric_type()
+        ) {
+        error("partint only accepts one scalar positive integer argument");
+        return r;
+    }
+    double arg0 = args(0).double_value();
+    if ( arg0 < 1 ) {
+        error("partint is only defined for positive integer arguments");
+        return r;
+    }
+
+    unsigned long n = (unsigned long) arg0;
+    unsigned long *s = pcnt(n+1);
+    unsigned long k = s[n];
+    Matrix pa(k, n, 0);
+    int_partition p(n);
+    unsigned long i = 0;
+    do {
+        const unsigned long *d = p.data();
+        for (unsigned long j=0; j<n; j++) {
+            pa(i, j) = (unsigned long)d[j+1];
+        }
+        i ++;
+    } while (p.next());
+    r = pa;
+    return r;
+}
+
+/*
+
+%!assert(partint(1), 1);
+%!assert(all(partint(n=17) * [1:n]' == n) - 1, 0); 
+%!test
+%! expected = [4,0,0,0; 2,1,0,0; 0,2,0,0; 1,0,1,0; 0,0,0,1];
+%! assert(partint(4), expected);
+%!fail("partint()", "partint");
+%!fail("partint(1,2)", "partint");
+%!fail("partint('xyz')", "partint");
+%!demo
+%! p = partint(4)
+
+*/

Copied: trunk/octave-forge/main/miscellaneous/src/partint.h (from rev 10315, trunk/octave-forge/main/combinatorics/src/partint.h)
===================================================================
--- trunk/octave-forge/main/miscellaneous/src/partint.h	                        (rev 0)
+++ trunk/octave-forge/main/miscellaneous/src/partint.h	2012-04-23 20:22:00 UTC (rev 10317)
@@ -0,0 +1,78 @@
+// Copyright (C) 2006 Torsten Finke <fi...@ig...>
+//
+// 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
+// this program; if not, see <http://www.gnu.org/licenses/>.
+
+class int_partition
+// Integer partitions
+// Reference: 
+//    Joerg Arndt: Algorithms for programmers
+//    (http://www.jjj.de), 2006.
+{
+private:
+    unsigned long *c_;  // partition:  c[1]* 1 + c[2]* 2 + ... + c[n]* n == n
+    unsigned long *s_;  // cumulative sums:  s[j+1] = c[1]* 1 + c[2]* 2 + ... + c[j]* j
+    unsigned long n_;   // partitions of n
+
+public:
+    int_partition(unsigned long n)
+    {
+        n_ = n;
+        c_ = new unsigned long[n+1];
+        s_ = new unsigned long[n+1];
+        s_[0] = 0;  // unused
+        c_[0] = 0;  // unused
+        first();
+    }
+
+    ~int_partition()
+    {
+        delete [] c_;
+        delete [] s_;
+    }
+
+    void first()
+    {
+        c_[1] = n_;
+        for (unsigned long i=2; i<=n_; i++)  { c_[i] = 0; }
+        s_[1] = 0;
+        for (unsigned long i=2; i<=n_; i++)  { s_[i] = n_; }
+    }
+
+    const unsigned long *data() const  { return c_; }  // one-based!
+
+    bool next()
+    {
+        // This algorithm was given by Torsten Finke
+        if ( c_[n_]!=0 )  return false;  // last == 1* n (c[n]==1)
+
+        // Find first coefficient c[i], i>=2 that can be increased:
+        unsigned long i = 2;
+        while ( s_[i]<i )  ++i;
+
+        ++c_[i];
+        s_[i] -= i;
+        unsigned long z = s_[i];
+        // Now set c[1], c[2], ..., c[i-1] to the first partition
+        // of z into i-1 parts, i.e. set to  z, 0, 0, ..., 0:
+        while ( --i > 1 )
+        {
+            s_[i] = z;
+            c_[i] = 0;
+        }
+        c_[1] = z;  // z* 1 == z
+        // s_[1] unused
+
+        return true;
+    }
+};

Modified: trunk/octave-forge/main/specfun/NEWS
===================================================================
--- trunk/octave-forge/main/specfun/NEWS	2012-04-23 19:55:13 UTC (rev 10316)
+++ trunk/octave-forge/main/specfun/NEWS	2012-04-23 20:22:00 UTC (rev 10317)
@@ -5,6 +5,13 @@
 
       big_factorial  lfactorial
 
+ ** The function `combs' (just imported from the combinatorics package)
+    has been deprecated in favour of `nchoosek' from Octave-core which
+    should perform faster. The only difference is that it does accept
+    string arrays (which does not make a lot of sense in the first place).
+    To workaround this, the following can be used:
+    
+      char (nchoosek (double (n_string), k))
 
 Summary of important user-visible changes for specfun 1.1.0:
 -------------------------------------------------------------------

Copied: trunk/octave-forge/main/specfun/inst/combs.m (from rev 10315, trunk/octave-forge/main/combinatorics/inst/combs.m)
===================================================================
--- trunk/octave-forge/main/specfun/inst/combs.m	                        (rev 0)
+++ trunk/octave-forge/main/specfun/inst/combs.m	2012-04-23 20:22:00 UTC (rev 10317)
@@ -0,0 +1,105 @@
+## Copyright (C) 2007 Muthiah Annamalai <mut...@ut...>
+##
+## 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
+## this program; if not, see <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn {Function File} @var{rval}= {} combs(@var{sym_set},@var{k})
+## Function generates the nchoosek(N,K) combinations, and returns it.
+## compute the combinations nchoosek(length(@var{sym_set}), @var{k})
+## nchoosek()  is a much faster variant of this function.
+## @example
+## @group
+##
+##           combs([1,2,3],2)
+##           ##returns value [1 2; 1 3; 2 3]
+##
+##           combs(['a','e','i','o','u'],2)
+##           ##returns value  [['a', 'e']; ['a', 'i']; ['a','o']; ['a','u']; ['e', 'i'];
+##           ##['e','o']; ['e','u']; ['i','o']; ['i','u']; ['o', 'u'];]
+##
+## @end group
+## @end example
+## @end deftypefn
+## @seealso {perms, nchoosek}
+
+##
+## Code modified from answer by 'leapinglizard-ga' on 
+## Google Answers, posted on 01 Sep 2004 09:13 PDT,
+## 
+
+function L=combs(Set,K)
+  persistent warned = false;
+  if (! warned)
+    warned = true;
+    warning ("Octave:deprecated-function",
+             "`combs' has been deprecated in favor of `nchoosek'. This function will be removed from future versions of the `specfun' package");
+  endif
+
+  if ( nargin < 2 )
+    print_usage()
+  end
+
+  N=length(Set);
+  %%printf("# of combinations = %g\n",nchoosek(N,K))
+  L=comb_worker(K,1,Set,[],true);
+  return
+end
+
+##
+## sub-function
+##
+function L=comb_worker(K,P,Set,combo,is_first)
+  persistent N
+  persistent Result
+  persistent count
+
+  L={};
+
+  if isempty(N)
+    N=length(Set);
+  end
+
+  if isempty(Result)
+    Result=[];
+  end
+
+  if (K == 0)
+    count=count+1;
+    Result=[Result; combo];
+    %%combo;
+    return
+  else
+    for idx=P:N
+      C=Set(idx);
+      combo=[combo C];
+      comb_worker(K-1,idx+1,Set,combo,false);
+      combo=combo(1:end-1);
+    end
+
+    if ( is_first > 0 )
+      L=Result;
+
+      %reset
+      N=[];
+      Result=[];
+      count=[];
+
+      return
+    end
+
+    return
+  end
+end
+
+%!assert(combs([1,2,3],2),[1 2; 1 3; 2 3])

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

[Octave-cvsupdate] SF.net SVN: octave:[10316] trunk/octave-forge/main/combinatorics

[<car...@us...>]

Revision: 10316
          http://octave.svn.sourceforge.net/octave/?rev=10316&view=rev
Author:   carandraug
Date:     2012-04-23 19:55:13 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
combinatorics: package is no longer automatically loaded

Modified Paths:
--------------
    trunk/octave-forge/main/combinatorics/DESCRIPTION

Added Paths:
-----------
    trunk/octave-forge/main/combinatorics/NEWS

Modified: trunk/octave-forge/main/combinatorics/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/combinatorics/DESCRIPTION	2012-04-23 19:52:37 UTC (rev 10315)
+++ trunk/octave-forge/main/combinatorics/DESCRIPTION	2012-04-23 19:55:13 UTC (rev 10316)
@@ -6,6 +6,6 @@
 Title: Combinatorics.
 Description: Combinatorics functions, incuding partitioning.
 Depends: octave (>= 2.9.7)
-Autoload: yes
+Autoload: no
 License: GPLv3+
 Url: http://octave.sf.net

Added: trunk/octave-forge/main/combinatorics/NEWS
===================================================================
--- trunk/octave-forge/main/combinatorics/NEWS	                        (rev 0)
+++ trunk/octave-forge/main/combinatorics/NEWS	2012-04-23 19:55:13 UTC (rev 10316)
@@ -0,0 +1,4 @@
+Summary of important user-visible changes for combinatorics 2.0.0:
+-------------------------------------------------------------------
+
+ ** Package is no longer automatically loaded.

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

[Octave-cvsupdate] SF.net SVN: octave:[10315] trunk/octave-forge/main/combinatorics

[<car...@us...>]

Revision: 10315
          http://octave.svn.sourceforge.net/octave/?rev=10315&view=rev
Author:   carandraug
Date:     2012-04-23 19:52:37 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
combinatorics: update license to GPLv3+

Modified Paths:
--------------
    trunk/octave-forge/main/combinatorics/COPYING
    trunk/octave-forge/main/combinatorics/DESCRIPTION
    trunk/octave-forge/main/combinatorics/inst/combs.m
    trunk/octave-forge/main/combinatorics/src/Makefile
    trunk/octave-forge/main/combinatorics/src/partint.cc
    trunk/octave-forge/main/combinatorics/src/partint.h

Modified: trunk/octave-forge/main/combinatorics/COPYING
===================================================================
--- trunk/octave-forge/main/combinatorics/COPYING	2012-04-23 17:37:57 UTC (rev 10314)
+++ trunk/octave-forge/main/combinatorics/COPYING	2012-04-23 19:52:37 UTC (rev 10315)
@@ -1,283 +1,625 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+                       TERMS AND CONDITIONS
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  0. Definitions.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "This License" refers to version 3 of the GNU General Public License.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  1. Source Code.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+  14. Revised Versions of this License.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-                            NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
                      END OF TERMS AND CONDITIONS
-
+
             How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -286,15 +628,15 @@
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    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
+    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,
@@ -303,35 +645,30 @@
     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/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Modified: trunk/octave-forge/main/combinatorics/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/combinatorics/DESCRIPTION	2012-04-23 17:37:57 UTC (rev 10314)
+++ trunk/octave-forge/main/combinatorics/DESCRIPTION	2012-04-23 19:52:37 UTC (rev 10315)
@@ -1,11 +1,11 @@
 Name: Combinatorics
 Version: 1.0.9
 Date: 2009-05-18
-Author: Torsten Finke   <fi...@ig...>
-Maintainer: Torsten Finke   <fi...@ig...>
+Author: Torsten Finke <fi...@ig...>
+Maintainer: Torsten Finke <fi...@ig...>
 Title: Combinatorics.
 Description: Combinatorics functions, incuding partitioning.
 Depends: octave (>= 2.9.7)
 Autoload: yes
-License: GPL version 2 or later
+License: GPLv3+
 Url: http://octave.sf.net

Modified: trunk/octave-forge/main/combinatorics/inst/combs.m
===================================================================
--- trunk/octave-forge/main/combinatorics/inst/combs.m	2012-04-23 17:37:57 UTC (rev 10314)
+++ trunk/octave-forge/main/combinatorics/inst/combs.m	2012-04-23 19:52:37 UTC (rev 10315)
@@ -1,18 +1,17 @@
 ## Copyright (C) 2007 Muthiah Annamalai <mut...@ut...>
 ##
-## 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 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.
+## 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/>.
-##
+## 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} @var{rval}= {} combs(@var{sym_set},@var{k})
@@ -95,6 +94,5 @@
     return
   end
 end
-%!
+
 %!assert(combs([1,2,3],2),[1 2; 1 3; 2 3])
-%!

Modified: trunk/octave-forge/main/combinatorics/src/Makefile
===================================================================
--- trunk/octave-forge/main/combinatorics/src/Makefile	2012-04-23 17:37:57 UTC (rev 10314)
+++ trunk/octave-forge/main/combinatorics/src/Makefile	2012-04-23 19:52:37 UTC (rev 10315)
@@ -1,37 +1,11 @@
-## Copyright (C) 2006   Torsten Finke   <fi...@ig...>
-##
-## 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/>.
+MKOCTFILE = /home/octave-admin/bin-3.6.1/bin/mkoctfile -Wall
 
-# $Revision$
-# $Date$
-# $RCSfile$
+PROGS = $(patsubst %.cc,%.oct,$(wildcard *.cc))
 
-OCT = partint.oct
-HDR = partint.h
-SRC := $(OCT:.oct=.cc)
-BASE := $(OCT:.oct=)
+all: $(PROGS)
 
-.phony: all
-all: $(OCT)
+%.oct: %.cc
+	$(MKOCTFILE) $<
 
-%.oct: %.cc $(HDR)
-	mkoctfile -s $<
-
-.phony: test
-test: $(BASE)
-	for i in $^; do echo "test $$i"; done | octave --silent
-
-.phony: clean
-clean: 
-	$(RM) $(PART) *.o *.oct octave-core *~
+clean:
+	rm -f *.o octave-core core *.oct *~

Modified: trunk/octave-forge/main/combinatorics/src/partint.cc
===================================================================
--- trunk/octave-forge/main/combinatorics/src/partint.cc	2012-04-23 17:37:57 UTC (rev 10314)
+++ trunk/octave-forge/main/combinatorics/src/partint.cc	2012-04-23 19:52:37 UTC (rev 10315)
@@ -1,26 +1,18 @@
-/*
-## Copyright (C) 2006   Torsten Finke   <fi...@ig...>
-##
-## 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/>.
+// Copyright (C) 2006 Torsten Finke <fi...@ig...>
+//
+// 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
+// this program; if not, see <http://www.gnu.org/licenses/>.
 
-$Revision$
-$Date$
-$RCSfile$
-
-*/
-
-
 #include <octave/oct.h>
 #include <octave/lo-ieee.h>
 
@@ -32,22 +24,22 @@
     unsigned long *x = new unsigned long[n*n];
     unsigned long **p = new unsigned long*[n];
     for (unsigned long k=0; k<n; ++k)  {
-	p[k] = x + (k*n);
-	s[k] = 0;
+        p[k] = x + (k*n);
+        s[k] = 0;
     }
     for (unsigned long k=0; k<n*n; ++k)  x[k] = 0;
     p[0][0] = 1;
     for (unsigned long k=1; k<n; ++k)
-    {	
+    {
         // p[N][j] == numpart of N with max summand j
-	for (unsigned long j=1; j<=k; ++j) {
-	    p[k][j] = p[k-1][j-1] + p[k-j][j];
-	}
-	for (unsigned long j=1; j<=k; ++j) { 
-	    s[k] += p[k][j]; // S(k) = numpart(n)
-	}
+        for (unsigned long j=1; j<=k; ++j) {
+            p[k][j] = p[k-1][j-1] + p[k-j][j];
+        }
+        for (unsigned long j=1; j<=k; ++j) {
+            s[k] += p[k][j]; // S(k) = numpart(n)
+        }
     }
-    return s; 
+    return s;
 }
 
 DEFUN_DLD (partcnt, args, ,
@@ -77,42 +69,42 @@
 @end deftypefn\n\
 @seealso{partint}\n\
 ")
-{    
+{
     octave_value r;
     
     int nargin = args.length ();
     if (nargin != 1) {
-	error("partcnt accepts exactly one argument"); 
-	return r; 
+        error("partcnt accepts exactly one argument");
+        return r; 
     }
     if ( ! args(0).is_numeric_type()) {
-	error("partcnt only accepts a numeric argument"); 
-	return r;
+        error("partcnt only accepts a numeric argument");
+        return r;
     }
 
     NDArray f(args(0).matrix_value());
-    RowVector m(f.max()); 
+    RowVector m(f.max());
     double mmax = m.max();
     if ( mmax < 1 ) {
-	error("partcnt is only defined for non-negative arguments"); 
-	return r;
+        error("partcnt is only defined for non-negative arguments");
+        return r;
     }
 
-    unsigned long n = (unsigned long) mmax + 1; 
-    unsigned long *s = pcnt(n); 
+    unsigned long n = (unsigned long) mmax + 1;
+    unsigned long *s = pcnt(n);
     unsigned long fr = (unsigned long) f.rows();
     unsigned long fc = (unsigned long) f.columns();
     for (unsigned long i=0; i<fr; i++) {
-	for (unsigned long k=0; k<fc;...
 
[truncated message content]

[Octave-cvsupdate] SF.net SVN: octave:[10314] trunk/octave-forge/main/zenity

[<car...@us...>]

Revision: 10314
          http://octave.svn.sourceforge.net/octave/?rev=10314&view=rev
Author:   carandraug
Date:     2012-04-23 17:37:57 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
zenity: big changes, using inputParser class from general to parse options

Modified Paths:
--------------
    trunk/octave-forge/main/zenity/DESCRIPTION
    trunk/octave-forge/main/zenity/inst/private/zenity_options.m
    trunk/octave-forge/main/zenity/inst/zenity_calendar.m
    trunk/octave-forge/main/zenity/inst/zenity_entry.m
    trunk/octave-forge/main/zenity/inst/zenity_file_selection.m
    trunk/octave-forge/main/zenity/inst/zenity_list.m
    trunk/octave-forge/main/zenity/inst/zenity_message.m
    trunk/octave-forge/main/zenity/inst/zenity_notification.m
    trunk/octave-forge/main/zenity/inst/zenity_progress.m

Added Paths:
-----------
    trunk/octave-forge/main/zenity/NEWS

Modified: trunk/octave-forge/main/zenity/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/zenity/DESCRIPTION	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/DESCRIPTION	2012-04-23 17:37:57 UTC (rev 10314)
@@ -9,6 +9,8 @@
  calendar windows, text entries, file selection dialogs,
  lists, message windows, icons in the notification area,
  and windows for large amount of text.
+Autoload: no
+Depends: general (>= 1.3.0)
+SystemRequirements: zenity (>= 2.16)
 License: GPLv3+
-SystemRequirements: zenity (>= 2.16)
 Url: http://octave.sf.net

Added: trunk/octave-forge/main/zenity/NEWS
===================================================================
--- trunk/octave-forge/main/zenity/NEWS	                        (rev 0)
+++ trunk/octave-forge/main/zenity/NEWS	2012-04-23 17:37:57 UTC (rev 10314)
@@ -0,0 +1,9 @@
+Summary of important user-visible changes for zenity 1.0.0:
+-------------------------------------------------------------------
+
+ ** IMPORTANT NOTE: all functions have a completely new API incompatible
+    with the previous releases
+
+ ** Check individual functions for many news options
+
+ ** package is now dependent on general (>= 1.3.0)

Modified: trunk/octave-forge/main/zenity/inst/private/zenity_options.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/private/zenity_options.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/private/zenity_options.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Carnë Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carnë Draug <car...@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
@@ -14,7 +14,7 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {@var{options} =} zenity_options (@var{dialog}, @var{param1}, @var{value1}, @dots{})
+## @deftypefn {Function File} @var{options} = zenity_options (@var{dialog}, @var{param1}, @var{value1}, @dots{})
 ## This function is not intended for users but for the other functions of the
 ## zenity package. Returns the structure @var{options} that holds the processed
 ## @var{param} and @var{value} for the function of the zenity package
@@ -44,46 +44,92 @@
 
   varargin = varargin{1};    # because other functions varargin is this varargin
 
-  ## Create empty variables in case user does not set them
-  op.title = op.width = op.height = op.timeout = op.icon = "";
-  if ( !ischar(dialog) )
+  p = inputParser;
+
+  is_single_number = @(x) isscalar (x) && isnumeric (x);
+
+  ## despite that we are setting defaults with inputParser we don't actually
+  ## want them. If they are not set, we want to use the user's zenity default
+  ## to be used. As such, we simply set something valid and will discard them
+  ## if after parsing, they show up on p.UsingDefaults
+
+  ## add general options to all zenity dialogs
+  p = p.addParamValue ("height",  1, is_single_number);
+  p = p.addParamValue ("icon",   "", @ischar);
+  p = p.addParamValue ("timeout", 1, is_single_number);
+  p = p.addParamValue ("title",  "", @ischar);
+  p = p.addParamValue ("width",   1, is_single_number);
+
+  if (!ischar (dialog))
     error ("Type of dialog should be a string");
-  elseif (strcmpi(dialog, "calendar"))
-    op.text = op.day = op.month = op.year = "";
-  elseif (strcmpi(dialog, "entry"))
-    op.password = op.entry = "";
-  elseif (strcmpi(dialog, "file selection"))
-    op.directory = op.filename = op.filter = op.multiple = op.save = "";
-  elseif (strcmpi(dialog, "list"))
-    op.separator = op.text     = op.hide      = op.print_col = op.no_head = "";
-    op.multiple  = op.radio    = op.check     = op.editable  = "";
-    op.hide_max  = op.hide_min = op.print_max = op.print_min = "";
-    op.print_numel = op.num_out = "";
-  elseif (strcmpi(dialog, "message"))
-    op.type = op.wrap = op.ok = op.cancel = "";
-  elseif (strcmpi(dialog, "new notification"))
-    op.text = "";
-  elseif (strcmpi(dialog, "piped notification"))
-    op.text = op.message = op.visible = "";
-  elseif (strcmpi(dialog, "new progress"))
-    op.percent  = op.text       = op.auto_close   = "";
-    op.pulsate  = op.auto_kill  = op.hide_cancel  = "";
-  elseif (strcmpi(dialog, "piped progress"))
-    op.percent  = op.text = "";
-  elseif (strcmpi(dialog, "new scale"))
+  elseif (strcmpi (dialog, "calendar"))
+    p = p.addParamValue ("day",    1, is_single_number);   # zenity still works when dates
+    p = p.addParamValue ("month",  1, is_single_number);   # are invalid (day 35 of month 13)
+    p = p.addParamValue ("text",  "", @ischar);
+    p = p.addParamValue ("year",   1, is_single_number);   # we should do the same
+
+  elseif (strcmpi (dialog, "entry"))
+    p = p.addParamValue ("entry", "", @ischar);
+    p = p.addSwitch     ("password");
+
+  elseif (strcmpi (dialog, "file selection"))
+    p = p.addSwitch     ("directory");
+    p = p.addParamValue ("filename", "", @ischar);
+    ## TODO add support for multiple filters (might need changes to @inputParser)
+    p = p.addParamValue ("filter",   "", @ischar);
+    p = p.addSwitch     ("multiple");
+    p = p.addSwitch     ("overwrite");
+    p = p.addSwitch     ("save");
+
+  elseif (strcmpi (dialog, "list"))
+    p = p.addSwitch     ("checklist");
+    p = p.addSwitch     ("editable");
+    p = p.addParamValue ("hide_column", 1, @(x) isnumeric (x) && isreal (x) && x > 0);
+    p = p.addSwitch     ("multiple");
+    p = p.addSwitch     ("no_headers");
+    p = p.addParamValue ("numeric_output", "error", @(x) ischar (x) && any (strcmpi (x, {"error", "NaN"})));
+    p = p.addParamValue ("print_column", 1, @(x) isnumeric (x) && isreal (x) && x >= 0);
+    p = p.addSwitch     ("radiolist");
+    p = p.addParamValue ("text", "", @ischar);
+
+  elseif (strcmpi (dialog, "message"))
+    p = p.addParamValue ("cancel", "", @ischar);
+    p = p.addSwitch     ("no_wrap");
+    p = p.addParamValue ("ok", "", @ischar);
+    p = p.addParamValue ("type", "error", @(x) ischar (x) && any (strcmpi (x, {"error", "info", "question", "warning"})));
+
+  elseif (strcmpi (dialog, "new notification"))
+    p = p.addParamValue ("text", "", @ischar);
+
+  elseif (strcmpi (dialog, "piped notification"))
+    p = p.addParamValue ("text", "", @ischar);
+    p = p.addParamValue ("message", "", @ischar);
+    p = p.addParamValue ("visible", "on", @(x) ischar (x) && any (strcmpi (x, {"off", "on"})));
+
+  elseif (strcmpi (dialog, "new progress"))
+    p = p.addSwitch     ("auto_close");
+    p = p.addSwitch     ("auto_kill");
+    p = p.addSwitch     ("hide_cancel");
+    p = p.addParamValue ("percentage", 1, @(x) is_single_number (x) && x >= 0 && x <= 100);
+    p = p.addSwitch     ("pulsate");
+    p = p.addParamValue ("text", "", @ischar);
+
+  elseif (strcmpi (dialog, "piped progress"))
+    p = p.addParamValue ("text", "", @ischar);
+    p = p.addParamValue ("percentage", 1, @(x) is_single_number (x) && x >= 0 && x <= 100);
+
+  elseif (strcmpi (dialog, "new scale"))
     op.text     = op.ini        = op.start  = "";
     op.hide     = op.end        = op.step   = "";
-  elseif (strcmpi(dialog, "piped scale"))
-  elseif (strcmpi(dialog, "text info"))
+  elseif (strcmpi (dialog, "piped scale"))
+  elseif (strcmpi (dialog, "text info"))
   else
     error ("The type of dialog '%s' is not supported", dialog);
   endif
 
-  ## In case no options were set, stop here and return the empty strings
-  if (numel(varargin) == 1 && isempty(varargin{1}))
-    return
-  endif
-
+  p   = p.parse(varargin{:});
+  op  = p.Results;
+  key = fieldnames (op);
   ## Identifies when it's being called to process stuff to send through pipes
   ## since that will have major differences in the processing
   if ( any (strcmpi(dialog, {"piped notification", "piped progress", "piped scale"})) )
@@ -92,384 +138,136 @@
     pipelining = 0;
   endif
 
-  ## Here's the guidelines for the processing:
-  ## - the parameteres and values are case insensitive
-  ## - if a parameter is being defined twice, return an error
-  ## - if a parameter requires a value but this is not given, return an error
-  ## - check if the rigth type of value is given (char or scalar) and return an
-  ## error if not
-
-  ## This will hold the index of varargin  that's currently being processed
-  narg = 1;
-
-  ## This will ONLY process the input when the output WON'T be sent through a
-  ## pipe. See the next while block for when it is
-  while (narg <= numel (varargin))
+  for ii = 1: numel (key)
     if (pipelining)
-      break                       # Move to the next while to process the input
+      break                       # Move to the next loop to process the input
+    elseif (any (strcmp (key{ii}, p.UsingDefaults)))
+      op = setfield (op, key{ii}, "");
+      continue
     endif
-    param = varargin{narg++};
-
-    if (narg <= numel(varargin))  # Check if we are already in the last index
-      value = varargin{narg};     # this is only for readability later on.
-    else                          # Writing varargin{narg} in all conditions
-      value = "";                 # is a pain and makes it even more confusing
-    endif
-
-    if ( !ischar(param) )
-        error ("All parameters must be strings.");
-
-    ## Process ALL GENERAL OPTIONS first
-    elseif (strcmpi(param,"title"))                   # General - title
-      narg            = sanity_checks ("char", param, value, op.title, narg);
-      op.title        = sprintf('--title="%s"', value);
-    elseif (strcmpi(param,"width"))                   # General - width
-      narg            = sanity_checks ("scalar", param, value, op.width, narg);
-      op.width        = sprintf('--width="%i"', value);
-    elseif (strcmpi(param,"height"))                  # General - height
-      narg            = sanity_checks ("scalar", param, value, op.height, narg);
-      op.height       = sprintf('--height="%i"', value);
-    elseif (strcmpi(param,"timeout"))                 # General - timeout
-      narg            = sanity_checks ("scalar", param, value, op.timeout, narg);
-      op.timeout      = sprintf('--timeout="%i"', value);
-    elseif (strcmpi(param,"icon"))                    # General - icon
-      narg            = sanity_checks ("char", param, value, op.icon, narg);
-      if (strcmpi(value, "error"))
-        op.icon       = '--window-icon="error"';
-      elseif (strcmpi(value, "info"))
-        op.icon       = '--window-icon="info"';
-      elseif (strcmpi(value, "question"))
-        op.icon       = '--window-icon="question"';
-      elseif (strcmpi(value, "warning"))
-        op.icon       = '--window-icon="warning"';
-      else
-        op.icon       = sprintf('--window-icon="%s"', value);
-      endif
-
-    ## Process options for ZENITY_ENTRY
-    elseif ( strcmpi(dialog, "entry") )
-      if (strcmpi(param,"entry"))                     # Entry - entry text
-        narg            = sanity_checks ("char", param, value, op.entry, narg);
-        op.entry        = sprintf('--entry-text="%s"', value);
-      elseif (strcmpi(param,"password"))              # Entry - password
-        narg            = sanity_checks ("indie", param, value, op.password, narg);
-        op.password     = "--hide-text";
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    ## Process options for ZENITY_FILE_SELECTION
-    elseif ( strcmpi(dialog, "file selection") )
-      if (strcmpi(param,"directory"))                 # File selection - directory
-        narg            = sanity_checks ("indie", param, value, op.directory, narg);
-        op.directory    = "--directory";
-      elseif (strcmpi(param,"filename"))              # File selection - filename
-        narg            = sanity_checks ("char", param, value, op.filename, narg);
-        op.filename     = sprintf('--filename="%s"', value);
-      elseif (strcmpi(param,"filter"))                # File selection - file filter
-        narg            = sanity_checks ("multiple-char", param, value, op.directory, narg);
-        op.filter       = sprintf('%s --file-filter="%s"', op.filter, value);
-      elseif (strcmpi(param,"multiple"))              # File selection - multiple
-        narg            = sanity_checks ("indie", param, value, op.multiple, narg);
-        op.multiple     = "--multiple";
-      elseif (strcmpi(param,"overwrite"))             # File selection - overwrite
-        narg            = sanity_checks ("indie", param, value, op.overwrite, narg);
-        op.overwrite    = "--confirm-overwrite";
-      elseif (strcmpi(param,"save"))                  # File selection - save
-        narg            = sanity_checks ("indie", param, value, op.save, narg);
-        op.save         = "--save";
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    ## Process options for ZENITY_MESSAGE
-    elseif ( strcmpi(dialog, "message") )
-      if (strcmpi(param,"type"))                      # Message - type
-        narg            = sanity_checks ("valueless", param, value, op.type, narg);
-        if (strcmpi(value,"error"))
-          op.type       = "--error";
-        elseif (strcmpi(value,"info"))
-          op.type       = "--info";
-        elseif (strcmpi(value,"question"))
-          op.type       = "--question";
-        elseif (strcmpi(value,"warning"))
-          op.type       = "--warning";
-        else
-          error ("Non supported type of message dialog '%s'", value);
-        endif
-      elseif (strcmpi(param,"wrap"))                  # Message - wrap
-        narg            = sanity_checks ("indie", param, value, op.wrap, narg);
-        op.wrap         = "--no-wrap";
-      elseif (strcmpi(param,"ok button"))             # Message - OK button
-        narg            = sanity_checks ("char", param, value, op.ok, narg);
-        op.ok           = sprintf('--ok-label="%s"', value);
-      elseif (strcmpi(param,"cancel button"))         # Message - cancel button
-        narg            = sanity_checks ("char", param, value, op.cancel, narg);
-        op.cancel       = sprintf('--cancel-label="%s"', value);
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    ## Process options for ZENITY_NOTIFICATION (creating new)
-    elseif ( strcmpi(dialog, "new notification") )
-      if (strcmpi(param,"text"))                      # Notification - text
-        narg            = sanity_checks ("char", param, value, op.text, narg);
-        op.text         = sprintf('--text="%s"', value);
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    ## Process options for ZENITY_LIST
-    elseif ( strcmpi(dialog, "list") )
-      if (strcmpi(param,"text"))                      # List - text
-        narg            = sanity_checks ("char", param, value, op.text, narg);
-        op.text         = sprintf('--text="%s"', value);
-      elseif (strcmpi(param,"no headers"))            # List - no headers
-        narg            = sanity_checks ("indie", param, value, op.no_head, narg);
-        op.no_head      = "--hide-header";
-      elseif (strcmpi(param,"editable"))              # List - editable
-        narg            = sanity_checks ("indie", param, value, op.editable, narg);
-        op.editable     = "--editable";
-      elseif (strcmpi(param,"multiple"))              # List - multiple
-        narg            = sanity_checks ("indie", param, value, op.multiple, narg);
-        op.multiple     = "--multiple";
-      elseif (strcmpi(param,"radiolist"))             # List - radiolist
-        narg            = sanity_checks ("indie", param, value, op.radio, narg);
-        op.radio        = "--radiolist";
-      elseif (strcmpi(param,"checklist"))             # List - checklist
-        narg            = sanity_checks ("indie", param, value, op.check, narg);
-        op.check        = "--checklist";
-      elseif (strcmpi(param,"numeric output"))        # List - numeric output
-        narg            = sanity_checks ("char", param, value, op.num_out, narg);
-        op.num_out      = value;
-      elseif (strcmpi(param,"hide column"))           # List - hide column
-        narg            = sanity_checks ("num", param, value, op.hide, narg);
-        op.hide_min     = min(value(:));
-        op.hide_max     = max(value(:));
+    switch key{ii}
+      case {"auto_close"} op.auto_close   = "--auto-close";
+      case {"auto_kill"}  op.auto_kill    = "--auto-kill";
+      case {"cancel"}     op.cancel       = sprintf('--cancel-label="%s"', op.(key{ii}));
+      case {"checklist"}  op.checklist    = "--checklist";
+      case {"day"}        op.day          = sprintf('--day="%d"', round(op.(key{ii})));
+      case {"directory"}  op.directory    = "--directory";
+      case {"editable"}   op.editable     = "--editable";
+      case {"entry"}      op.entry        = sprintf('--entry-text="%s"', op.(key{ii}));
+      case {"filename"}   op.filename     = sprintf('--filename="%s"', op.(key{ii}));
+      ## TODO add support for multiple filters (might need changes to @inputParser)
+      case {"filter"}     op.filter       = sprintf('--file-filter="%s"', op.(key{ii}));
+      case {"hide_cancel"} op.hide_cancel = "--no-cancel";
+      case {"hide_column"}
+        op.hide_min     = min(op.(key{ii})(:));
+        op.hide_max     = max(op.(key{ii})(:));
         tmp             = "";
-        for i = 1:numel(value)
-          str = num2str(value(i));
+        for i = 1:numel(op.(key{ii}))
+          str = num2str(op.(key{ii})(i));
           tmp = sprintf('%s%s,', tmp, str);
         endfor
-        op.hide         = sprintf('--hide-column="%s"', tmp);
-      elseif (strcmpi(param,"print column"))          # List - print column
-        narg            = sanity_checks ("num", param, value, op.print_col, narg);
-        op.print_min    = min(value(:));
-        op.print_max    = max(value(:));
-        op.print_numel  = numel(value);
+        op.hide_column  = sprintf('--hide-column="%s"', tmp);
+      case {"height"}     op.height       = sprintf('--height="%i"', round(op.(key{ii})));
+      case {"icon"}
+        switch tolower (op.(key{ii}))
+          case {"error"}
+            op.icon = '--window-icon="error"';
+          case {"info"}
+            op.icon = '--window-icon="info"';
+          case {"question"}
+            op.icon = '--window-icon="question"';
+          case {"warning"}
+            op.icon = '--window-icon="warning"';
+          otherwise
+            op.icon = sprintf('--window-icon="%s"', op.(key{ii}));
+        endswitch
+      case {"month"}      op.month        = sprintf('--month="%d"', round(op.(key{ii})));
+      case {"multiple"}   op.multiple     = "--multiple";
+      case {"no_headers"} op.no_headers   = "--hide-header";
+      case {"no_wrap"}    op.no_wrap      = "--no-wrap";
+      case {"numeric_output"} op.numeric_output = op.(key{ii});
+      case {"ok"}         op.ok           = sprintf('--ok-label="%s"', op.(key{ii}));
+      case {"overwrite"}  op.overwrite    = "--confirm-overwrite";
+      case {"password"}   op.password     = "--hide-text";
+      case {"print_column"}
+        op.print_min    = min(op.(key{ii})(:));
+        op.print_max    = max(op.(key{ii})(:));
+        op.print_numel  = numel(op.(key{ii}));
         tmp             = "";
-        for i = 1:numel(value)
-          if (value == 0)
+        for i = 1:numel(op.(key{ii}))
+          if (op.(key{ii}) == 0)
             tmp = "all"
             break
           endif
-          str = num2str(value(i));
+          str = num2str(op.(key{ii})(i));
           tmp = sprintf('%s%s,', tmp, str);
         endfor
-        op.print_col    = sprintf('--print-column="%s"', tmp);
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
+        op.print_column = sprintf('--print-column="%s"', tmp);
+      case {"pulsate"}    op.pulsate      = "--pulsate";
+      case {"percentage"} op.percentage   = sprintf('--percentage="%i"', floor(op.(key{ii})));
+      case {"radiolist"}  op.radiolist    = "--radiolist";
+      case {"save"}       op.save         = "--save";
+      case {"text"}       op.text         = sprintf('--text="%s"', op.(key{ii}));
+      case {"timeout"}    op.timeout      = sprintf('--timeout="%i"', round(op.(key{ii})));
+      case {"title"}      op.title        = sprintf('--title="%s"', op.(key{ii}));
+      case {"type"}
+        switch tolower (op.(key{ii}))
+          case {"error"}
+            op.type = "--error";
+          case {"info"}
+            op.type = "--info";
+          case {"question"}
+            op.type = "--question";
+          case {"warning"}
+            op.type = "--warning";
+        endswitch
+      case {"width"}      op.width        = sprintf('--width="%i"', round(op.(key{ii})));
+      case {"year"}       op.year         = sprintf('--year="%d"', round(op.(key{ii})));
+      otherwise
+        error ("Something unexpected happened when parsing options. Invalid value %s", key{ii});
+    endswitch
+  endfor
 
-    ## Process options for ZENITY_PROGRESS (creating new)
-    elseif ( strcmpi(dialog, "new progress") )
-      if (strcmpi(param,"text"))                      # Progress - text
-        narg            = sanity_checks ("char", param, value, op.text, narg);
-        op.text         = sprintf('--text="%s"', value);
-      elseif (strcmpi(param,"auto close"))            # Progress - auto close
-        narg            = sanity_checks ("indie", param, value, op.auto_close, narg);
-        op.auto_close   = "--auto-close";
-      elseif (strcmpi(param,"auto kill"))             # Progress - auto close
-        narg            = sanity_checks ("indie", param, value, op.auto_kill, narg);
-        op.auto_kill    = "--auto-kill";
-      elseif (strcmpi(param,"hide cancel"))           # Progress - hide cancel
-        narg            = sanity_checks ("indie", param, value, op.hide_cancel, narg);
-        op.hide_cancel  = "--no-cancel";
-      elseif (strcmpi(param,"pulsate"))               # Progress - pulsate
-        narg            = sanity_checks ("indie", param, value, op.pulsate, narg);
-        op.pulsate      = "--pulsate";
-      elseif (strcmpi(param,"percentage"))            # Progress - percentage
-        narg            = sanity_checks ("scalar", param, value, op.percent, narg);
-        if (value < 0 || value > 100)
-          error("Percentage must be between '0' and '100' but it was set to '%g'", value)
-        endif
-        ## floor must be used to round, so to avoid returning 100, which in the
-        ## the case of having auto-close set, would close the dialog too soon
-        op.percent      = sprintf('--percentage="%i"', floor(value));
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    ## Process options for ZENITY_CALENDAR
-    elseif ( strcmpi(dialog, "calendar") )
-      if (strcmpi(param,"text"))                 # Calendar - text
-        narg            = sanity_checks ("char", param, value, op.text, narg);
-        op.text         = sprintf('--text="%s"', value);
-      elseif (strcmpi(param,"day"))                   # Calendar - day
-        narg            = sanity_checks ("scalar", param, value, op.day, narg);
-        value           = round (value);
-        if (value < 1 || value > 31) error("Default selection '%d' for day", value); endif
-        op.day          = sprintf('--day="%d"', value);
-      elseif (strcmpi(param,"month"))                   # Calendar - month
-        narg            = sanity_checks ("scalar", param, value, op.month, narg);
-        value           = round (value);
-        if (value < 1 || value > 12) error("Invalid default selection '%d' for month", value); endif
-        op.month        = sprintf('--month="%d"', value);
-      elseif (strcmpi(param,"year"))                   # Calendar - day
-        narg            = sanity_checks ("scalar", param, value, op.year, narg);
-        value           = round (value);
-        op.year         = sprintf('--year="%d"', value);
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    else
-      error ("Parameter '%s' is not supported.", param);
-    endif
-
-  endwhile
-
-
-  ## This will ONLY process the input when the output WILL be sent through a
-  ## pipe. See the previous while block when creating new dialogs
-  while (narg <= numel (varargin))
+  for ii = 1: numel (key)
     if (!pipelining)
       break                       # It should have already been processed in the previous while block but it doesn't hurt to check again
+    elseif (any (strcmp (key{ii}, p.UsingDefaults)))
+      op = setfield (op, key{ii}, "");
+      continue
     endif
-    param = varargin{narg++};
+    switch key{ii}
+      case {"icon"}
+        switch tolower (op.(key{ii}))
+          case {"error"}
+            op.icon = 'icon: error';
+          case {"info"}
+            op.icon = 'icon: info';
+          case {"question"}
+            op.icon = 'icon: question';
+          case {"warning"}
+            op.icon = 'icon: warning';
+          otherwise
+            op.icon = sprintf('icon: %s', value);
+        endswitch
+      case {"message"}    op.message      = sprintf('message: %s', op.(key{ii}));
+      case {"percentage"} op.percentage   = sprintf('%i', op.(key{ii}));
+      case {"text"}
+        switch dialog
+          case {"piped notification"}
+            op.text         = sprintf('tooltip: %s', op.(key{ii}));
+          case {"piped progress"}
+            op.text         = sprintf('# %s', op.(key{ii}));
+        endswitch
+      case {"visible"}
+        switch tolower (op.(key{ii}))
+          case {"on"}
+            op.visible = "visible: true";
+          case {"off"}
+            op.visible = "visible: false";
+        endswitch
+      otherwise
+        error ("Something unexpected happened when parsing options. Invalid value %s", key{ii});
+    endswitch
+  endfor
 
-    if (narg <= numel(varargin))  # Check if we are already in the last index
-      value = varargin{narg};     # this is only for readability later on
-    else                          # Writing varargin{narg} in all conditions
-      value = "";                 # is a pain and makes it even more confusing
-    endif
-
-    ## Process options for ZENITY_NOTIFICATION (pipelining)
-    if ( strcmpi(dialog, "piped notification") )
-      if (strcmpi(param,"text"))                      # Notification - text
-        narg            = sanity_checks ("char", param, value, op.text, narg);
-        op.text         = sprintf('tooltip: %s', value);
-      elseif (strcmpi(param,"message"))                  # Notification - message
-        narg            = sanity_checks ("char", param, value, op.message, narg);
-        op.message      = sprintf('message: %s', value);
-      elseif (strcmpi(param,"visible"))                  # Notification - message
-        narg            = sanity_checks ("char", param, value, op.message, narg);
-        if (strcmpi(value, "on"))
-          op.visible    = "visible: true";
-        elseif (strcmpi(value, "off"))
-          op.visible    = "visible: false";
-        else
-          error ("'%s' is not a valid value for the parameter '%s'", value, param)
-        endif
-      elseif (strcmpi(param,"icon"))                  # Notification - icon
-        narg            = sanity_checks ("char", param, value, op.icon, narg);
-        if (strcmpi(value, "error"))
-          op.icon       = 'icon: error';
-        elseif (strcmpi(value, "info"))
-          op.icon       = 'icon: info';
-        elseif (strcmpi(value, "question"))
-          op.icon       = 'icon: question';
-        elseif (strcmpi(value, "warning"))
-          op.icon       = 'icon: warning';
-        else
-          op.icon       = sprintf('icon: %s', value);
-        endif
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    ## Process options for ZENITY_PROGRESS (pipelining)
-    elseif ( strcmpi(dialog, "piped progress") )
-      if (strcmpi(param,"text"))                      # Progress - text
-        narg            = sanity_checks ("char", param, value, op.text, narg);
-        op.text         = sprintf('# %s', value);
-      elseif (strcmpi(param,"percentage"))            # Progress - percentage
-        narg            = sanity_checks ("scalar", param, value, op.percent, narg);
-        if (value < 0 || value > 100)
-          error("Percentage must be between '0' and '100' but it was set to '%g'", value)
-        endif
-        ## floor must be used to round, so to avoid returning 100, which in the
-        ## the case of having auto-close set, would close the dialog too soon
-        op.percent      = sprintf('%i', floor(value));
-      else
-        error ("Parameter '%s' is not supported for '%s' dialog.", param, dialog);
-      endif
-
-    else
-      error ("Parameter '%s' is not supported.", param);
-    endif
-  endwhile
-
-  ## Set the DEFAULTS
-  if (strcmpi(dialog,"message"))                      # Defaults for message
-    if ( isempty(op.type) )
-      op.type = "--info";
-    endif
-  elseif (strcmpi(dialog,"new notification"))             # Defaults for notification
-    if ( isempty(op.icon) )
-      op.icon = '--window-icon="warning"';
-    endif
-  endif
-
 endfunction
-
-################################################################################
-##  Extra functions
-################################################################################
-function narg = sanity_checks (type, param, value, previous, narg)
-  if (strcmpi(type,"char"))                             # Value must be string
-    if (previous)
-      idx = strfind(previous, "=");
-      error ("Parameter '%s' set twice, with values '%s' and '%g'.", ...
-                  param, previous(idx(1)+2:end-1), value);
-    elseif ( isempty(value) || !ischar(value) )
-      error ("Parameter '%s' requires a string as value.", param);
-    endif
-    narg++;
-
-  elseif (strcmpi(type,"scalar"))                       # Value must be scalar
-    if (previous)
-      idx = strfind(previous, "=");
-      error ("Parameter '%s' set twice, with values '%s' and '%g'.", ...
-                  param, previous(idx(1)+2:end-1), value);
-    elseif ( isempty(value) || !isscalar(value) )
-      error ("Parameter '%s' requires a scalar as value.", param);
-    endif
-    narg++;
-
-  elseif (strcmpi(type,"indie"))                        # Independent parameter
-    if (previous)
-      error ("Parameter '%s' set twice.", param);
-    endif
-
-  elseif (strcmpi(type,"valueless"))                    # Valueless parameter
-    if (previous)
-      error ("Parameter '%s' set twice, with values '%s' and '%s'.", ...
-                  param, previous(3:end), value);
-    elseif ( isempty(value) || !ischar(value) )
-      error ("Parameter '%s' requires a string as value.", param);
-    endif
-    narg++;
-
-  elseif (strcmpi(type,"multiple-char"))                # Value can be set more than once
-    if ( isempty(value) || !ischar(value) )
-      error ("Parameter '%s' requires a string as value.", param);
-    endif
-    narg++;
-
-  elseif (strcmpi(type,"num"))                          # Value can be set more than once
-    if (previous)
-      idx = strfind(previous, "=");
-      error ("Parameter '%s' set twice, with values '%s' and '%g'.", ...
-                  param, previous(idx(1)+2:end-1), value);
-    elseif ( isempty(value) || !isnumeric(value) )
-      error ("Parameter '%s' requires a numeric as value.", param);
-    endif
-    narg++;
-
-
-  else
-    error ("Non supported type for sanity_checks '%s'.", type)
-  endif
-
-endfunction

Modified: trunk/octave-forge/main/zenity/inst/zenity_calendar.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_calendar.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/zenity_calendar.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
-## Copyright (C) 2010 Carn\xEB Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carn\xEB Draug <car...@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

Modified: trunk/octave-forge/main/zenity/inst/zenity_entry.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_entry.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/zenity_entry.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
-## Copyright (C) 2010 Carn\xEB Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carn\xEB Draug <car...@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

Modified: trunk/octave-forge/main/zenity/inst/zenity_file_selection.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_file_selection.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/zenity_file_selection.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
-## Copyright (C) 2010 Carn\xEB Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carn\xEB Draug <car...@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
@@ -36,17 +36,18 @@
 ## Sets the default selected file. Requires a string as value.
 ##
 ## @item filter
-## Sets a filename filter. Requires a string as value. Multiple filters can be
-## set with multiple calls of this parameter, or one filter can be made with
-## multiple regexp. Filters can also be named which blocks the user from actualy
-## seeing the filter.. The following examples shows how to create two filters,
-## two named filters, one filter for two different extensions, and the same
-## filter but named:
+## Sets a filename filter. Requires a string as value. Only one filter can be set
+## but it can have multiple regex. Filters can also be named which blocks the user
+## from actually seeing the filter.
 ## @example
-## @code{zenity_file_selection ("filter", "*.txt", "filter", "*.m")}
-## @code{zenity_file_selection ("filter", "text files| *.txt", "filter", "octave files| *.m")}
-## @code{zenity_file_selection ("filter", "*.tif *.png")}
-## @code{zenity_file_selection ("filter", "Images | *.tif *.png")}
+## @group
+## ## only txt files will be selectable
+## zenity_file_selection ("filter", "*.txt")
+## ## both txt and m files will be selectable
+## zenity_file_selection ("filter", "*.txt *.m")
+## ## both txt and m files will be selectable but the users will see `text files'
+## zenity_file_selection ("filter", "Text files | *.txt *.m")
+## @end group
 ## @end example
 ##
 ## @item icon
@@ -87,6 +88,26 @@
 ## @seealso{zenity_list, zenity_entry, zenity_message, zenity_text_info}
 ## @end deftypefn
 
+## TODO
+## for some time (but only on the development version, never released version) it
+## was possible to set multiple filters filter with this function (see the help text created below).
+## This was when using a manual parsing of the options. Once using @inputParser
+## this was no longer working. Maybe when inputParser allows for an option to be
+## used multiple times... all the code is ready for this, just uncomment some lines
+## @item filter
+## Sets a filename filter. Requires a string as value. Multiple filters can be
+## set with multiple calls of this parameter, or one filter can be made with
+## multiple regexp. Filters can also be named which blocks the user from actualy
+## seeing the filter.. The following examples shows how to create two filters,
+## two named filters, one filter for two different extensions, and the same
+## filter but named:
+## @example
+## @code{zenity_file_selection ("filter", "*.txt", "filter", "*.m")}
+## @code{zenity_file_selection ("filter", "text files| *.txt", "filter", "octave files| *.m")}
+## @code{zenity_file_selection ("filter", "*.tif *.png")}
+## @code{zenity_file_selection ("filter", "Images | *.tif *.png")}
+## @end example
+
 function [files, status] = zenity_file_selection(varargin)
 
   ## Update figures so they are show before the dialog. To not be shown at this

Modified: trunk/octave-forge/main/zenity/inst/zenity_list.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_list.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/zenity_list.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
-## Copyright (C) 2010 Carn\xEB Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carn\xEB Draug <car...@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
@@ -28,10 +28,12 @@
 ## @code{Height}, will have the values @code{120cm} and @code{180cm}:
 ##
 ## @example
+## @group
 ## columns = @{"Age", "Height"@}
-## data    = @{"10", "120cm",
-##            "20"; "180cm"@}
+## data    = @{"10", "120cm"
+##            "20", "180cm"@}
 ## zenity_list(columns, data)
+## @end group
 ## @end example
 ##
 ## @var{selected} holds a string with the value of the first column of the
@@ -68,13 +70,15 @@
 ## with the strings @code{FreeBSD} and @code{Linux}.
 ##
 ## @example
+## @group
 ## columns = @{"", "OS"@}
-## data    = @{"true" , "FreeBSD",
-##            "true" , "Linux",
+## data    = @{"true" , "FreeBSD"
+##            "true" , "Linux"
 ##            "false", "NetBSD"
-##            "false", "OpenBSD",
+##            "false", "OpenBSD"
 ##            "false", "OpenSolaris"@}
 ## zenity_list(columns, data, "checklist")
+## @end group
 ## @end example
 ##
 ## @item editable
@@ -85,7 +89,7 @@
 ## @item height
 ## Sets the height of the dialog window. Requires a scalar as value.
 ##
-## @item hide column
+## @item hide_column
 ## Hides the specified columns from the user. Requires a numeric data type as
 ## value. Multiple columns can be selected with ranges or matrixes. If
 ## @option{radiolist} or @option{checklist} are set, the first
@@ -97,15 +101,17 @@
 ## not shown and holds the numbers.
 ##
 ## @example
+## @group
 ## columns = @{"", "Foods", "not visible"@}
 ## data    = @{"true" , "Ice cream", "1"
 ##            "false", "Danish",    "2"
 ##            "false", "Soup",      "3"
 ##            "false", "Lasagne",   "4"@}
-## zenity_list(columns, data, "radiolist", "hide column", 3, "print column", 3)
+## zenity_list(columns, data, "radiolist", "hide_column", 3, "print_column", 3)
+## @end group
 ## @end example
 ##
-## @item no headers
+## @item no_headers
 ## Doesn't show the headers. No value is required. @var{columns} still needs to
 ## be defined and have the right size but may be a cell array of empty
 ## strings. Since the headers are hidden, the user cannot sort the values of the
@@ -126,7 +132,7 @@
 ## Allows multiple rows to be selected. No value is required. It cannot be set
 ## with @option{radiolist} and is automatically set when @option{checklist} is set.
 ##
-## @item numeric output
+## @item numeric_output
 ## Returns @var{selected} as a matrix and numeric values (double precision type)
 ## instead of cell array of strings. It uses the function str2double for the
 ## conversion. Requires a string as value. Possible values are: 
@@ -138,7 +144,7 @@
 ## Returns @code{NaN} for the values it is unable to convert.
 ## @end table
 ##
-## @item print column
+## @item print_column
 ## The numbers of the columns whose values should be returned. Requires a numeric
 ## data type as value. Multiple columns can be selected with ranges or matrixes,
 ## and all columns can be selected with the scalar @code{0}. If the
@@ -225,54 +231,48 @@
   ## Sanity checks
   ## by using numel(col) instead of columns, allows to not worry on the dimension they are placed
   if (columns(data) != numel(col))
-    error("Size of 'columns' (%g) is different than the number of columns in 'data' (%g).", ...
+    error("size of 'columns' (%g) is different than the number of columns in 'data' (%g).", ...
           numel(col), columns(data))
+  elseif (!all (cellfun (@ischar, data)))
+      error ("all elements in 'data' must be strings.");
+  elseif (!all (cellfun (@ischar, col)))
+      error ("all elements in 'col' must be strings.");
   endif
-  for i = 1:numel(data)
-    if (!ischar(data{i}))
-      error ("Index '%g' of the argument 'data' is not a string.", i);
-    endif
-  endfor
-  for i = 1:numel(col)
-    if (!ischar(col{i}))
-      error ("Index '%g' of the argument 'columns' is not a string.", i);
-    endif
-  endfor
 
-  options                       = zenity_options ("list", varargin);
+  options = zenity_options ("list", varargin);
 
   ## More sanity checks
-  if ( !isempty(options.check) && !isempty(options.radio) )
+  if ( !isempty(options.checklist) && !isempty(options.radiolist) )
     error ("Parameter 'checklist' cannot be set together with 'radiolist'.")
-  elseif( !isempty(options.multiple) && !isempty(options.radio) )
+  elseif( !isempty(options.multiple) && !isempty(options.radiolist) )
     error ("Parameter 'multiple' cannot be set together with 'radiolist'.")
-  elseif ( !isempty(options.editable) && !isempty(options.radio) )
+  elseif ( !isempty(options.editable) && !isempty(options.radiolist) )
     error ("Parameter 'editable' cannot be set together with 'radiolist'.")
-  elseif ( !isempty(options.editable) && !isempty(options.check) )
+  elseif ( !isempty(options.editable) && !isempty(options.checklist) )
     error ("Parameter 'editable' cannot be set together with 'checklist'.")
-  elseif ( options.hide_min == 1 && (!isempty(options.check) || !isempty(options.radio)) )
+  elseif ( !isempty(options.hide_column) && options.hide_min == 1 && (!isempty(options.checklist) || !isempty(options.radiolist)) )
     error ("'hide column' cannot have a value of 1 when 'checklist' and 'radiolist' are set.");
-  elseif ( options.print_min == 1 && (!isempty(options.check) || !isempty(options.radio)) )
+  elseif ( !isempty(options.print_column) && options.print_min == 1 && (!isempty(options.checklist) || !isempty(options.radiolist)) )
     error ("'print column' cannot have a value of 1 when 'checklist' and 'radiolist' are set.");
-  elseif ( options.print_min == 0 && options.print_numel > 1)
+  elseif ( !isempty(options.print_column) && options.print_min == 0 && options.print_numel > 1)
     error ("Value of 0 (all) found as value for parameter 'print column' as part of multiple values. If desired, it must be set as scalar.");
-  elseif ( options.hide_max > numel(col) )
+  elseif ( !isempty(options.hide_column) && options.hide_max > numel(col) )
     error ("Value %g found for the parameter 'hide column' and is larger than the number of columns.", options.hide_max)
-  elseif ( options.print_max > numel(col) )
+  elseif ( !isempty(options.print_column) && options.print_max > numel(col) )
     error ("Value %g found for the parameter 'print column' and is larger than the number of columns.", options.print_max)
-  elseif ( options.print_min < 0 )
+  elseif ( !isempty(options.print_column) && options.print_min < 0 )
     error ("Negative value '%g' found for the parameter 'print column'.", options.print_min)
-  elseif ( options.hide_min < 1 )
+  elseif ( !isempty(options.hide_column) && options.hide_min < 1 )
     error ("Parameter 'hide column' cannot have values smaller than 1 (found minimun as '%g').", options.hide_min)
   endif
 
-  if ( !isempty(options.check) )
+  if ( !isempty(options.checklist) )
     for i = 1:rows(data)
       if ( !strcmpi(data{i,1},"true") && !strcmpi(data{i,1},"false") )
         error ("All cells on the first column of 'data' must be either 'true' or 'false' when 'radiolist' or 'checklist' are set.");
       endif
     endfor
-  elseif (!isempty(options.radio) )
+  elseif (!isempty(options.radiolist) )
     seen_true = 0;
     for i = 1:rows(data)
       if ( !strcmpi(data{i,1},"true") && !strcmpi(data{i,1},"false") )
@@ -304,15 +304,15 @@
                     options.timeout, ...
                     options.separator, ...
                     options.text, ...
-                    options.hide, ...
-                    options.print_col, ...
+                    options.hide_column, ...
+                    options.print_column, ...
                     options.multiple, ...
-                    options.radio, ...
-                    options.check, ...
+                    options.radiolist, ...
+                    options.checklist, ...
                     options.editable, ...
                     options.icon, ...
                     options.col, ...
-                    options.no_head, ...
+                    options.no_headers, ...
                     options.data);
 
   cmd               = sprintf ("zenity --list %s", pre_cmd);
@@ -325,18 +325,18 @@
   # Exit code  5 = The dialog has been closed because the timeout has been reached
 
   # If it would be possible for the function to return more than one value
-  if ( !isempty(options.check) || !isempty(options.multiple) || options.print_numel > 1)
+  if ( !isempty(options.checklist) || !isempty(options.multiple) || (!isempty(options.print_column) && options.print_numel > 1))
     multi = 1;
   else
     multi = 0;
   endif
 
   # Calculate the number of expected columns
-  if ( options.print_min == 0 && (options.check || options.radio) )
+  if ( !isempty(options.print_column) && options.print_min == 0 && (options.checklist || options.radiolist) )
     expec_col = numel(col) -1;
-  elseif (options.print_min == 0)
+  elseif (!isempty(options.print_column) && options.print_min == 0)
     expec_col = numel(col);
-  elseif (options.print_min != 0)
+  elseif (!isempty(options.print_column) && options.print_min != 0)
     expec_col = options.print_numel;
   else
     expec_col = 1;
@@ -394,13 +394,13 @@
   ## cell array gives an error on str2double. However, in the future (gnome
   ## bug #651948) this may be changed. When it does, the condition should accept
   ## status == 5 AND check if the cell array is not completely empty
-  if (status == 0 && options.num_out)
+  if (status == 0 && options.numeric_output)
     val = str2double(val);
-    if (strcmpi(options.num_out, "error"))
+    if (strcmpi(options.numeric_output, "error"))
       if ( any(isnan( val(:) )) )
         error("Conversion of output to numeric form was unsucessful")
       endif
-    elseif (strcmpi(options.num_out, "nan"))
+    elseif (strcmpi(options.numeric_output, "nan"))
       ## Do nothing
     else
       error("Unknow value '%s' for the parameter 'numeric output'", option.num_out)

Modified: trunk/octave-forge/main/zenity/inst/zenity_message.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_message.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/zenity_message.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
-## Copyright (C) 2010 Carn\xEB Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carn\xEB Draug <car...@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
@@ -54,18 +54,18 @@
 ## @item warning
 ## @end table
 ##
-## @item OK button
+## @item ok
 ## Sets the the text to show on the @option{OK} button if type of message is set
 ## to @option{question}. Requires a string as value.
 ##
-## @item cancel button
+## @item cancel
 ## Sets the the text to show on the @option{cancel} button if type of message is
 ## set to @option{question}. Requires a string as value.
 ##
 ## @item title
 ## Sets the title of the window. Requires a string as value.
 ##
-## @item no-wrap
+## @item no_wrap
 ## Disables text wrapping. No value is required.
 ##
 ## @item width
@@ -102,6 +102,10 @@
 
   options = zenity_options ("message", varargin);
 
+  if ( isempty(options.type))
+    options.type = "--info";
+  endif
+
   ## Sanity checks
   if ( !strcmpi(options.type, "--question") && (options.ok || options.cancel))
     error("Paremeters 'ok button' and 'cancel button' can only bet set in 'question' messages")
@@ -110,7 +114,7 @@
   pre_cmd = sprintf("%s ", ...
                     options.type, ...
                     text, ...
-                    options.wrap, ...
+                    options.no_wrap, ...
                     options.title, ...
                     options.icon, ...
                     options.width, ...

Modified: trunk/octave-forge/main/zenity/inst/zenity_notification.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_notification.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/zenity_notification.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
-## Copyright (C) 2010 Carn\xEB Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carn\xEB Draug <car...@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
@@ -43,10 +43,12 @@
 ## notification panel. Trough all the example, the text stays @samp{working}.
 ##
 ## @example
+## @group
 ## h = zenity_notification ("text", "working", "icon", "info")
 ## zenity_notification (h, "message", "step 1 started")
 ## zenity_notification (h, "message", "error during step 1", "icon", "error")
 ## zenity_notification (h, "close")
+## @end group
 ## @end example
 ##
 ## All @var{parameters} are optional but if given, may require a corresponding
@@ -122,7 +124,7 @@
         warning ("There's %g argument(s) after '%s' which will be ignored", (nargin-2), varargin{1})
       endif
       try
-        sta = pclose(handle);
+        sta = fclose (handle);
       catch
         sta = -1;
       end_try_catch
@@ -133,6 +135,10 @@
       return
     endif
     options = zenity_options ("piped notification", varargin);
+    if ( isempty(options.icon))
+      options.type = "--info";
+    endif
+
     ## Must add the new line only if they exist or zenity will complain about
     ## not being able to parse some of the lines.
     ## Atention to whitespace after the command. Example:
@@ -164,7 +170,7 @@
     pre_cmd = sprintf("%s ", ...
                       options.icon, ... 
                       options.text, ...
-                      options.timeout);
+                      options.timeout)
     cmd     = sprintf("zenity --notification --listen %s", pre_cmd);
     try
       sta   = popen(cmd, "w");

Modified: trunk/octave-forge/main/zenity/inst/zenity_progress.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_progress.m	2012-04-23 15:59:35 UTC (rev 10313)
+++ trunk/octave-forge/main/zenity/inst/zenity_progress.m	2012-04-23 17:37:57 UTC (rev 10314)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
-## Copyright (C) 2010 Carn\xEB Draug <car...@gm...>
+## Copyright (C) 2010, 2012 Carn\xEB Draug <car...@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
@@ -35,14 +35,14 @@
 ## @item text
 ## Sets the text of the dialog window. Requires a string as value.
 ##
-## @item auto close
+## @item auto_close
 ## When the bar reachs @code{100}, automatically closes the dialog window. Requires no value.
 ##
-## @item auto kill
+## @item auto_kill
 ## If the @option{cancel} button is pressed, it will kill the parent process
 ## (@abbr{i.e.} the program that is calling the function). Requires no value.
 ##
-## @item hide cancel
+## @item hide_cancel
 ## Hides the @option{cancel} button from the dialog window (the user can still
 ## close the window with its functions). Requires no value.
 ##
@@ -84,7 +84,7 @@
 ## The fourth form of the @command{zenity_progress} function finishes the progress
 ## bar, given the handle @var{h} followed by the string @code{close}. This will
 ## move the progress bar to the end and wait for the user to press
-## @option{OK}. To avoid this behaviour, @option{auto close} can be set when
+## @option{OK}. To avoid this behaviour, @option{auto_close} can be set when
 ## creating the progress bar. Returns @code{0} on success and @code{-1} on error.
 ##
 ## @strong{Note:} ultimately, the availability of some parameters is dependent
@@ -130,12 +130,12 @@
     ## " #test text"  <-- no error, but does nothing
     ## "#test text"   <-- changes text for 'test text
     ## "# test text"  <-- exactly the same as above
-    options.text    = add_newline (options.text);
-    options.percent = add_newline (options.percent);
+    options.text       = add_newline (options.text);
+    options.percentage = add_newline (options.percentage);
 
     pre_cmd = sprintf("%s", ...
                       options.text, ...
-                      options.percent);
+                      options.percentage);
     try
       ## just in case someone has been playing with the pipe, flush it before
       fflush (handle);
@@ -154,7 +154,7 @@
                       options.timeout, ...
                       options.icon, ...
                       options.text, ...
-                      options.percent, ...
+                      options.percentage, ...
                       options.auto_close, ...
                       options.pulsate, ...
                       options.auto_kill,...

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

[Octave-cvsupdate] SF.net SVN: octave:[10313] trunk/octave-forge/extra/control-devel/src

[<par...@us...>]

Revision: 10313
          http://octave.svn.sourceforge.net/octave/?rev=10313&view=rev
Author:   paramaniac
Date:     2012-04-23 15:59:35 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
control-devel: include reference lapack for debugging

Modified Paths:
--------------
    trunk/octave-forge/extra/control-devel/src/Makefile

Added 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-04-23 15:58:14 UTC (rev 10312)
+++ trunk/octave-forge/extra/control-devel/src/Makefile	2012-04-23 15:59:35 UTC (rev 10313)
@@ -1,5 +1,5 @@
-LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
-BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
+# LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
+# BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
 FLIBS := $(shell mkoctfile -p FLIBS)
 
 all: devel_slicot_functions.oct
@@ -10,16 +10,25 @@
 	mv slicot/src/*.f .
 	mv slicot/src_aux/*.f .
 	mkoctfile -c *.f
-	ar -r slicotlibrary.a *.o
+	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
-	mkoctfile devel_slicot_functions.cc common.cc slicotlibrary.a \
-              ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS}
+devel_slicot_functions.oct: devel_slicot_functions.cc slicotlibrary.a lapacklibrary.a
+	mkoctfile devel_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \
+              ${FLIBS}
 
 clean:
-	rm -rf *.o core octave-core *.oct *~ *.f slicot
+	rm -rf *.o core octave-core *.oct *~ *.f slicot lapack-3.4.1
 
 realclean: clean
 	rm -rf *.a
\ No newline at end of file

Added: trunk/octave-forge/extra/control-devel/src/lapack-3.4.1.tgz
===================================================================
(Binary files differ)


Property changes on: trunk/octave-forge/extra/control-devel/src/lapack-3.4.1.tgz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

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

[Octave-cvsupdate] SF.net SVN: octave:[10312] trunk/octave-forge/main/control/src

[<par...@us...>]

Revision: 10312
          http://octave.svn.sourceforge.net/octave/?rev=10312&view=rev
Author:   paramaniac
Date:     2012-04-23 15:58:14 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
control: include reference lapack for debugging

Modified Paths:
--------------
    trunk/octave-forge/main/control/src/Makefile

Added Paths:
-----------
    trunk/octave-forge/main/control/src/lapack-3.4.1.tgz

Modified: trunk/octave-forge/main/control/src/Makefile
===================================================================
--- trunk/octave-forge/main/control/src/Makefile	2012-04-23 01:04:13 UTC (rev 10311)
+++ trunk/octave-forge/main/control/src/Makefile	2012-04-23 15:58:14 UTC (rev 10312)
@@ -1,5 +1,5 @@
-LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
-BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
+# LAPACK_LIBS := $(shell mkoctfile -p LAPACK_LIBS)
+# BLAS_LIBS := $(shell mkoctfile -p BLAS_LIBS)
 FLIBS := $(shell mkoctfile -p FLIBS)
 
 all: control_slicot_functions.oct \
@@ -24,10 +24,19 @@
 	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
-control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a
-	mkoctfile control_slicot_functions.cc common.cc slicotlibrary.a \
-              ${LAPACK_LIBS} ${BLAS_LIBS} ${FLIBS}
+control_slicot_functions.oct: control_slicot_functions.cc slicotlibrary.a lapacklibrary.a
+	mkoctfile control_slicot_functions.cc common.cc slicotlibrary.a lapacklibrary.a \
+              ${FLIBS}
 
 # helpers
 is_real_scalar.oct: is_real_scalar.cc
@@ -43,7 +52,7 @@
 	mkoctfile is_real_square_matrix.cc
 
 clean:
-	rm -rf *.o core octave-core *.oct *~ *.f slicot
+	rm -rf *.o core octave-core *.oct *~ *.f slicot lapack-3.4.1
 
 realclean: clean
 	rm -rf *.a
\ No newline at end of file

Added: trunk/octave-forge/main/control/src/lapack-3.4.1.tgz
===================================================================
(Binary files differ)


Property changes on: trunk/octave-forge/main/control/src/lapack-3.4.1.tgz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

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

[Octave-cvsupdate] SF.net SVN: octave:[10311] trunk/octave-forge/main/zenity/inst

[<car...@us...>]

Revision: 10311
          http://octave.svn.sourceforge.net/octave/?rev=10311&view=rev
Author:   carandraug
Date:     2012-04-23 01:04:13 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
zenity: using @{} on texinfo

Modified Paths:
--------------
    trunk/octave-forge/main/zenity/inst/private/zenity_options.m
    trunk/octave-forge/main/zenity/inst/zenity_calendar.m
    trunk/octave-forge/main/zenity/inst/zenity_entry.m
    trunk/octave-forge/main/zenity/inst/zenity_file_selection.m
    trunk/octave-forge/main/zenity/inst/zenity_list.m
    trunk/octave-forge/main/zenity/inst/zenity_message.m
    trunk/octave-forge/main/zenity/inst/zenity_notification.m
    trunk/octave-forge/main/zenity/inst/zenity_progress.m

Modified: trunk/octave-forge/main/zenity/inst/private/zenity_options.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/private/zenity_options.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/private/zenity_options.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -14,7 +14,7 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} @var{options} = _zenity_options (@var{dialog}, @var{param1}, @var{value1}, ...)
+## @deftypefn {Function File} {@var{options} =} zenity_options (@var{dialog}, @var{param1}, @var{value1}, @dots{})
 ## This function is not intended for users but for the other functions of the
 ## zenity package. Returns the structure @var{options} that holds the processed
 ## @var{param} and @var{value} for the function of the zenity package

Modified: trunk/octave-forge/main/zenity/inst/zenity_calendar.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_calendar.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/zenity_calendar.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -15,7 +15,7 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} [@var{date} @var{status}] = zenity_calendar (@var{param1}, @var{value1}, ...)
+## @deftypefn {Function File} {[@var{date} @var{status}] =} zenity_calendar (@var{param1}, @var{value1}, @dots{})
 ## Opens a date selection dialog using Zenity.
 ##
 ## @var{date} is the first three members of the date vector of the selected date,

Modified: trunk/octave-forge/main/zenity/inst/zenity_entry.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_entry.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/zenity_entry.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -15,7 +15,7 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} [@var{entry}, @var{status}] = zenity_entry(@var{text}, @var{parameter1}, @var{value1}, ...)
+## @deftypefn {Function File} {[@var{entry}, @var{status}] =} zenity_entry (@var{text}, @var{parameter1}, @var{value1}, @dots{})
 ## Displays a text entry dialog using Zenity.
 ##
 ## The variable @var{text} sets the dialog text and is the only mandatory

Modified: trunk/octave-forge/main/zenity/inst/zenity_file_selection.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_file_selection.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/zenity_file_selection.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -15,7 +15,7 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} [@var{files} @var{status}] = zenity_file_selection (@var{param1}, @var{value1}, ...)
+## @deftypefn {Function File} {[@var{files} @var{status}] =} zenity_file_selection (@var{param1}, @var{value1}, @dots{})
 ## Opens a file selection dialog using Zenity.
 ##
 ## @var{files} is a string or a cell array of strings depending on whether the

Modified: trunk/octave-forge/main/zenity/inst/zenity_list.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_list.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/zenity_list.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -15,7 +15,7 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} [@var{selected}, @var{status}] = zenity_list(@var{columns}, @var{data}, @var{param1}, @var{value1}, ...)
+## @deftypefn {Function File} {[@var{selected}, @var{status}] =} zenity_list (@var{columns}, @var{data}, @var{param1}, @var{value1}, @dots{})
 ## Displays a graphical list of data using Zenity. The values on the list can be
 ## selected and/or modified by the user.
 ##

Modified: trunk/octave-forge/main/zenity/inst/zenity_message.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_message.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/zenity_message.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -15,7 +15,7 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn  {Function File} @var{status} = zenity_message(@var{text}, @var{parameter1}, @var{value1}, ...)
+## @deftypefn {Function File} {@var{status} =} zenity_message (@var{text}, @var{parameter1}, @var{value1}, @dots{})
 ## Displays different types of graphical message dialogs using Zenity.
 ##
 ## Returns @code{0} if @option{OK} is pressed; @code{1} if @option{Close} is

Modified: trunk/octave-forge/main/zenity/inst/zenity_notification.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_notification.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/zenity_notification.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -15,10 +15,10 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} @var{h} = zenity_notification
-## @deftypefnx {Function File} @var{h} = zenity_notification (@var{param1}, @var{value1}, ...)
-## @deftypefnx {Function File} @var{s} = zenity_notification (@var{h}, @var{param1}, @var{value1}, ...)
-## @deftypefnx {Function File} @var{s} = zenity_notification (@var{h}, "close")
+## @deftypefn {Function File} {@var{h} =} zenity_notification
+## @deftypefnx {Function File} {@var{h} =} zenity_notification (@var{param1}, @var{value1}, @dots{})
+## @deftypefnx {Function File} {@var{s} =} zenity_notification (@var{h}, @var{param1}, @var{value1}, @dots{})
+## @deftypefnx {Function File} {@var{s} =} zenity_notification (@var{h}, "close")
 ## Displays an icon with a text in the notification area, and pop up messages
 ## using Zenity.
 ##

Modified: trunk/octave-forge/main/zenity/inst/zenity_progress.m
===================================================================
--- trunk/octave-forge/main/zenity/inst/zenity_progress.m	2012-04-22 13:55:38 UTC (rev 10310)
+++ trunk/octave-forge/main/zenity/inst/zenity_progress.m	2012-04-23 01:04:13 UTC (rev 10311)
@@ -15,10 +15,10 @@
 ## this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} @var{h} = zenity_progress
-## @deftypefnx {Function File} @var{h} = zenity_progress (@var{param1}, @var{value1}, ...)
-## @deftypefnx {Function File} @var{s} = zenity_progress (@var{h}, @var{param1}, @var{value1}, ...)
-## @deftypefnx {Function File} @var{s} = zenity_progress (@var{h}, "close")
+## @deftypefn {Function File} {@var{h} =} zenity_progress
+## @deftypefnx {Function File} {@var{h} =} zenity_progress (@var{param1}, @var{value1}, @dots{})
+## @deftypefnx {Function File} {@var{s} =} zenity_progress (@var{h}, @var{param1}, @var{value1}, @dots{})
+## @deftypefnx {Function File} {@var{s} =} zenity_progress (@var{h}, "close")
 ## Displays a progress bar dialog using Zenity.
 ##
 ## The first and second forms of the @command{zenity_progress} function creates

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

[Octave-cvsupdate] SF.net SVN: octave:[10310] trunk/octave-forge/main/queueing

[<mma...@us...>]

Revision: 10310
          http://octave.svn.sourceforge.net/octave/?rev=10310&view=rev
Author:   mmarzolla
Date:     2012-04-22 13:55:38 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
fixed documentation bugs

Modified Paths:
--------------
    trunk/octave-forge/main/queueing/doc/markovchains.txi
    trunk/octave-forge/main/queueing/inst/ctmc_exps.m

Modified: trunk/octave-forge/main/queueing/doc/markovchains.txi
===================================================================
--- trunk/octave-forge/main/queueing/doc/markovchains.txi	2012-04-22 08:37:24 UTC (rev 10309)
+++ trunk/octave-forge/main/queueing/doc/markovchains.txi	2012-04-22 13:55:38 UTC (rev 10310)
@@ -583,6 +583,33 @@
 the state occupancy probability at time @math{t}; @math{\exp({\bf Q}t)}
 is the matrix exponential of @math{{\bf Q}t}.
 
+If there are absorbing states, we can define the vector @emph{expected
+sojourn times until absorption} @math{{\bf L}(\infty)}, where for each
+transient state @math{i}, @math{L_i(\infty)} is the expected total
+time spent in state @math{i} until absorption, assuming that the
+system started with a given state occupancy probability vector
+@math{{\bf \pi}(0)}. Let @math{\tau} be the set of transient (i.e.,
+non absorbing) states; let @math{{\bf Q}_\tau} be the restriction of
+@math{\bf Q} to the transient substates only. Similarly, let
+@math{{\bf \pi}_\tau(0)} be the restriction of the initial probability
+vector @math{{\bf \pi}(0)} to transient states @math{\tau}.
+
+The expected time to absorption @math{{\bf L}_\tau(\infty)} is defined as
+the solution of the following equation:
+
+@iftex
+@tex
+$$ {\bf L}_\tau(\infty){\bf Q}_\tau = -{\bf \pi}_\tau(0) $$
+@end tex
+@end iftex
+@ifnottex
+@example
+@group
+L_T( inf ) Q_T = -pi_T(0)
+@end group
+@end example
+@end ifnottex
+
 @GETHELP{ctmc_exps}
 
 @noindent @strong{EXAMPLE}
@@ -621,32 +648,6 @@
 @node Mean time to absorption (CTMC)
 @subsection Mean Time to Absorption
 
-If we consider a Markov Chain with absorbing states, it is possible to
-define the @emph{expected time to absorption} as the expected time
-until the system goes into an absorbing state. More specifically, let
-us suppose that @math{A} is the set of transient (i.e., non-absorbing)
-states of a CTMC with @math{N} states and infinitesimal generator
-matrix @math{\bf Q}. The expected time to absorption @math{{\bf
-L}_A(\infty)} is defined as the solution of the following equation:
-
-@iftex
-@tex
-$$ {\bf L}_A(\infty){\bf Q}_A = -{\bf \pi}_A(0) $$
-@end tex
-@end iftex
-@ifnottex
-@example
-@group
-L_A( inf ) Q_A = -pi_A(0)
-@end group
-@end example
-@end ifnottex
-
-@noindent where @math{{\bf Q}_A} is the restriction of matrix @math{\bf Q} to
-only states in @math{A}, and @math{{\bf \pi}_A(0)} is the initial
-state occupancy probability at time 0, restricted to states in
-@math{A}.
-
 @GETHELP{ctmc_mtta}
 
 @noindent @strong{EXAMPLE}

Modified: trunk/octave-forge/main/queueing/inst/ctmc_exps.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/ctmc_exps.m	2012-04-22 08:37:24 UTC (rev 10309)
+++ trunk/octave-forge/main/queueing/inst/ctmc_exps.m	2012-04-22 13:55:38 UTC (rev 10310)
@@ -24,10 +24,10 @@
 ## @cindex Expected sojourn time
 ##
 ## With three arguments, compute the expected times @code{@var{L}(i)}
-## spent in each state @math{i} during the time interval
-## @math{[0,t]}, assuming that the state occupancy probabilities
-## at time 0 are @var{p}. With two arguments, compute the expected time
-## @code{@var{L}(i)} spent in each state @math{i} until absorption.
+## spent in each state @math{i} during the time interval @math{[0,t]},
+## assuming that the initial occupancy vector is @var{p}. With two
+## arguments, compute the expected time @code{@var{L}(i)} spent in each
+## transient state @math{i} until absorption.
 ##
 ## @strong{INPUTS}
 ##
@@ -57,9 +57,9 @@
 ## If this function is called with three arguments, @code{@var{L}(i)} is
 ## the expected time spent in state @math{i} during the interval
 ## @math{[0,t]}. If this function is called with two arguments
-## @code{@var{L}(i)} is either the expected time spent in state @math{i}
-## until absorption (if @math{i} is a transient state), or zero (if
-## @var{i} is an absorbing state).
+## @code{@var{L}(i)} is the expected time spent in transient state
+## @math{i} until absorption; if state @math{i} is absorbing,
+## @code{@var{L}(i)} is zero.
 ##
 ## @end table
 ##

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

[Octave-cvsupdate] SF.net SVN: octave:[10309] trunk/octave-forge/main/control/inst

[<par...@us...>]

Revision: 10309
          http://octave.svn.sourceforge.net/octave/?rev=10309&view=rev
Author:   paramaniac
Date:     2012-04-22 08:37:24 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
control: style fixes (use strncmpi)

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/@lti/frdata.m
    trunk/octave-forge/main/control/inst/@lti/tfdata.m
    trunk/octave-forge/main/control/inst/@lti/zpkdata.m
    trunk/octave-forge/main/control/inst/gram.m

Modified: trunk/octave-forge/main/control/inst/@lti/frdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/frdata.m	2012-04-22 08:22:39 UTC (rev 10308)
+++ trunk/octave-forge/main/control/inst/@lti/frdata.m	2012-04-22 08:37:24 UTC (rev 10309)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010, 2011   Lukas F. Reichlin
+## Copyright (C) 2010, 2011, 2012   Lukas F. Reichlin
 ##
 ## This file is part of LTI Syncope.
 ##
@@ -48,7 +48,7 @@
 
 ## Author: Lukas Reichlin <luk...@gm...>
 ## Created: October 2010
-## Version: 0.2
+## Version: 0.3
 
 function [H, w, tsam] = frdata (sys, rtype = "array")
 
@@ -60,7 +60,7 @@
 
   tsam = sys.tsam;
 
-  if (lower (rtype(1)) == "v" && issiso (sys))
+  if (strncmpi (rtype, "v", 1) && issiso (sys))
     H = reshape (H, [], 1);
   endif
 

Modified: trunk/octave-forge/main/control/inst/@lti/tfdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/tfdata.m	2012-04-22 08:22:39 UTC (rev 10308)
+++ trunk/octave-forge/main/control/inst/@lti/tfdata.m	2012-04-22 08:37:24 UTC (rev 10309)
@@ -1,4 +1,4 @@
-## Copyright (C) 2009, 2010, 2011   Lukas F. Reichlin
+## Copyright (C) 2009, 2010, 2011, 2012   Lukas F. Reichlin
 ##
 ## This file is part of LTI Syncope.
 ##
@@ -54,7 +54,7 @@
 
 ## Author: Lukas Reichlin <luk...@gm...>
 ## Created: September 2009
-## Version: 0.4
+## Version: 0.5
 
 function [num, den, tsam] = tfdata (sys, rtype = "cell")
 
@@ -66,12 +66,12 @@
 
   tsam = sys.tsam;
 
-  if (lower (rtype(1)) != "t")                  # != tfpoly
+  if (! strncmpi (rtype, "t", 1))                # != tfpoly
     num = cellfun (@get, num, "uniformoutput", false);
     den = cellfun (@get, den, "uniformoutput", false);
   endif
 
-  if (lower (rtype(1)) == "v" && issiso (sys))  # == vector
+  if (strncmpi (rtype, "v", 1) && issiso (sys))  # == vector
     num = num{1};
     den = den{1};
   endif

Modified: trunk/octave-forge/main/control/inst/@lti/zpkdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/zpkdata.m	2012-04-22 08:22:39 UTC (rev 10308)
+++ trunk/octave-forge/main/control/inst/@lti/zpkdata.m	2012-04-22 08:37:24 UTC (rev 10309)
@@ -58,7 +58,7 @@
   p = cellfun (@roots, den, "uniformoutput", false);
   k = cellfun (@(n,d) n(1)/d(1), num, den);
 
-  if (lower (rtype(1)) == "v" && issiso (sys))
+  if (strncmpi (rtype, "v", 1) && issiso (sys))
     z = z{1};
     p = p{1};
   endif

Modified: trunk/octave-forge/main/control/inst/gram.m
===================================================================
--- trunk/octave-forge/main/control/inst/gram.m	2012-04-22 08:22:39 UTC (rev 10308)
+++ trunk/octave-forge/main/control/inst/gram.m	2012-04-22 08:37:24 UTC (rev 10309)
@@ -33,7 +33,7 @@
 
 ## Adapted-By: Lukas Reichlin <luk...@gm...>
 ## Date: October 2009
-## Version: 0.1
+## Version: 0.2
 
 function W = gram (argin1, argin2)
 
@@ -43,7 +43,6 @@
 
   if (ischar (argin2))     # the function was called as "gram (sys, mode)"
     sys = argin1;
-    argin2 = lower (argin2);
 
     if (! isa (sys, "lti"))
       error ("gram: first argument must be an LTI model");
@@ -51,10 +50,10 @@
 
     [a, b, c] = ssdata (sys);
 
-    if (strcmp (argin2, "o"))
+    if (strncmpi (argin2, "o", 1))
       a = a.';
       b = c.';
-    elseif (! strcmp (argin2, "c"))
+    elseif (! strncmpi (argin2, "c", 1))
       print_usage ();
     endif
   else                     # the function was called as "gram (a, b)"

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

[Octave-cvsupdate] SF.net SVN: octave:[10308] trunk/octave-forge/main/control/inst/@lti/ filtdata.m

[<par...@us...>]

Revision: 10308
          http://octave.svn.sourceforge.net/octave/?rev=10308&view=rev
Author:   paramaniac
Date:     2012-04-22 08:22:39 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
control: doc and style fixes

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/@lti/filtdata.m

Modified: trunk/octave-forge/main/control/inst/@lti/filtdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/filtdata.m	2012-04-21 17:11:22 UTC (rev 10307)
+++ trunk/octave-forge/main/control/inst/@lti/filtdata.m	2012-04-22 08:22:39 UTC (rev 10308)
@@ -40,7 +40,7 @@
 ## In the SISO case, a single vector is possible as well.
 ## @item den
 ## Cell of denominator(s).  Each denominator is a row vector
-## containing the coefficients of the polynomial in descending powers of z^-1.
+## containing the coefficients of the polynomial in ascending powers of z^-1.
 ## den@{i,j@} contains the denominator polynomial from input j to output i.
 ## In the SISO case, a single vector is possible as well.
 ## @item tsam
@@ -79,7 +79,7 @@
   num = cellfun (@__remove_trailing_zeros__, num, "uniformoutput", false);
   den = cellfun (@__remove_trailing_zeros__, den, "uniformoutput", false);
 
-  if (lower (rtype(1)) == "v" && issiso (sys))
+  if (strncmpi (rtype, "v", 1) && issiso (sys))
     num = num{1};
     den = den{1};
   endif

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

[Octave-cvsupdate] SF.net SVN: octave:[10307] trunk/octave-forge/main/control

[<par...@us...>]

Revision: 10307
          http://octave.svn.sourceforge.net/octave/?rev=10307&view=rev
Author:   paramaniac
Date:     2012-04-21 17:11:22 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
control: finish filt and filtdata, test & docstrings included

Modified Paths:
--------------
    trunk/octave-forge/main/control/INDEX
    trunk/octave-forge/main/control/NEWS
    trunk/octave-forge/main/control/inst/@lti/filtdata.m
    trunk/octave-forge/main/control/inst/filt.m
    trunk/octave-forge/main/control/inst/test_control.m

Added Paths:
-----------
    trunk/octave-forge/main/control/inst/__remove_trailing_zeros__.m

Modified: trunk/octave-forge/main/control/INDEX
===================================================================
--- trunk/octave-forge/main/control/INDEX	2012-04-21 14:03:37 UTC (rev 10306)
+++ trunk/octave-forge/main/control/INDEX	2012-04-21 17:11:22 UTC (rev 10307)
@@ -13,6 +13,7 @@
   zpk
 Model Data Access
   @lti/dssdata
+  @lti/filtdata
   @lti/frdata
   @lti/get
   @lti/set

Modified: trunk/octave-forge/main/control/NEWS
===================================================================
--- trunk/octave-forge/main/control/NEWS	2012-04-21 14:03:37 UTC (rev 10306)
+++ trunk/octave-forge/main/control/NEWS	2012-04-21 17:11:22 UTC (rev 10307)
@@ -5,8 +5,12 @@
 ===============================================================================
 
 ** filt, filtdata
-   -- Added function to specify disrete-time transfer functions in DSP format.
+   -- Added function "filt" to specify disrete-time transfer functions in DSP
+      format.
+   -- Added function "filtdata" to return any type of discrete-time LTI model
+      in DSP format.
 
+
 ===============================================================================
 control-2.3.50   Release Date: 2012-03-06   Release Manager: Lukas Reichlin
 ===============================================================================

Modified: trunk/octave-forge/main/control/inst/@lti/filtdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/filtdata.m	2012-04-21 14:03:37 UTC (rev 10306)
+++ trunk/octave-forge/main/control/inst/@lti/filtdata.m	2012-04-21 17:11:22 UTC (rev 10307)
@@ -1,4 +1,4 @@
-## Copyright (C) 2011   Lukas F. Reichlin
+## Copyright (C) 2012   Lukas F. Reichlin
 ##
 ## This file is part of LTI Syncope.
 ##
@@ -16,42 +16,52 @@
 ## along with LTI Syncope.  If not, see <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {[@var{z}, @var{p}, @var{k}, @var{tsam}] =} zpkdata (@var{sys})
-## @deftypefnx {Function File} {[@var{z}, @var{p}, @var{k}, @var{tsam}] =} zpkdata (@var{sys}, @var{"v"})
-## Access zero-pole-gain data.
+## @deftypefn {Function File} {[@var{num}, @var{den}, @var{tsam}] =} filtdata (@var{sys})
+## @deftypefnx {Function File} {[@var{num}, @var{den}, @var{tsam}] =} filtdata (@var{sys}, @var{"vector"})
+## Access discrete-time transfer function data in DSP format.
+## Argument @var{sys} is not limited to transfer function models.
+## If @var{sys} is not a transfer function, it is converted automatically.
 ##
 ## @strong{Inputs}
 ## @table @var
 ## @item sys
-## Any type of LTI model.
+## Any type of discrete-time LTI model.
 ## @item "v", "vector"
-## For SISO models, return @var{z} and @var{p} directly as column vectors
+## For SISO models, return @var{num} and @var{den} directly as column vectors
 ## instead of cells containing a single column vector.
 ## @end table
 ##
 ## @strong{Outputs}
 ## @table @var
-## @item z
-## Cell of column vectors containing the zeros for each channel.
-## z@{i,j@} contains the zeros from input j to output i.
-## @item p
-## Cell of column vectors containing the poles for each channel.
-## p@{i,j@} contains the poles from input j to output i.
-## @item k
-## Matrix containing the gains for each channel.
-## k(i,j) contains the gain from input j to output i.
+## @item num
+## Cell of numerator(s).  Each numerator is a row vector
+## containing the coefficients of the polynomial in ascending powers of z^-1.
+## num@{i,j@} contains the numerator polynomial from input j to output i.
+## In the SISO case, a single vector is possible as well.
+## @item den
+## Cell of denominator(s).  Each denominator is a row vector
+## containing the coefficients of the polynomial in descending powers of z^-1.
+## den@{i,j@} contains the denominator polynomial from input j to output i.
+## In the SISO case, a single vector is possible as well.
 ## @item tsam
-## Sampling time in seconds.  If @var{sys} is a continuous-time model,
-## a zero is returned.
+## Sampling time in seconds.  If @var{tsam} is not specified, -1 is returned.
 ## @end table
 ## @end deftypefn
 
 ## Author: Lukas Reichlin <luk...@gm...>
-## Created: September 2011
+## Created: April 2012
 ## Version: 0.1
 
 function [num, den, tsam] = filtdata (sys, rtype = "cell")
 
+  if (nargin > 2)
+    print_usage ();
+  endif
+
+  if (! isdt (sys))
+    error ("lti: filtdata: require discrete-time system");
+  endif
+
   [num, den, tsam] = tfdata (sys);
   
   ## make numerator and denominator polynomials equally long

Added: trunk/octave-forge/main/control/inst/__remove_trailing_zeros__.m
===================================================================
--- trunk/octave-forge/main/control/inst/__remove_trailing_zeros__.m	                        (rev 0)
+++ trunk/octave-forge/main/control/inst/__remove_trailing_zeros__.m	2012-04-21 17:11:22 UTC (rev 10307)
@@ -0,0 +1,36 @@
+## 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 -*-
+## Remove trailing zeros from a polynomial, except for polynomials
+## which are of length 1.  For internal use only.
+
+## Author: Lukas Reichlin <luk...@gm...>
+## Created: April 2012
+## Version: 0.1
+
+function p = __remove_trailing_zeros__ (p)
+
+  idx = find (p != 0);
+  
+  if (isempty (idx))
+    p = 0;
+  else
+    p = p(1 : idx(end));
+  endif
+
+endfunction

Modified: trunk/octave-forge/main/control/inst/filt.m
===================================================================
--- trunk/octave-forge/main/control/inst/filt.m	2012-04-21 14:03:37 UTC (rev 10306)
+++ trunk/octave-forge/main/control/inst/filt.m	2012-04-21 17:11:22 UTC (rev 10307)
@@ -121,15 +121,15 @@
 
 endfunction
 
-
-function p = __remove_trailing_zeros__ (p)
-
-  idx = find (p != 0);
-  
-  if (isempty (idx))
-    p = 0;
-  else
-    p = p(1 : idx(end));
-  endif
-
-endfunction
\ No newline at end of file
+%!shared num, den, n1, d1, n2, d2, n2e, d2e
+%! num = [0, 3];
+%! den = [1, 4, 2];
+%! sys = filt (num, den);
+%! [n1, d1] = filtdata (sys, "vector");
+%! [n2, d2] = tfdata (sys, "vector");
+%! n2e = [3, 0];
+%! d2e = [1, 4, 2];
+%!assert (n1, num, 1e-4);
+%!assert (d1, den, 1e-4);
+%!assert (n2, n2e, 1e-4);
+%!assert (d2, d2e, 1e-4);

Modified: trunk/octave-forge/main/control/inst/test_control.m
===================================================================
--- trunk/octave-forge/main/control/inst/test_control.m	2012-04-21 14:03:37 UTC (rev 10306)
+++ trunk/octave-forge/main/control/inst/test_control.m	2012-04-21 17:11:22 UTC (rev 10307)
@@ -81,6 +81,7 @@
 
 ## various m-files
 test ctrb
+test filt
 test initial
 test issample
 test margin

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

[Octave-cvsupdate] SF.net SVN: octave:[10306] trunk/octave-forge/main/control

[<par...@us...>]

Revision: 10306
          http://octave.svn.sourceforge.net/octave/?rev=10306&view=rev
Author:   paramaniac
Date:     2012-04-21 14:03:37 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
control: add filtdata, news draft

Modified Paths:
--------------
    trunk/octave-forge/main/control/NEWS

Added Paths:
-----------
    trunk/octave-forge/main/control/inst/@lti/filtdata.m

Modified: trunk/octave-forge/main/control/NEWS
===================================================================
--- trunk/octave-forge/main/control/NEWS	2012-04-21 13:43:25 UTC (rev 10305)
+++ trunk/octave-forge/main/control/NEWS	2012-04-21 14:03:37 UTC (rev 10306)
@@ -1,6 +1,13 @@
 Summary of important user-visible changes for releases of the control package
 
 ===============================================================================
+control-2.3.51   Release Date: 2012-xx-yy   Release Manager: Lukas Reichlin
+===============================================================================
+
+** filt, filtdata
+   -- Added function to specify disrete-time transfer functions in DSP format.
+
+===============================================================================
 control-2.3.50   Release Date: 2012-03-06   Release Manager: Lukas Reichlin
 ===============================================================================
 

Added: trunk/octave-forge/main/control/inst/@lti/filtdata.m
===================================================================
--- trunk/octave-forge/main/control/inst/@lti/filtdata.m	                        (rev 0)
+++ trunk/octave-forge/main/control/inst/@lti/filtdata.m	2012-04-21 14:03:37 UTC (rev 10306)
@@ -0,0 +1,77 @@
+## Copyright (C) 2011   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{z}, @var{p}, @var{k}, @var{tsam}] =} zpkdata (@var{sys})
+## @deftypefnx {Function File} {[@var{z}, @var{p}, @var{k}, @var{tsam}] =} zpkdata (@var{sys}, @var{"v"})
+## Access zero-pole-gain data.
+##
+## @strong{Inputs}
+## @table @var
+## @item sys
+## Any type of LTI model.
+## @item "v", "vector"
+## For SISO models, return @var{z} and @var{p} directly as column vectors
+## instead of cells containing a single column vector.
+## @end table
+##
+## @strong{Outputs}
+## @table @var
+## @item z
+## Cell of column vectors containing the zeros for each channel.
+## z@{i,j@} contains the zeros from input j to output i.
+## @item p
+## Cell of column vectors containing the poles for each channel.
+## p@{i,j@} contains the poles from input j to output i.
+## @item k
+## Matrix containing the gains for each channel.
+## k(i,j) contains the gain from input j to output i.
+## @item tsam
+## Sampling time in seconds.  If @var{sys} is a continuous-time model,
+## a zero is returned.
+## @end table
+## @end deftypefn
+
+## Author: Lukas Reichlin <luk...@gm...>
+## Created: September 2011
+## Version: 0.1
+
+function [num, den, tsam] = filtdata (sys, rtype = "cell")
+
+  [num, den, tsam] = tfdata (sys);
+  
+  ## make numerator and denominator polynomials equally long
+  ## by adding leading zeros
+  lnum = cellfun (@length, num, "uniformoutput", false);
+  lden = cellfun (@length, den, "uniformoutput", false);
+
+  lmax = cellfun (@max, lnum, lden, "uniformoutput", false);
+
+  num = cellfun (@prepad, num, lmax, "uniformoutput", false);
+  den = cellfun (@prepad, den, lmax, "uniformoutput", false);
+      
+  ## remove trailing zeros
+  ## such that polynomials are as short as possible
+  num = cellfun (@__remove_trailing_zeros__, num, "uniformoutput", false);
+  den = cellfun (@__remove_trailing_zeros__, den, "uniformoutput", false);
+
+  if (lower (rtype(1)) == "v" && issiso (sys))
+    num = num{1};
+    den = den{1};
+  endif
+
+endfunction

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

[Octave-cvsupdate] SF.net SVN: octave:[10305] trunk/octave-forge/main/control/inst/filt.m

[<par...@us...>]

Revision: 10305
          http://octave.svn.sourceforge.net/octave/?rev=10305&view=rev
Author:   paramaniac
Date:     2012-04-21 13:43:25 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
control: handle more special cases for filt

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/filt.m

Modified: trunk/octave-forge/main/control/inst/filt.m
===================================================================
--- trunk/octave-forge/main/control/inst/filt.m	2012-04-21 13:03:28 UTC (rev 10304)
+++ trunk/octave-forge/main/control/inst/filt.m	2012-04-21 13:43:25 UTC (rev 10305)
@@ -75,36 +75,50 @@
 
 function sys = filt (num = {}, den = {}, tsam = -1, varargin)
 
-  if (! iscell (num))
-    num = {num};
-  endif
-  
-  if (! iscell (den))
-    den = {den};
-  endif
+  switch (nargin)
+    case 0              # filt ()
+      sys = tf ();
+      return;
 
-  ## convert from z^-1 to z
-  ## expand each channel by z^x, where x is the largest exponent of z^-1 (z^-x)
+    case 1              # filt (sys), filt (matrix)
+      if (isa (num, "lti") || is_real_matrix (num))
+        sys = tf (num);
+        return;
+      else
+        print_usage ();
+      endif
 
-  ## remove trailing zeros
-  ## such that polynomials are as short as possible
-  num = cellfun (@__remove_trailing_zeros__, num, "uniformoutput", false);
-  den = cellfun (@__remove_trailing_zeros__, den, "uniformoutput", false);
+    otherwise           # filt (num, den, ...)
+      if (! iscell (num))
+        num = {num};
+      endif
+      if (! iscell (den))
+        den = {den};
+      endif
 
-  ## make numerator and denominator polynomials equally long
-  ## by adding trailing zeros
-  lnum = cellfun (@length, num, "uniformoutput", false);
-  lden = cellfun (@length, den, "uniformoutput", false);
+      ## convert from z^-1 to z
+      ## expand each channel by z^x, where x is the largest exponent of z^-1 (z^-x)
 
-  lmax = cellfun (@max, lnum, lden, "uniformoutput", false);
+      ## remove trailing zeros
+      ## such that polynomials are as short as possible
+      num = cellfun (@__remove_trailing_zeros__, num, "uniformoutput", false);
+      den = cellfun (@__remove_trailing_zeros__, den, "uniformoutput", false);
 
-  num = cellfun (@postpad, num, lmax, "uniformoutput", false);
-  den = cellfun (@postpad, den, lmax, "uniformoutput", false);
+      ## make numerator and denominator polynomials equally long
+      ## by adding trailing zeros
+      lnum = cellfun (@length, num, "uniformoutput", false);
+      lden = cellfun (@length, den, "uniformoutput", false);
 
-  ## use standard tf constructor
-  ## sys is stored and displayed in standard z form, not z^-1
-  sys = tf (num, den, tsam, varargin{:});
+      lmax = cellfun (@max, lnum, lden, "uniformoutput", false);
 
+      num = cellfun (@postpad, num, lmax, "uniformoutput", false);
+      den = cellfun (@postpad, den, lmax, "uniformoutput", false);
+
+      ## use standard tf constructor
+      ## sys is stored and displayed in standard z form, not z^-1
+      sys = tf (num, den, tsam, varargin{:});
+  endswitch
+
 endfunction
 
 

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

[Octave-cvsupdate] SF.net SVN: octave:[10304] trunk/octave-forge/main/control

[<par...@us...>]

Revision: 10304
          http://octave.svn.sourceforge.net/octave/?rev=10304&view=rev
Author:   paramaniac
Date:     2012-04-21 13:03:28 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
control: finish filt with doc, add to index

Modified Paths:
--------------
    trunk/octave-forge/main/control/INDEX

Added Paths:
-----------
    trunk/octave-forge/main/control/inst/filt.m

Removed Paths:
-------------
    trunk/octave-forge/main/control/devel/filt.m

Modified: trunk/octave-forge/main/control/INDEX
===================================================================
--- trunk/octave-forge/main/control/INDEX	2012-04-21 11:46:37 UTC (rev 10303)
+++ trunk/octave-forge/main/control/INDEX	2012-04-21 13:03:28 UTC (rev 10304)
@@ -6,6 +6,7 @@
   Madievski
 Linear Time Invariant Models
   dss
+  filt
   frd
   ss
   tf

Deleted: trunk/octave-forge/main/control/devel/filt.m
===================================================================
--- trunk/octave-forge/main/control/devel/filt.m	2012-04-21 11:46:37 UTC (rev 10303)
+++ trunk/octave-forge/main/control/devel/filt.m	2012-04-21 13:03:28 UTC (rev 10304)
@@ -1,38 +0,0 @@
-function sys = filt (num = {}, den = {}, tsam = -1, varargin)
-
-  if (! iscell (num))
-    num = {num};
-  endif
-  
-  if (! iscell (den))
-    den = {den};
-  endif
-
-  ## shall i remove trailing zeros before postpadding?
-  num = cellfun (@__remove_trailing_zeros__, num, "uniformoutput", false);
-  den = cellfun (@__remove_trailing_zeros__, den, "uniformoutput", false);
-
-  lnum = cellfun (@length, num, "uniformoutput", false);
-  lden = cellfun (@length, den, "uniformoutput", false);
-
-  lmax = cellfun (@max, lnum, lden, "uniformoutput", false);
-
-  num = cellfun (@postpad, num, lmax, "uniformoutput", false);
-  den = cellfun (@postpad, den, lmax, "uniformoutput", false);
-  
-  sys = tf (num, den, tsam, varargin{:});
-
-endfunction
-
-
-function p = __remove_trailing_zeros__ (p)
-
-  idx = find (p != 0);
-  
-  if (isempty (idx))
-    p = 0;
-  else
-    p = p(1 : idx(end));
-  endif
-
-endfunction
\ No newline at end of file

Copied: trunk/octave-forge/main/control/inst/filt.m (from rev 10303, trunk/octave-forge/main/control/devel/filt.m)
===================================================================
--- trunk/octave-forge/main/control/inst/filt.m	                        (rev 0)
+++ trunk/octave-forge/main/control/inst/filt.m	2012-04-21 13:03:28 UTC (rev 10304)
@@ -0,0 +1,121 @@
+## 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{sys} =} filt (@var{num}, @var{den}, @dots{})
+## @deftypefnx {Function File} {@var{sys} =} filt (@var{num}, @var{den}, @var{tsam}, @dots{})
+## Create discrete transfer function model from data in DSP format.
+##
+## @strong{Inputs}
+## @table @var
+## @item num
+## Numerator or cell of numerators.  Each numerator must be a row vector
+## containing the coefficients of the polynomial in ascending powers of z^-1.
+## num@{i,j@} contains the numerator polynomial from input j to output i.
+## In the SISO case, a single vector is accepted as well.
+## @item den
+## Denominator or cell of denominators.  Each denominator must be a row vector
+## containing the coefficients of the polynomial in ascending powers of z^-1.
+## den@{i,j@} contains the denominator polynomial from input j to output i.
+## In the SISO case, a single vector is accepted as well.
+## @item tsam
+## Sampling time in seconds.  If @var{tsam} is not specified,
+## default value -1 (unspecified) is taken.
+## @item @dots{}
+## Optional pairs of properties and values.
+## Type @command{set (tf)} for more information.
+## @end table
+##
+## @strong{Outputs}
+## @table @var
+## @item sys
+## Discrete-time transfer function model.
+## @end table
+##
+## @strong{Example}
+## @example
+## @group
+##                 3 z^-1     
+## H(z^-1) = -------------------
+##           1 + 4 z^-1 + 2 z^-2
+##
+## octave:1> H = filt ([0, 3], [1, 4, 2])
+## 
+## Transfer function 'H' from input 'u1' to output ...
+## 
+##            3 z     
+##  y1:  -------------
+##       z^2 + 4 z + 2
+## 
+## Sampling time: unspecified
+## Discrete-time model.
+## @end group
+## @end example
+##
+## @seealso{tf}
+## @end deftypefn
+
+## Author: Lukas Reichlin <luk...@gm...>
+## Created: April 2012
+## Version: 0.1
+
+function sys = filt (num = {}, den = {}, tsam = -1, varargin)
+
+  if (! iscell (num))
+    num = {num};
+  endif
+  
+  if (! iscell (den))
+    den = {den};
+  endif
+
+  ## convert from z^-1 to z
+  ## expand each channel by z^x, where x is the largest exponent of z^-1 (z^-x)
+
+  ## remove trailing zeros
+  ## such that polynomials are as short as possible
+  num = cellfun (@__remove_trailing_zeros__, num, "uniformoutput", false);
+  den = cellfun (@__remove_trailing_zeros__, den, "uniformoutput", false);
+
+  ## make numerator and denominator polynomials equally long
+  ## by adding trailing zeros
+  lnum = cellfun (@length, num, "uniformoutput", false);
+  lden = cellfun (@length, den, "uniformoutput", false);
+
+  lmax = cellfun (@max, lnum, lden, "uniformoutput", false);
+
+  num = cellfun (@postpad, num, lmax, "uniformoutput", false);
+  den = cellfun (@postpad, den, lmax, "uniformoutput", false);
+
+  ## use standard tf constructor
+  ## sys is stored and displayed in standard z form, not z^-1
+  sys = tf (num, den, tsam, varargin{:});
+
+endfunction
+
+
+function p = __remove_trailing_zeros__ (p)
+
+  idx = find (p != 0);
+  
+  if (isempty (idx))
+    p = 0;
+  else
+    p = p(1 : idx(end));
+  endif
+
+endfunction
\ No newline at end of file

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

[Octave-cvsupdate] SF.net SVN: octave:[10303] trunk/octave-forge/main/control/devel/filt.m

[<par...@us...>]

Revision: 10303
          http://octave.svn.sourceforge.net/octave/?rev=10303&view=rev
Author:   paramaniac
Date:     2012-04-21 11:46:37 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
control: work on filt

Modified Paths:
--------------
    trunk/octave-forge/main/control/devel/filt.m

Modified: trunk/octave-forge/main/control/devel/filt.m
===================================================================
--- trunk/octave-forge/main/control/devel/filt.m	2012-04-21 11:01:28 UTC (rev 10302)
+++ trunk/octave-forge/main/control/devel/filt.m	2012-04-21 11:46:37 UTC (rev 10303)
@@ -1,5 +1,17 @@
-function sys = filt (num = {}, den = {}, tsam = -1)
+function sys = filt (num = {}, den = {}, tsam = -1, varargin)
 
+  if (! iscell (num))
+    num = {num};
+  endif
+  
+  if (! iscell (den))
+    den = {den};
+  endif
+
+  ## shall i remove trailing zeros before postpadding?
+  num = cellfun (@__remove_trailing_zeros__, num, "uniformoutput", false);
+  den = cellfun (@__remove_trailing_zeros__, den, "uniformoutput", false);
+
   lnum = cellfun (@length, num, "uniformoutput", false);
   lden = cellfun (@length, den, "uniformoutput", false);
 
@@ -8,6 +20,19 @@
   num = cellfun (@postpad, num, lmax, "uniformoutput", false);
   den = cellfun (@postpad, den, lmax, "uniformoutput", false);
   
-  sys = tf (num, den, tsam);
+  sys = tf (num, den, tsam, varargin{:});
 
+endfunction
+
+
+function p = __remove_trailing_zeros__ (p)
+
+  idx = find (p != 0);
+  
+  if (isempty (idx))
+    p = 0;
+  else
+    p = p(1 : idx(end));
+  endif
+
 endfunction
\ No newline at end of file

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

[Octave-cvsupdate] SF.net SVN: octave:[10302] trunk/octave-forge/main/control/inst/zpk.m

[<par...@us...>]

Revision: 10302
          http://octave.svn.sourceforge.net/octave/?rev=10302&view=rev
Author:   paramaniac
Date:     2012-04-21 11:01:28 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
control: add comments and a return

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/zpk.m

Modified: trunk/octave-forge/main/control/inst/zpk.m
===================================================================
--- trunk/octave-forge/main/control/inst/zpk.m	2012-04-21 10:51:53 UTC (rev 10301)
+++ trunk/octave-forge/main/control/inst/zpk.m	2012-04-21 11:01:28 UTC (rev 10302)
@@ -66,11 +66,11 @@
 function sys = zpk (z = {}, p = {}, k = [], varargin)
 
   switch (nargin)
-    case 0
+    case 0              # sys = zpk ()
       sys = tf ();
       return;
 
-    case 1
+    case 1              # sys = zpk (sys), sys = zpk (k), s = zpk ("s")
       if (isa (z, "lti") || is_real_matrix (z) || ischar (z))
         sys = tf (z);
         return;
@@ -78,14 +78,15 @@
         print_usage ();
       endif
 
-    case 2
+    case 2              # z = zpk ("z", tsam)
       if (ischar (z) && issample (p, -1))
         sys = tf (z, p);
+        return;
       else
         print_usage ();
       endif
 
-    otherwise
+    otherwise           # sys = zpk (z, p, k, ...)
       if (! iscell (z))
         z = {z};
       endif

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

[Octave-cvsupdate] SF.net SVN: octave:[10301] trunk/octave-forge/main/control/devel/filt.m

[<par...@us...>]

Revision: 10301
          http://octave.svn.sourceforge.net/octave/?rev=10301&view=rev
Author:   paramaniac
Date:     2012-04-21 10:51:53 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
control: add draft code for filt function

Added Paths:
-----------
    trunk/octave-forge/main/control/devel/filt.m

Added: trunk/octave-forge/main/control/devel/filt.m
===================================================================
--- trunk/octave-forge/main/control/devel/filt.m	                        (rev 0)
+++ trunk/octave-forge/main/control/devel/filt.m	2012-04-21 10:51:53 UTC (rev 10301)
@@ -0,0 +1,13 @@
+function sys = filt (num = {}, den = {}, tsam = -1)
+
+  lnum = cellfun (@length, num, "uniformoutput", false);
+  lden = cellfun (@length, den, "uniformoutput", false);
+
+  lmax = cellfun (@max, lnum, lden, "uniformoutput", false);
+
+  num = cellfun (@postpad, num, lmax, "uniformoutput", false);
+  den = cellfun (@postpad, den, lmax, "uniformoutput", false);
+  
+  sys = tf (num, den, tsam);
+
+endfunction
\ No newline at end of file

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

[Octave-cvsupdate] SF.net SVN: octave:[10300] trunk/octave-forge/main/queueing/inst/dtmc.m

[<mma...@us...>]

Revision: 10300
          http://octave.svn.sourceforge.net/octave/?rev=10300&view=rev
Author:   mmarzolla
Date:     2012-04-20 21:30:46 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
fixed typo in documentation

Modified Paths:
--------------
    trunk/octave-forge/main/queueing/inst/dtmc.m

Modified: trunk/octave-forge/main/queueing/inst/dtmc.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/dtmc.m	2012-04-20 13:17:29 UTC (rev 10299)
+++ trunk/octave-forge/main/queueing/inst/dtmc.m	2012-04-20 21:30:46 UTC (rev 10300)
@@ -47,7 +47,7 @@
 ##
 ## @item n
 ## Number of transitions after which compute the state occupancy probabilities
-## (@math{n=0, 1, @enddots{}})
+## (@math{n=0, 1, @dots{}})
 ##
 ## @item p0
 ## @code{@var{p0}(i)} is the probability that at step 0 the system

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

[Octave-cvsupdate] SF.net SVN: octave:[10299] trunk/octave-forge/main/general/inst/@ inputParser

[<car...@us...>]

Revision: 10299
          http://octave.svn.sourceforge.net/octave/?rev=10299&view=rev
Author:   carandraug
Date:     2012-04-20 13:17:29 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
inputParser: small adjustement on documentation

Modified Paths:
--------------
    trunk/octave-forge/main/general/inst/@inputParser/addOptional.m
    trunk/octave-forge/main/general/inst/@inputParser/addParamValue.m
    trunk/octave-forge/main/general/inst/@inputParser/addRequired.m
    trunk/octave-forge/main/general/inst/@inputParser/addSwitch.m

Modified: trunk/octave-forge/main/general/inst/@inputParser/addOptional.m
===================================================================
--- trunk/octave-forge/main/general/inst/@inputParser/addOptional.m	2012-04-19 18:28:07 UTC (rev 10298)
+++ trunk/octave-forge/main/general/inst/@inputParser/addOptional.m	2012-04-20 13:17:29 UTC (rev 10299)
@@ -31,6 +31,8 @@
 ## for the argument with name @var{argname}. Alternatively, a function name
 ## can be used.
 ##
+## See @command{help @inputParser} for examples.
+##
 ## @emph{Note}: if @command{ParamValue} arguments are also specified, all @command{Optional}
 ## arguments will have to be specified before.
 ##

Modified: trunk/octave-forge/main/general/inst/@inputParser/addParamValue.m
===================================================================
--- trunk/octave-forge/main/general/inst/@inputParser/addParamValue.m	2012-04-19 18:28:07 UTC (rev 10298)
+++ trunk/octave-forge/main/general/inst/@inputParser/addParamValue.m	2012-04-20 13:17:29 UTC (rev 10299)
@@ -29,6 +29,8 @@
 ## for the parameter with name @var{argname}. Alternatively, a function name
 ## can be used.
 ##
+## See @command{help @inputParser} for examples.
+##
 ## @seealso{inputParser, @@inputParser/addOptional, @@inputParser/addSwitch,
 ## @@inputParser/addParamValue, @@inputParser/addRequired, @@inputParser/parse}
 ## @end deftypefn

Modified: trunk/octave-forge/main/general/inst/@inputParser/addRequired.m
===================================================================
--- trunk/octave-forge/main/general/inst/@inputParser/addRequired.m	2012-04-19 18:28:07 UTC (rev 10298)
+++ trunk/octave-forge/main/general/inst/@inputParser/addRequired.m	2012-04-20 13:17:29 UTC (rev 10299)
@@ -31,7 +31,7 @@
 ## for the argument with name @var{argname}. Alternatively, a function name
 ## can be used.
 ##
-## See @command{help @@inputParser} for examples.
+## See @command{help @inputParser} for examples.
 ##
 ## @emph{Note}: this can be used together with the other type of arguments but
 ## it must be the first (see @command{@@inputParser}).

Modified: trunk/octave-forge/main/general/inst/@inputParser/addSwitch.m
===================================================================
--- trunk/octave-forge/main/general/inst/@inputParser/addSwitch.m	2012-04-19 18:28:07 UTC (rev 10298)
+++ trunk/octave-forge/main/general/inst/@inputParser/addSwitch.m	2012-04-20 13:17:29 UTC (rev 10299)
@@ -27,7 +27,7 @@
 ## arguments supplied is a string like @var{argname}, then after parsing the value
 ## of @var{parse}.Results.@var{argname} will be true.
 ##
-## See @command{help @@inputParser} for examples.
+## See @command{help inputParser} for examples.
 ##
 ## @seealso{inputParser, @@inputParser/addOptional, @@inputParser/addParamValue
 ## @@inputParser/addParamValue, @@inputParser/addRequired, @@inputParser/parse}

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