octave-cvsupdate Mailing List for Octave Forge (Page 36)

A collection of packages providing extra functionality for GNU Octave

Brought to you by: adb014, ajanke, avinoamk, carandraug, and 13 others

octave-cvsupdate — CVS update notifications

This list is closed, nobody may subscribe to it.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul (10)	Aug (5)	Sep (3)	Oct (41)	Nov (41)	Dec (33)
2002	Jan (75)	Feb (10)	Mar (170)	Apr (174)	May (66)	Jun (11)	Jul (10)	Aug (44)	Sep (73)	Oct (28)	Nov (139)	Dec (52)
2003	Jan (35)	Feb (93)	Mar (62)	Apr (10)	May (55)	Jun (70)	Jul (37)	Aug (16)	Sep (56)	Oct (31)	Nov (57)	Dec (83)
2004	Jan (85)	Feb (67)	Mar (27)	Apr (37)	May (75)	Jun (85)	Jul (160)	Aug (68)	Sep (104)	Oct (25)	Nov (39)	Dec (23)
2005	Jan (10)	Feb (45)	Mar (43)	Apr (19)	May (108)	Jun (31)	Jul (41)	Aug (23)	Sep (65)	Oct (58)	Nov (44)	Dec (54)
2006	Jan (96)	Feb (27)	Mar (69)	Apr (59)	May (67)	Jun (35)	Jul (13)	Aug (461)	Sep (160)	Oct (399)	Nov (32)	Dec (72)
2007	Jan (316)	Feb (305)	Mar (318)	Apr (54)	May (194)	Jun (173)	Jul (282)	Aug (91)	Sep (227)	Oct (365)	Nov (168)	Dec (18)
2008	Jan (71)	Feb (111)	Mar (155)	Apr (173)	May (70)	Jun (67)	Jul (55)	Aug (83)	Sep (32)	Oct (68)	Nov (80)	Dec (29)
2009	Jan (46)	Feb (18)	Mar (95)	Apr (76)	May (140)	Jun (98)	Jul (84)	Aug (123)	Sep (94)	Oct (131)	Nov (142)	Dec (125)
2010	Jan (128)	Feb (158)	Mar (172)	Apr (134)	May (94)	Jun (84)	Jul (32)	Aug (127)	Sep (167)	Oct (109)	Nov (69)	Dec (78)
2011	Jan (39)	Feb (58)	Mar (52)	Apr (47)	May (56)	Jun (76)	Jul (55)	Aug (54)	Sep (165)	Oct (255)	Nov (328)	Dec (263)
2012	Jan (82)	Feb (147)	Mar (400)	Apr (216)	May (209)	Jun (160)	Jul (86)	Aug (141)	Sep (156)	Oct (6)	Nov	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec (2)
2016	Jan	Feb (2)	Mar (2)	Apr (1)	May (1)	Jun (2)	Jul (1)	Aug (1)	Sep	Oct	Nov (1)	Dec
2019	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2021	Jan	Feb	Mar	Apr (3)	May (4)	Jun (8)	Jul (2)	Aug (5)	Sep (9)	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 34 35 36 37 38 .. 540 > >> (Page 36 of 540)

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

From: <jpi...@us...> - 2012-04-15 10:50:11

Revision: 10223
          http://octave.svn.sourceforge.net/octave/?rev=10223&view=rev
Author:   jpicarbajal
Date:     2012-04-15 10:50:05 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
miscellaneous: Adding truncate function for evaluation of the community.

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

Added Paths:
-----------
    trunk/octave-forge/main/miscellaneous/inst/truncate.m

Modified: trunk/octave-forge/main/miscellaneous/NEWS
===================================================================
--- trunk/octave-forge/main/miscellaneous/NEWS	2012-04-15 09:34:12 UTC (rev 10222)
+++ trunk/octave-forge/main/miscellaneous/NEWS	2012-04-15 10:50:05 UTC (rev 10223)
@@ -1,6 +1,15 @@
-Summary of important user-visible changes for miscellaneous 1.1.0:
--------------------------------------------------------------------
+Summary of important user-visible changes for the miscellaneous package
+------------------------------------------------------------------------
+===============================================================================
+miscellaneous-1.2.0   Release Date: 2012-XX-XX  Release Manager:
+===============================================================================
+ ** New functions:
+   truncate.m : truncates a number to a given precision.
 
+===============================================================================
+miscellaneous-1.1.0   Release Date: 2012-03-24  Release Manager:
+===============================================================================
+
  ** IMPORTANT NOTE:
     * the function `waitbar' has been renamed `text_waitbar'. Octave core has
       implemented a Matlab compatible `waitbar' which is imcompatible with the

Added: trunk/octave-forge/main/miscellaneous/inst/truncate.m
===================================================================
--- trunk/octave-forge/main/miscellaneous/inst/truncate.m	                        (rev 0)
+++ trunk/octave-forge/main/miscellaneous/inst/truncate.m	2012-04-15 10:50:05 UTC (rev 10223)
@@ -0,0 +1,43 @@
+%% Copyright (c) 2012 Juan Pablo Carbajal <car...@if...>
+%%
+%%    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
+%%    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{y} = } truncate (@var{x}, @var{order})
+%% Truncates @var{X} to @var{order} of magnitude.
+%%
+%% Example
+%% @example
+%%    format long
+%%    x = 987654321.123456789;
+%%    order = [3:-1:0 -(1:3)]';
+%%    y = truncate(x,order)
+%% y =
+%%   987654000.000000
+%%   987654300.000000
+%%   987654320.000000
+%%   987654321.000000
+%%   987654321.100000
+%%   987654321.120000
+%%   987654321.123000
+%% @end example
+%%
+%% @seealso{round,fix,ceil,floor}
+%% @end deftypefn
+
+function y = truncate (x,order)
+  ino = 0.1.^order;
+  o = 10.^order;
+  y = round (x.*ino).*o;
+end

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

[Octave-cvsupdate] SF.net SVN: octave:[10222] trunk/octave-forge/main/odepkg/DESCRIPTION

From: <tr...@us...> - 2012-04-15 09:34:18

Revision: 10222
          http://octave.svn.sourceforge.net/octave/?rev=10222&view=rev
Author:   treichl
Date:     2012-04-15 09:34:12 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Changed release date for OdePkg 0.8.2 to April.

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

Modified: trunk/octave-forge/main/odepkg/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/odepkg/DESCRIPTION	2012-04-15 09:32:33 UTC (rev 10221)
+++ trunk/octave-forge/main/odepkg/DESCRIPTION	2012-04-15 09:34:12 UTC (rev 10222)
@@ -1,6 +1,6 @@
 Name: OdePkg
 Version: 0.8.2
-Date: 2012-01-30
+Date: 2012-04-15
 Author: Thomas Treichl <tr...@us...>
 Maintainer: Thomas Treichl <tr...@us...>
 Title: OdePkg

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

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

From: <tr...@us...> - 2012-04-15 09:32:40

Revision: 10221
          http://octave.svn.sourceforge.net/octave/?rev=10221&view=rev
Author:   treichl
Date:     2012-04-15 09:32:33 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Changed all occurences of "ismatrix" to "insnumeric" because of Matlab compatibility.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/inst/ode23.m
    trunk/octave-forge/main/odepkg/inst/ode23d.m
    trunk/octave-forge/main/odepkg/inst/ode45.m
    trunk/octave-forge/main/odepkg/inst/ode45d.m
    trunk/octave-forge/main/odepkg/inst/ode54.m
    trunk/octave-forge/main/odepkg/inst/ode54d.m
    trunk/octave-forge/main/odepkg/inst/ode78.m
    trunk/octave-forge/main/odepkg/inst/ode78d.m
    trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m
    trunk/octave-forge/main/odepkg/inst/odeplot.m
    trunk/octave-forge/main/odepkg/inst/odeprint.m

Modified: trunk/octave-forge/main/odepkg/inst/ode23.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode23.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode23.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -223,7 +223,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/ode23d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode23d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode23d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -260,7 +260,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/ode45.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode45.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode45.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -223,7 +223,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/ode45d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode45d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode45d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -260,7 +260,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/ode54.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode54.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode54.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -224,7 +224,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/ode54d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode54d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode54d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -260,7 +260,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/ode78.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode78.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode78.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -224,7 +224,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/ode78d.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/ode78d.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/ode78d.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -260,7 +260,7 @@
 
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle

Modified: trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/odepkg_structure_check.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -186,7 +186,7 @@
 
       case 'Jacobian'
         if (isempty (vret.(vfld{vcntarg})) || ...
-            ismatrix (vret.(vfld{vcntarg})) || ...
+            isnumeric (vret.(vfld{vcntarg})) || ...
             isa (vret.(vfld{vcntarg}), 'function_handle') || ...
             iscell (vret.(vfld{vcntarg})))
         else
@@ -198,7 +198,7 @@
       case 'JPattern'
         if (isempty (vret.(vfld{vcntarg})) || ...
             isvector (vret.(vfld{vcntarg})) || ...
-            ismatrix (vret.(vfld{vcntarg})))
+            isnumeric (vret.(vfld{vcntarg})))
         else
           error ('OdePkg:InvalidParameter', ...
             'Unknown parameter name "%s" or no valid parameter value', ...
@@ -216,7 +216,7 @@
 
       case 'Mass'
         if (isempty (vret.(vfld{vcntarg})) || ...
-            ismatrix (vret.(vfld{vcntarg})) || ...
+            isnumeric (vret.(vfld{vcntarg})) || ...
             isa (vret.(vfld{vcntarg}), 'function_handle'))
         else
           error ('OdePkg:InvalidParameter', ...
@@ -237,7 +237,7 @@
       case 'MvPattern'
         if (isempty (vret.(vfld{vcntarg})) || ...
             isvector (vret.(vfld{vcntarg})) || ...
-            ismatrix (vret.(vfld{vcntarg})))
+            isnumeric (vret.(vfld{vcntarg})))
         else
           error ('OdePkg:InvalidParameter', ...
             'Unknown parameter name "%s" or no valid parameter value', ...

Modified: trunk/octave-forge/main/odepkg/inst/odeplot.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odeplot.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/odeplot.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -70,4 +70,4 @@
 
 %# Local Variables: ***
 %# mode: octave ***
-%# End: ***
\ No newline at end of file
+%# End: ***

Modified: trunk/octave-forge/main/odepkg/inst/odeprint.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odeprint.m	2012-04-15 09:15:55 UTC (rev 10220)
+++ trunk/octave-forge/main/odepkg/inst/odeprint.m	2012-04-15 09:32:33 UTC (rev 10221)
@@ -62,4 +62,4 @@
 
 %# Local Variables: ***
 %# mode: octave ***
-%# End: ***
\ No newline at end of file
+%# End: ***

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

[Octave-cvsupdate] SF.net SVN: octave:[10220] trunk/octave-forge/main/odepkg/inst/odebwe.m

From: <tr...@us...> - 2012-04-15 09:16:02

Revision: 10220
          http://octave.svn.sourceforge.net/octave/?rev=10220&view=rev
Author:   treichl
Date:     2012-04-15 09:15:55 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Added changes from Sebastian for his solver.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/inst/odebwe.m

Modified: trunk/octave-forge/main/odepkg/inst/odebwe.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odebwe.m	2012-04-15 04:32:46 UTC (rev 10219)
+++ trunk/octave-forge/main/odepkg/inst/odebwe.m	2012-04-15 09:15:55 UTC (rev 10220)
@@ -1,4 +1,4 @@
-%# Copyright (C) 2009, Sebastian Schoeps <schoeps AT math DOT uni-wuppertal DOT de>
+%# Copyright (C) 2009-2012, Sebastian Schoeps <schoeps AT math DOT uni-wuppertal DOT de>
 %# OdePkg - A package for solving ordinary differential equations and more
 %#
 %# This program is free software; you can redistribute it and/or modify
@@ -198,7 +198,7 @@
 
   %# Implementation of the option Jacobian has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Jacobian) && ismatrix (vodeoptions.Jacobian))
+  if (~isempty (vodeoptions.Jacobian) && isnumeric (vodeoptions.Jacobian))
     vhavejachandle = false; vjac = vodeoptions.Jacobian; %# constant jac
   elseif (isa (vodeoptions.Jacobian, 'function_handle'))
     vhavejachandle = true; %# jac defined by a function handle
@@ -208,7 +208,7 @@
   
   %# Implementation of the option Mass has been finished. This option
   %# can be set by the user to another value than default value.
-  if (~isempty (vodeoptions.Mass) && ismatrix (vodeoptions.Mass))
+  if (~isempty (vodeoptions.Mass) && isnumeric (vodeoptions.Mass))
     vhavemasshandle = false; vmass = vodeoptions.Mass; %# constant mass
   elseif (isa (vodeoptions.Mass, 'function_handle'))
     vhavemasshandle = true; %# mass defined by a function handle
@@ -326,22 +326,22 @@
       %# We do not use a higher order approximation for the
       %# comparsion, but two steps by the Backward Euler
       %# method
-      for i=1:j
+      for i = 1:j
         % Initialize the time stepping parameters 
-        vthestep = vstepsize/j;
+        vthestep = vstepsize / j;
         vthetime = vtimestamp + i*vthestep;
         vnewtit  = 1;
-        vresnrm  = inf(1,vodeoptions.MaxNewtonIterations);
+        vresnrm  = inf (1, vodeoptions.MaxNewtonIterations);
 
         %# Start the Newton iteration
-        while (vnewtit<vodeoptions.MaxNewtonIterations) && ...
-              (vresnrm(vnewtit)>vodeoptions.NewtonTol)
+        while (vnewtit < vodeoptions.MaxNewtonIterations) && ...
+              (vresnrm (vnewtit) > vodeoptions.NewtonTol)
 
           %# Compute the Jacobian of the non-linear equation,
           %# that is the matrix pencil of the mass matrix and
           %# the right-hand-side's Jacobian. Perform a (sparse)
           %# LU-Decomposition afterwards.
-          if (vnewtit<=1) | (~vsimplified)
+          if ( (vnewtit==1) || (~vsimplified) )
             %# Get the mass matrix from the left-hand-side
             if (vhavemasshandle)   %# Handle only the dynamic mass matrix,
               if (vmassdependence) %# constant mass matrices have already
@@ -564,9 +564,9 @@
     end
     %# Print cost statistics if no output argument is given
     if (nargout == 0)
-      vmsg = fprintf (1, 'Number of successful steps: %d', vnsteps);
-      vmsg = fprintf (1, 'Number of failed attempts:  %d', vnfailed);
-      vmsg = fprintf (1, 'Number of function calls:   %d', vnfevals);
+      vmsg = fprintf (1, 'Number of successful steps: %d\n', vnsteps);
+      vmsg = fprintf (1, 'Number of failed attempts:  %d\n', vnfailed);
+      vmsg = fprintf (1, 'Number of function calls:   %d\n', vnfevals);
     end
   else
     vhavestats = false;

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

[Octave-cvsupdate] SF.net SVN: octave:[10219] trunk/octave-forge/main/vrml/inst/vrml_frame.m

From: <et...@us...> - 2012-04-15 04:32:54

Revision: 10219
          http://octave.svn.sourceforge.net/octave/?rev=10219&view=rev
Author:   etienne
Date:     2012-04-15 04:32:46 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Options and doc

Modified Paths:
--------------
    trunk/octave-forge/main/vrml/inst/vrml_frame.m

Modified: trunk/octave-forge/main/vrml/inst/vrml_frame.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-15 04:23:04 UTC (rev 10218)
+++ trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-15 04:32:46 UTC (rev 10219)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@is...>
+## Copyright (C) 2002-2012 Etienne Grossmann.  All rights reserved.
 ##
 ## 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
@@ -41,14 +41,23 @@
 col = [0.3 0.4 0.9];
 hcol = [];
 
+dc = nan(1,3);
+dr = nan(1,3);
+
 ######################################################################
 ## Read options
 numeric_args = 0;
+<<<<<<< .mine
+args = nargin;  # nargin is now a function
+while args && numeric_args<2 && numeric_args<numel(varargin)
+  tmp = varargin{numeric_args + 1};
+=======
 args = nargin; # nargin is now a function
 while args && numeric_args<2,
 
 
   tmp = varargin{numeric_args + 1};
+>>>>>>> .r10218
   if ischar (tmp), break; end
   --args;
   numeric_args++;
@@ -59,20 +68,23 @@
 
 if args
 
-  leftover_args = varargin;	# pos 2.1.39
-  leftover_args = leftover_args (numeric_args+1:length(leftover_args));
+  leftover_args = {varargin{numeric_args+1:end}};	# pos 2.1.39
 
   verbose = 0;
 
   ## df = tars (col, hcol, diam, scale, verbose);
-  df = struct ("col",    col,   \
-	       "hcol",   hcol,  \
-	       "diam",   diam,  \
-	       "scale",  scale, \
+  df = struct ("dc",     dc,    \ # Diameter of cone (absolute)
+	       "dr",     dr,    \ # Diameter of rod (absolute)
+	       "col",    col,   \ # Color
+	       "hcol",   hcol,  \ # Color of head (if different)
+	       "diam",   diam,  \ # Diameter of cone relative to branch length
+	       "scale",  scale, \ # Lenght of branches
 	       "verbose",verbose);
-  op1 = " col hcol diam scale ";
+  op1 = " col hcol diam scale dc dr ";
   op0 = " verbose ";
   s = read_options (leftover_args, "op1",op1,"op0",op0,"default",df,"skipnan",1);
+  dc = s.dc;
+  dr = s.dr;
   col = s.col;
   hcol = s.hcol;
   diam = s.diam;
@@ -92,19 +104,23 @@
 if prod (size (diam))==1,  diam =  [1,1,1]*diam ; end
 if prod (size (scale))==1, scale = [1,1,1]*scale ; end
 
-diam = diam(:)' ;
 scale = scale(:)' ;
 
-ii = find (scale & ! isnan (scale));
-diam(ii) = diam(ii).*scale(ii);
-rdiam = nan*ones(1,3) ; ## ones (1,3)/24 ;
+diam = - ones(1,3) * nanmax (scale) / 16;
+rdiam = - ones(1,3) * nanmax (scale) / 32;
 
-ml = max (abs (scale(ii)));
-diam(ii) = ml./scale/16;
-rdiam(ii) = ml./scale/32;
-
 sz = [scale; nan*ones(1,3); diam; rdiam] ;
 
+if any (! isnan (dc))
+  ii = find (! isnan (dc));
+  sz(3,ii) = dc(ii);
+end
+if any (! isnan (dr))
+  ii = find (! isnan (dr));
+  sz(4,ii) = dr(ii);
+end
+
+
 ## roddiam = min (nze (scale))/12 ;
 ## if roddiam, d = roddiam.*scale ; else d = [nan,nan,nan] ; end
 

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

[Octave-cvsupdate] SF.net SVN: octave:[10218] trunk/octave-forge/main/vrml/inst/vrml_arrow.m

From: <et...@us...> - 2012-04-15 04:23:10

Revision: 10218
          http://octave.svn.sourceforge.net/octave/?rev=10218&view=rev
Author:   etienne
Date:     2012-04-15 04:23:04 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Doc

Modified Paths:
--------------
    trunk/octave-forge/main/vrml/inst/vrml_arrow.m

Modified: trunk/octave-forge/main/vrml/inst/vrml_arrow.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_arrow.m	2012-04-15 00:57:51 UTC (rev 10217)
+++ trunk/octave-forge/main/vrml/inst/vrml_arrow.m	2012-04-15 04:23:04 UTC (rev 10218)
@@ -22,9 +22,12 @@
 ## sz = [len, alen, dc, dr] has size 1, 2, 3 or 4, where
 ##
 ##   len  : total length                                   <1>
-##   alen : length of arrow/total length                   <len/4>
-##   dc   : Diameter of cone base/total length             <len/16>
-##   dr   : Diameter of rod/total length                   <min(dc, len/32)>
+##   alen : If positive: length of cone/total length       <1/4>
+##          If negative: -(length of cone)
+##   dc   : If positive: diameter of cone base/total len   <1/16>
+##          If negative: -(diameter of cone) 
+##   dr   : If positive: diameter of rod/total length      <min(dc, len/32)>
+##          If negative: -(diameter of rod) 
 ##
 ## col    : 3 or 3x2 : Color of body and cone              <[0.3 0.4 0.9]>
 ##
@@ -48,7 +51,6 @@
 s0 = [1, 1/4, 1/16, 1/32];
 				# Get absolute size
 if nargin<1 || isempty (sz) || isnan (sz),  sz = s0 ;
-
 elseif length (sz) == 4,      sz = [sz(1),sz(2),sz(3),sz(4)];
 elseif length (sz) == 3,      sz = [sz(1),sz(2),sz(3),s0(4)];
 elseif length (sz) == 2,      sz = [sz(1),sz(2),s0(3),s0(4)];
@@ -57,8 +59,11 @@
   error ("vrml_arrow : sz has size %dx%d. (should be in 1-4)\n", size(sz));
   ## keyboard
 end
-if any (tmp = isnan(sz)), sz(find (tmp)) = s0(find (tmp)) ; end
-## Was: sz .*= [1, sz([1 1 1])]; 
+
+assert (sz(1) > 0)
+
+if !isempty (tmp = find(isnan(sz))), sz(tmp) = s0(tmp) ; end
+
 for i = 2:4
   if sz(i) >= 0
 	sz(i) *= sz(1);

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

[Octave-cvsupdate] SF.net SVN: octave:[10217] trunk/octave-forge/main/vrml/inst/vrml_arrow.m

From: <et...@us...> - 2012-04-15 00:57:58

Revision: 10217
          http://octave.svn.sourceforge.net/octave/?rev=10217&view=rev
Author:   etienne
Date:     2012-04-15 00:57:51 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Allow negative sz, meaning absolute sz, rather than relative to length

Modified Paths:
--------------
    trunk/octave-forge/main/vrml/inst/vrml_arrow.m

Modified: trunk/octave-forge/main/vrml/inst/vrml_arrow.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_arrow.m	2012-04-14 16:05:41 UTC (rev 10216)
+++ trunk/octave-forge/main/vrml/inst/vrml_arrow.m	2012-04-15 00:57:51 UTC (rev 10217)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@is...>
+## Copyright (C) 2002-2012 Etienne Grossmann.  All rights reserved.
 ##
 ## 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
@@ -58,7 +58,14 @@
   ## keyboard
 end
 if any (tmp = isnan(sz)), sz(find (tmp)) = s0(find (tmp)) ; end
-sz .*= [1, sz([1 1 1])]; 
+## Was: sz .*= [1, sz([1 1 1])]; 
+for i = 2:4
+  if sz(i) >= 0
+	sz(i) *= sz(1);
+  else
+	sz(i) = -sz(i);
+  endif
+endfor
 
 				# Do material nodes
 smat1 = vrml_material (col(:,1), emit);

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

[Octave-cvsupdate] SF.net SVN: octave:[10216] trunk/octave-forge/main/geometry/inst/geom2d/ distancePointEdge.m

From: <jpi...@us...> - 2012-04-14 16:05:52

Revision: 10216
          http://octave.svn.sourceforge.net/octave/?rev=10216&view=rev
Author:   jpicarbajal
Date:     2012-04-14 16:05:41 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
geometry: fixing Copyright.

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m

Modified: trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m	2012-04-14 16:03:10 UTC (rev 10215)
+++ trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m	2012-04-14 16:05:41 UTC (rev 10216)
@@ -1,5 +1,5 @@
+%% Copyright (c) 2007-2011, David Legland <dav...@gr...>
 %% Copyright (c) 2012, Juan Pablo Carbajal <car...@if...>
-%% Derived from distancePointEdge.m by David Legland <dav...@gr...>
 %%
 %% All rights reserved.
 %% (simplified BSD License)

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

[Octave-cvsupdate] SF.net SVN: octave:[10215] trunk/octave-forge/main/geometry/inst/geom2d/ distancePointEdge.m

From: <jpi...@us...> - 2012-04-14 16:03:17

Revision: 10215
          http://octave.svn.sourceforge.net/octave/?rev=10215&view=rev
Author:   jpicarbajal
Date:     2012-04-14 16:03:10 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
geometry: fixing bug in distancePointEdge when there were more points than edges. Now the function computes all against all distances.

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m

Modified: trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m	2012-04-14 10:29:20 UTC (rev 10214)
+++ trunk/octave-forge/main/geometry/inst/geom2d/distancePointEdge.m	2012-04-14 16:03:10 UTC (rev 10215)
@@ -1,6 +1,5 @@
-%% Copyright (c) 2011, INRA
-%% 2007-2011, David Legland <dav...@gr...>
-%% 2011 Adapted to Octave by Juan Pablo Carbajal <car...@if...>
+%% Copyright (c) 2012, Juan Pablo Carbajal <car...@if...>
+%% Derived from distancePointEdge.m by David Legland <dav...@gr...>
 %%
 %% All rights reserved.
 %% (simplified BSD License)
@@ -10,8 +9,8 @@
 %%
 %% 1. Redistributions of source code must retain the above copyright notice, this
 %%    list of conditions and the following disclaimer.
-%%     
-%% 2. Redistributions in binary form must reproduce the above copyright notice, 
+%%
+%% 2. Redistributions in binary form must reproduce the above copyright notice,
 %%    this list of conditions and the following disclaimer in the documentation
 %%    and/or other materials provided with the distribution.
 %%
@@ -19,9 +18,9 @@
 %% AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 %% IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 %% ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-%% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+%% LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 %% CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-%% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+%% SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 %% INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 %% CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 %% ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
@@ -33,53 +32,100 @@
 
 %% -*- texinfo -*-
 %% @deftypefn {Function File} {@var{dist} = } distancePointEdge (@var{point}, @var{edge})
+%% @deftypefnx {Function File} {@var{dist} = } distancePointEdge (@dots, @var{opt})
+%% @deftypefnx {Function File} {[@var{dist} @var{pos}]= } distancePointEdge (@dots)
 %% Minimum distance between a point and an edge
 %%
-%%   DIST = distancePointEdge(POINT, EDGE);
-%%   Return the euclidean distance between edge EDGE and point POINT. 
-%%   EDGE has the form: [x1 y1 x2 y2], and POINT is [x y].
+%% Return the euclidean distance between edge @var{edge} and point @var{point}.
+%% @var{edge} has the form: [x1 y1 x2 y2], and @var{point} is [x y].
+%% If @var{edge} is Ne-by-4 and @var{point} is Np-by-2, then @var{dist} is
+%% Np-by-Ne, where each row contains the distance of each point to all the edges.
 %%
-%%   If EDGE is N-by-4 array, result is N-by-1 array computed for each edge.
-%%   If POINT is a N-by-2 array, the result is computed for each point.
-%%   If both POINT and EDGE are array, they must have the same number of
-%%   rows, and the result is computed for each couple point(i,:);edge(i,:).
+%% If @var{opt} is true (or equivalent), the optput is cmpatible with the original function:
+%% @table @samp
+%% @item 1
+%% If @var{point} is 1-by-2 array, the result is Ne-by-1 array computed for each edge.
+%% @item 2
+%% If @var{edge} is a 1-by-4 array, the result is Np-by-1 computed for each point.
+%% @item 3
+%% If both @var{point} and @var{edge} are array, they must have the same number of
+%% rows, and the result is computed for each couple @code{@var{point}(i,:),@var{edge}(i,:)}.
+%% @end table
 %%
-%%   [DIST POS] = distancePointEdge(POINT, EDGE);
-%%   Also returns the position of closest point on the edge. POS is
-%%   comprised between 0 (first point) and 1 (last point).
+%% If the the second output argument @var{pos} is requested, the function also
+%% returns the position of closest point on the edge. @var{pos} is comprised
+%% between 0 (first point) and 1 (last point).
 %%
-%%   @seealso{edges2d, points2d, distancePoints, distancePointLine}
+%% @seealso{edges2d, points2d, distancePoints, distancePointLine}
 %% @end deftypefn
 
-function varargout = distancePointEdge(point, edge)
+%% Rewritten to accept different numbers of points and edges.
+%% 2012 - Juan Pablo Carbajal
+
+function [dist, tp] = distancePointEdge(point, edge, opt=[])
+
+  Np = size (point,1);
+  Ne = size (edge,1);
+  edge = edge.';
+
   % direction vector of each edge
-  dx = edge(:, 3) - edge(:,1);
-  dy = edge(:, 4) - edge(:,2);
+  dx = edge(3,:) - edge(1,:);
+  dy = edge(4,:) - edge(2,:);
 
   % compute position of points projected on the supporting line
   % (Size of tp is the max number of edges or points)
+
   delta = dx .* dx + dy .* dy;
-  tp = ((point(:, 1) - edge(:, 1)) .* dx + (point(:, 2) - edge(:, 2)) .* dy) ./ delta;
+  warning ('off', 'Octave:broadcast');
+  tp = ((point(:, 1) - edge(1, :)) .* dx + (point(:, 2) - edge(2, :)) .* dy) ./ delta;
+  tp(:,delta < eps) = 0;
 
-  % ensure degenerated edges are correclty processed (consider the first
-  % vertex is the closest)
-  tp(delta < eps) = 0;
-
   % change position to ensure projected point is located on the edge
   tp(tp < 0) = 0;
   tp(tp > 1) = 1;
 
   % coordinates of projected point
-  p0 = [edge(:,1) + tp .* dx, edge(:,2) + tp .* dy];
+  p0x = (edge(1,:) + tp .* dx);
+  p0y = (edge(2,:) + tp .* dy);
 
   % compute distance between point and its projection on the edge
-  dist = sqrt((point(:,1) - p0(:,1)) .^ 2 + (point(:,2) - p0(:,2)) .^ 2);
+  dist = sqrt((point(:,1) - p0x) .^ 2 + (point(:,2) - p0y) .^ 2);
 
-  % process output arguments
-  varargout{1} = dist;
-  if nargout > 1
-      varargout{2} = tp;
+  warning ('on', 'Octave:broadcast');
+
+  %% backwards compatibility
+  if opt
+    if  Np != Ne && (Ne != 1 && Np !=1)
+      error ("geometry:InvalidArgument", ...
+      "Sizes must be equal or one of the inputs must be 1-by-N array.");
+    end
+    if Np == Ne
+      dist = diag(dist)(:);
+      tp = diag(tp)(:);
+    elseif Np == 1
+      dist = dist.';
+      tp = tp.';
+    end
   end
 
 endfunction
 
+%% Original code
+%%tp = ((point(:, 1) - edge(:, 1)) .* dx + (point(:, 2) - edge(:, 2)) .* dy) ./ delta;
+%%% ensure degenerated edges are correclty processed (consider the first
+%%% vertex is the closest)
+%%if Ne > 1
+%%  tp(delta < eps) = 0;
+%%elseif delta < eps
+%%  tp(:) = 0;
+%%end
+
+%%% change position to ensure projected point is located on the edge
+%%tp(tp < 0) = 0;
+%%tp(tp > 1) = 1;
+
+%%% coordinates of projected point
+%%p0 = [edge(:,1) + tp .* dx, edge(:,2) + tp .* dy];
+
+%%% compute distance between point and its projection on the edge
+%%dist = sqrt((point(:,1) - p0(:,1)) .^ 2 + (point(:,2) - p0(:,2)) .^ 2);

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

[Octave-cvsupdate] SF.net SVN: octave:[10214] trunk/octave-forge/main/odepkg/inst/ odepkg_examples_ode.m

From: <tr...@us...> - 2012-04-14 10:29:26

Revision: 10214
          http://octave.svn.sourceforge.net/octave/?rev=10214&view=rev
Author:   treichl
Date:     2012-04-14 10:29:20 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Fixed short-circuit operator.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m

Modified: trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m
===================================================================
--- trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m	2012-04-13 12:31:39 UTC (rev 10213)
+++ trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m	2012-04-14 10:29:20 UTC (rev 10214)
@@ -41,7 +41,7 @@
        '   your patch with your added example to the OdePkg developer team.\n', ...
        '\n' ]);
     vode = input ('Please choose a number from above or press <Enter> to return: ');
-    clc; if (vode > 0 & vode < 6)
+    clc; if (vode > 0 && vode < 6)
       %# We can't use the function 'demo' directly here because it does
       %# not allow to run other functions within a demo.
       vexa = example (mfilename (), vode);

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

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

From: <mma...@us...> - 2012-04-13 12:31:46

Revision: 10213
          http://octave.svn.sourceforge.net/octave/?rev=10213&view=rev
Author:   mmarzolla
Date:     2012-04-13 12:31:39 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
fixed documentation

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

Modified: trunk/octave-forge/main/queueing/inst/dtmc_taexps.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/dtmc_taexps.m	2012-04-13 12:20:21 UTC (rev 10212)
+++ trunk/octave-forge/main/queueing/inst/dtmc_taexps.m	2012-04-13 12:31:39 UTC (rev 10213)
@@ -31,18 +31,16 @@
 ##
 ## @table @var
 ##
-## @item Q
-## Infinitesimal generator matrix. @code{@var{Q}(i,j)} is the transition
-## rate from state @math{i} to state @math{j},
-## @math{1 @leq{} i \neq j @leq{} N}. The
-## matrix @var{Q} must also satisfy the condition @math{\sum_{j=1}^N Q_{i, j} = 0}
+## @item P
+## @math{N \times N} transition probability matrix.
 ##
-## @item t
-## Time. If omitted, the results are computed until absorption.
+## @item n
+## Number of transitions during which the time-averaged expected sojourn times
+## are computed (@math{@var{n} @geq{} 0}). if @math{@var{n} = 0},
+## returns @var{p0}.
 ##
-## @item p
-## @code{@var{p}(i)} is the probability that, at time 0, the system was in
-## state @math{i}, for all @math{i = 1, @dots{}, N}
+## @item p0
+## Initial state occupancy probabilities.
 ##
 ## @end table
 ##
@@ -51,12 +49,12 @@
 ## @table @var
 ##
 ## @item M
-## If this function is called with three arguments, @code{@var{M}(i)}
-## is the expected fraction of the interval @math{[0,t]} spent in state
-## @math{i} assuming that the state occupancy probability at time zero
-## is @var{p}. If this function is called with two arguments,
-## @code{@var{M}(i)} is the expected fraction of time until absorption
-## spent in state @math{i}.
+## If this function is called with three arguments, @code{@var{M}(i)} is
+## the expected fraction of steps @math{@{0, 1, @dots{}, n@}} spent in
+## state @math{i}, assuming that the state occupancy probabilities at
+## time zero are @var{p0}. If this function is called with two
+## arguments, @code{@var{M}(i)} is the expected fraction of steps spent
+## in state @math{i} until absorption.
 ##
 ## @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:[10212] trunk/octave-forge/main/queueing/inst

From: <mma...@us...> - 2012-04-13 12:20:34

Revision: 10212
          http://octave.svn.sourceforge.net/octave/?rev=10212&view=rev
Author:   mmarzolla
Date:     2012-04-13 12:20:21 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
replaced usage() with error()

Modified Paths:
--------------
    trunk/octave-forge/main/queueing/inst/ctmc.m
    trunk/octave-forge/main/queueing/inst/ctmc_bd.m
    trunk/octave-forge/main/queueing/inst/ctmc_exps.m
    trunk/octave-forge/main/queueing/inst/ctmc_fpt.m
    trunk/octave-forge/main/queueing/inst/ctmc_mtta.m
    trunk/octave-forge/main/queueing/inst/ctmc_taexps.m
    trunk/octave-forge/main/queueing/inst/dtmc.m
    trunk/octave-forge/main/queueing/inst/dtmc_bd.m
    trunk/octave-forge/main/queueing/inst/dtmc_exps.m
    trunk/octave-forge/main/queueing/inst/dtmc_mtta.m
    trunk/octave-forge/main/queueing/inst/population_mix.m
    trunk/octave-forge/main/queueing/inst/qnammm.m
    trunk/octave-forge/main/queueing/inst/qnclosedab.m
    trunk/octave-forge/main/queueing/inst/qnclosedbsb.m
    trunk/octave-forge/main/queueing/inst/qnclosedgb.m
    trunk/octave-forge/main/queueing/inst/qnclosedmultimva.m
    trunk/octave-forge/main/queueing/inst/qnclosedmultimvaapprox.m
    trunk/octave-forge/main/queueing/inst/qnclosedpb.m
    trunk/octave-forge/main/queueing/inst/qnclosedsinglemva.m
    trunk/octave-forge/main/queueing/inst/qnclosedsinglemvaapprox.m
    trunk/octave-forge/main/queueing/inst/qnclosedsinglemvald.m
    trunk/octave-forge/main/queueing/inst/qncmva.m
    trunk/octave-forge/main/queueing/inst/qnconvolution.m
    trunk/octave-forge/main/queueing/inst/qnconvolutionld.m
    trunk/octave-forge/main/queueing/inst/qnjackson.m
    trunk/octave-forge/main/queueing/inst/qnmarkov.m
    trunk/octave-forge/main/queueing/inst/qnmg1.m
    trunk/octave-forge/main/queueing/inst/qnmh1.m
    trunk/octave-forge/main/queueing/inst/qnmix.m
    trunk/octave-forge/main/queueing/inst/qnmknode.m
    trunk/octave-forge/main/queueing/inst/qnmm1.m
    trunk/octave-forge/main/queueing/inst/qnmm1k.m
    trunk/octave-forge/main/queueing/inst/qnmminf.m
    trunk/octave-forge/main/queueing/inst/qnmmm.m
    trunk/octave-forge/main/queueing/inst/qnmmmk.m
    trunk/octave-forge/main/queueing/inst/qnmvablo.m
    trunk/octave-forge/main/queueing/inst/qnopenab.m
    trunk/octave-forge/main/queueing/inst/qnopenbsb.m
    trunk/octave-forge/main/queueing/inst/qnopenmulti.m
    trunk/octave-forge/main/queueing/inst/qnopensingle.m
    trunk/octave-forge/main/queueing/inst/qnsolve.m
    trunk/octave-forge/main/queueing/inst/qnvisits.m

Modified: trunk/octave-forge/main/queueing/inst/ctmc.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/ctmc.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/ctmc.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -86,7 +86,7 @@
   [N err] = ctmc_check_Q(Q);
 
   ( N>0 ) || \
-      usage(err);
+      error(err);
 
   if ( nargin == 1 ) # steady-state analysis
 
@@ -112,10 +112,10 @@
   else # transient analysis
 
     ( isscalar(t) && t>=0 ) || \
-        usage("t must be a scalar >= 0");
+        error("t must be a scalar >= 0");
 
     ( isvector(p0) && length(p0) == N && all(p0>=0) && abs(sum(p0)-1.0)<N*eps ) || \
-        usage( "p0 must be a probability vector" );   
+        error( "p0 must be a probability vector" );   
 
     p0 = p0(:)'; # make p0 a row vector
 

Modified: trunk/octave-forge/main/queueing/inst/ctmc_bd.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/ctmc_bd.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/ctmc_bd.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -74,15 +74,15 @@
   endif
 
   ( isvector( birth ) && isvector( death ) ) || \
-      usage( "birth and death must be vectors" );
+      error( "birth and death must be vectors" );
   birth = birth(:); # make birth a column vector
   death = death(:); # make death a column vector
   size_equal( birth, death ) || \
-      usage( "birth and death rates must have the same length" );
+      error( "birth and death rates must have the same length" );
   all( birth >= 0 ) || \
-      usage( "birth rates must be >= 0" );
+      error( "birth rates must be >= 0" );
   all( death >= 0 ) || \
-      usage( "death rates must be >= 0" );
+      error( "death rates must be >= 0" );
 
   ## builds the infinitesimal generator matrix
   Q = diag( birth, 1 ) + diag( death, -1 );

Modified: trunk/octave-forge/main/queueing/inst/ctmc_exps.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/ctmc_exps.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/ctmc_exps.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -79,7 +79,7 @@
   [N err] = ctmc_check_Q(Q);
 
   (N>0) || \
-      usage(err);
+      error(err);
 
   if ( nargin == 2 )
     p = varargin{1};
@@ -89,14 +89,14 @@
   endif
 
   ( isvector(p) && length(p) == size(Q,1) && all(p>=0) && abs(sum(p)-1.0)<epsilon ) || \
-      usage( "p must be a probability vector" );
+      error( "p must be a probability vector" );
 
   p = p(:)'; # make p a row vector
 
   if ( nargin == 3 ) # non-absorbing case
     if ( isscalar(t) )
       (t >= 0 ) || \
-	  usage( "t must be >= 0" );
+	  error( "t must be >= 0" );
       ## F(x) are the transient state occupancy probabilities at time x
       ## F(x) = p*expm(Q*x) (see function ctmc()).
       F = @(x) (p*expm(Q*x));
@@ -104,7 +104,7 @@
     else
       ## FIXME: deprecate this?
       ( isvector(t) && abs(t(1)) < epsilon ) || \
-	  usage( "t must be a vector, and t(1) must be 0.0" );
+	  error( "t must be a vector, and t(1) must be 0.0" );
       t = t(:)'; # make tt a row vector
       ff = @(x,t) (x(:)'*Q+p);
       fj = @(x,t) (Q);

Modified: trunk/octave-forge/main/queueing/inst/ctmc_fpt.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/ctmc_fpt.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/ctmc_fpt.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -89,8 +89,8 @@
       endfor
     endfor
   else
-    (isscalar(i) && i>=1 && j<=N) || usage("i must be an integer in the range 1..%d", N);
-    (isvector(j) && all(j>=1) && all(j<=N)) || usage("j must be an integer or vector with elements in 1..%d", N);
+    (isscalar(i) && i>=1 && j<=N) || error("i must be an integer in the range 1..%d", N);
+    (isvector(j) && all(j>=1) && all(j<=N)) || error("j must be an integer or vector with elements in 1..%d", N);
     j = j(:)'; # make j a row vector
     Q(j,:) = 0; # make state(s) j absorbing
     p0 = zeros(1,N); p0(i) = 1;

Modified: trunk/octave-forge/main/queueing/inst/ctmc_mtta.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/ctmc_mtta.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/ctmc_mtta.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -71,10 +71,10 @@
   [N err] = ctmc_check_Q(Q);
 
   (N>0) || \
-      usage(err);
+      error(err);
 
   ( isvector(p) && length(p) == N && all(p>=0) && abs(sum(p)-1.0)<epsilon ) || \
-      usage( "p must be a probability vector" );
+      error( "p must be a probability vector" );
 
   L = ctmc_exps(Q,p);
   t = sum(L);

Modified: trunk/octave-forge/main/queueing/inst/ctmc_taexps.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/ctmc_taexps.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/ctmc_taexps.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -52,12 +52,12 @@
 ## @table @var
 ##
 ## @item M
-## If this function is called with three parameters, @code{@var{M}(i)}
-## is the expected fraction of the interval @math{[0,t]} spent in state
-## @math{i} assuming that the state occupancy probability at time zero
-## is @var{p}. If this function is called with two parameters,
-## @code{@var{M}(i)} is the expected fraction of time until absorption
-## spent in state @math{i}.
+## When called with three arguments, @code{@var{M}(i)} is the expected
+## fraction of the interval @math{[0,t]} spent in state @math{i}
+## assuming that the state occupancy probability at time zero is
+## @var{p}. When called with two arguments, @code{@var{M}(i)} is the
+## expected fraction of time until absorption spent in state @math{i};
+## in this case the mean time to absorption is @code{sum(@var{M})}.
 ##
 ## @end table
 ##
@@ -80,7 +80,7 @@
 #{
   if ( nargin == 3 ) 
     (t >= 0) || \
-	usage( "t must be >= 0" );
+	error( "t must be >= 0" );
     F = @(x) (p*expm(Q*x));
     M = quadv(F,0,t) / t;
   else 

Modified: trunk/octave-forge/main/queueing/inst/dtmc.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/dtmc.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/dtmc.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -84,7 +84,7 @@
   [N err] = dtmc_check_P(P);
   
   ( N>0 ) || \
-      usage( err );
+      error( err );
 
   if ( nargin == 1 ) # steady-state analysis
     A = P-eye(N);
@@ -96,10 +96,10 @@
     p = b/A;
   else # transient analysis
     ( isscalar(n) && n>=0 ) || \
-	usage( "n must be >=0" );
+	error( "n must be >=0" );
 
     ( isvector(p0) && length(p0) == N && all(p0>=0) && abs(sum(p0)-1.0)<N*eps ) || \
-        usage( "p0 must be a probability vector" );   
+        error( "p0 must be a probability vector" );   
 
     p0 = p0(:)'; # make p0 a row vector
 

Modified: trunk/octave-forge/main/queueing/inst/dtmc_bd.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/dtmc_bd.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/dtmc_bd.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -75,17 +75,17 @@
   endif
 
   ( isvector( b ) && isvector( d ) ) || \
-      usage( "birth and death must be vectors" );
+      error( "birth and death must be vectors" );
   b = b(:); # make b a column vector
   d = d(:); # make d a column vector
   size_equal( b, d ) || \
-      usage( "birth and death vectors must have the same length" );
+      error( "birth and death vectors must have the same length" );
   all( b >= 0 ) || \
-      usage( "birth probabilities must be >= 0" );
+      error( "birth probabilities must be >= 0" );
   all( d >= 0 ) || \
-      usage( "death probabilities must be >= 0" );
+      error( "death probabilities must be >= 0" );
   all( ([b; 0] + [0; d]) <= 1 ) || \
-      usage( "d(i)+b(i+1) must be <= 1");
+      error( "d(i)+b(i+1) must be <= 1");
 
   P = diag( b, 1 ) + diag( d, -1 );
   P += diag( 1-sum(P,2) );

Modified: trunk/octave-forge/main/queueing/inst/dtmc_exps.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/dtmc_exps.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/dtmc_exps.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -74,7 +74,7 @@
   [K err] = dtmc_check_P(P);
 
   (K>0) || \
-      usage(err);
+      error(err);
 
   if ( nargin == 2 )
     p0 = varargin{1};
@@ -84,7 +84,7 @@
   endif
 
   ( isvector(p0) && length(p0) == K && all(p0>=0) && abs(sum(p0)-1.0)<epsilon ) || \
-      usage( "p0 must be a state occupancy probability vector" );
+      error( "p0 must be a state occupancy probability vector" );
 
   p0 = p0(:)'; # make p0 a row vector
 

Modified: trunk/octave-forge/main/queueing/inst/dtmc_mtta.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/dtmc_mtta.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/dtmc_mtta.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -91,11 +91,11 @@
   [K err] = dtmc_check_P(P);
 
   (K>0) || \
-      usage(err);
+      error(err);
   
   if ( nargin == 2 )
     ( isvector(p0) && length(p0) == K && all(p0>=0) && abs(sum(p0)-1.0)<epsilon ) || \
-	usage( "p0 must be a state occupancy probability vector" );
+	error( "p0 must be a state occupancy probability vector" );
   endif
 
   ## identify transient states

Modified: trunk/octave-forge/main/queueing/inst/population_mix.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/population_mix.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/population_mix.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -84,10 +84,10 @@
   endif
 
   isvector( population ) && all( population>=0 ) || \
-      usage( "N must be an array >=0" );
+      error( "N must be an array >=0" );
   R = length(population); # number of classes
   ( isscalar(k) && k >= 0 && k <= sum(population) ) || \
-      usage( "k must be a scalar <= %d", sum(population));
+      error( "k must be a scalar <= %d", sum(population));
   N = zeros(1, R);
   const = min(k, population);
   mp = 0;

Modified: trunk/octave-forge/main/queueing/inst/qnammm.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnammm.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnammm.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -75,7 +75,7 @@
   endif
 
   ( isscalar(lambda) && isvector(mu) ) || \
-      usage( "the parameters must be vectors" );
+      error( "the parameters must be vectors" );
 
   m = length(mu); # number of servers
 

Modified: trunk/octave-forge/main/queueing/inst/qnclosedab.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedab.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedab.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -69,14 +69,14 @@
     print_usage();
   endif
   ( isscalar(N) && N > 0 ) || \
-      usage( "N must be a positive integer" );
+      error( "N must be a positive integer" );
   ( isvector(D) && length(D)>0 && all( D >= 0 ) ) || \
-      usage( "D must be a vector of nonnegative floats" );
+      error( "D must be a vector of nonnegative floats" );
   if ( nargin < 3 )
     Z = 0;
   else
     ( isscalar(Z) && Z >= 0 ) || \
-        usage( "Z must be a nonnegative scalar" );
+        error( "Z must be a nonnegative scalar" );
   endif
   
   D_tot = sum(D);

Modified: trunk/octave-forge/main/queueing/inst/qnclosedbsb.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedbsb.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedbsb.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -69,14 +69,14 @@
     print_usage();
   endif
   ( isscalar(N) && N>0 ) || \
-      usage( "N must be a positive scalar" );
+      error( "N must be a positive scalar" );
   ( isvector(D) && length(D)>0 && all(D>=0) ) || \
-      usage( "D must be a vector of nonnegative floats" );
+      error( "D must be a vector of nonnegative floats" );
   if ( nargin < 3 )
     Z = 0;
   else
     ( isscalar(Z) && Z>=0 ) || \
-        usage( "Z must be a nonnegative scalar" );
+        error( "Z must be a nonnegative scalar" );
   endif
 
   D_max = max(D);

Modified: trunk/octave-forge/main/queueing/inst/qnclosedgb.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedgb.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedgb.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -79,15 +79,15 @@
     print_usage();
   endif
   ( isscalar(N) && N > 0 ) || \
-      usage( "N must be >0" );
+      error( "N must be >0" );
   ( isvector(L) && length(L) > 0 && all( L >= 0 ) ) || \
-      usage( "D must be a vector >=0" );
+      error( "D must be a vector >=0" );
   L = L(:)'; # make L a row vector
   if ( nargin < 3 )
     Z = 0;
   else
     ( isscalar(Z) && (Z >= 0) ) || \
-        usage( "Z must be >=0" );
+        error( "Z must be >=0" );
   endif
   L_tot = sum(L);
   L_max = max(L);
@@ -122,9 +122,9 @@
 ## network with N customers, service demands D and think time Z. This
 ## function uses Eq. (8) and (13) from the reference paper.
 function [ Q_lower Q_upper ] = __compute_Q( N, L, Z, X_plus, X_minus )
-  isscalar(X_plus) || usage( "X_plus must be a scalar" );
-  isscalar(X_minus) || usage( "X_minus must be a scalar" );
-  ( isscalar(N) && (N>=0) ) || usage( "N is not valid" );
+  isscalar(X_plus) || error( "X_plus must be a scalar" );
+  isscalar(X_minus) || error( "X_minus must be a scalar" );
+  ( isscalar(N) && (N>=0) ) || error( "N is not valid" );
   L_tot = sum(L);
   L_max = max(L);
   M = length(L);

Modified: trunk/octave-forge/main/queueing/inst/qnclosedmultimva.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedmultimva.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedmultimva.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -27,9 +27,8 @@
 ## @cindex Mean Value Analysys (MVA)
 ## @cindex closed network, multiple classes
 ##
-## Analyze closed, multiclass queueing networks with @math{K} service
-## centers and @math{C} independent customer classes (chains) using the
-## Mean Value Analysys (MVA) algorithm. 
+## Compute steady-state performance measures for closed, multiclass
+## queueing networks using the Mean Value Analysys (MVA) algorithm.
 ##
 ## Queueing policies at service centers can be any of the following:
 ##
@@ -63,9 +62,10 @@
 ##
 ## If this function is called specifying the routing probability matrix
 ## @var{P}, then class switching @strong{is} allowed; however, in this
-## case all nodes are restricted to be fixed rate service centers or
-## delay centers: multiple-server and general load-dependent
-## centers are not supported. @end quotation
+## case all nodes are restricted to be fixed rate servers or delay
+## centers: multiple-server and general load-dependent centers are not
+## supported.
+## @end quotation
 ##
 ## @strong{INPUTS}
 ##
@@ -74,30 +74,31 @@
 ## @item N
 ## @code{@var{N}(c)} is the number of class @math{c} requests in the
 ## system; @code{@var{N}(c) @geq{} 0}. If class @math{c} has
-## no requests (@code{@var{N}(c) = 0}), then
+## no requests (@code{@var{N}(c) == 0}), then for all @var{k},
 ## @code{@var{U}(c,k) = @var{R}(c,k) = @var{Q}(c,k) = @var{X}(c,k) = 0}
-## for all @var{k}.
 ##
 ## @item S
 ## @code{@var{S}(c,k)} is the mean service time for class @math{c}
-## customers at center @math{k} (@code{@var{S}(c,k) @geq{} 0}).
-## If service time at center @math{k} is class-dependent,
-## then center #math{k} is assumed to be of type @math{-/G/1}--PS
-## (Processor Sharing).
+## customers at center @math{k} (@code{@var{S}(c,k) @geq{} 0}). If the
+## service time at center @math{k} is class-dependent, i.e., different
+## classes have different service times at center @math{k}, then center
+## @math{k} is assumed to be of type @math{-/G/1}--PS (Processor
+## Sharing).
 ## If center @math{k} is a FCFS node (@code{@var{m}(k)>1}), then the
-## service times @strong{must} be class-independent.
+## service times @strong{must} be class-independent, i.e., all classes
+## @strong{must} have the same service time.
 ##
 ## @item V
 ## @code{@var{V}(c,k)} is the average number of visits of class @math{c}
 ## customers to service center @math{k}; @code{@var{V}(c,k) @geq{} 0},
 ## default is 1.
-## @strong{If you pass this parameter, class switching is not
+## @strong{If you pass this argument, class switching is not
 ## allowed}
 ##
 ## @item P
 ## @code{@var{P}(r,i,s,j)} is the probability that a class @math{r}
 ## job completing service at center @math{i} is routed to center @math{j}
-## as a class @math{s} job. @strong{If you pass this parameter, 
+## as a class @math{s} job. @strong{If you pass this argument,
 ## class switching is allowed}.
 ##
 ## @item m
@@ -162,17 +163,17 @@
 
   ## basic sanity checks
   isvector(N) && all( N>=0 ) || \
-      usage( "N must be a vector >=0" );
+      error( "N must be a vector >=0" );
   C = length(N); ## Number of classes
   ( ndims(S) == 2 ) || \
-      usage( "S must be a matrix" );
+      error( "S must be a matrix" );
 
   if ( nargin == 2 )
     V = ones(size(S));
   endif
 
   ( ismatrix(V) && (ndims(V) == 2 || ndims(V) == 4) ) || \
-      usage("The third parametermust be a 2- or 4-dimensional matrix" );
+      error("The third argument must be a 2- or 4-dimensional matrix" );
 
   if ( ndims(V) == 2 )
     [U R Q X] = __qnclosedmultimva_nocs( N, S, V, varargin{:} );
@@ -191,34 +192,34 @@
   endif
 
   isvector(N) && all( N>=0 ) || \
-      usage( "N must be >=0" );
+      error( "N must be >=0" );
   N = N(:)'; # make N a row vector
   C = length(N); ## Number of classes
   ( ndims(S) == 2 ) || \
-      usage( "S must be a matrix" );
+      error( "S must be a matrix" );
   K = columns(S); ## Number of service centers
   size(S) == [C,K] || \
-      usage( "S size mismatch (is %dx%d, should be %dx%d)", rows(S), columns(S), C, K );
+      error( "S size mismatch (is %dx%d, should be %dx%d)", rows(S), columns(S), C, K );
   ndims(P) == 4 && size(P) == [C,K,C,K] || \
-      usage( "P size mismatch (should be %dx%dx%dx%d)",C,K,C,K );
+      error( "P size mismatch (should be %dx%dx%dx%d)",C,K,C,K );
 
   if ( nargin < 4 ) 
     m = ones(1,K);
   else
     isvector(m) || \
-        usage( "m must be a vector" );
+        error( "m must be a vector" );
     m = m(:)'; # make m a row vector
     length(m) == K || \
-        usage( "m size mismatch (should be %d, is %d)", K, length(m) );
+        error( "m size mismatch (should be %d, is %d)", K, length(m) );
   endif
 
   ## Check consistency of parameters
   all( all( S >= 0 ) ) || \
-      usage( "S must be >= 0" );
+      error( "S must be >= 0" );
   all( any(S>0,2) ) || \
-      usage( "S must contain at least a value >0 for each row" );
+      error( "S must contain at least a value >0 for each row" );
   all( all( P >= 0 ) ) || \
-      usage( "V must be >=0" );
+      error( "V must be >=0" );
 
   U = R = Q = X = zeros(C,K);
 
@@ -288,42 +289,42 @@
   endif
 
   isvector(N) && all( N>=0 ) || \
-      usage( "N must be >=0" );
+      error( "N must be >=0" );
   N = N(:)'; # make N a row vector
   C = length(N); ## Number of classes
   K = columns(S); ## Number of service centers
   size(S) == [C,K] || \
-      usage( "S size mismatch" );
+      error( "S size mismatch" );
   size(V) == [C,K] || \
-      usage( "V size mismatch" );
+      error( "V size mismatch" );
 
   if ( nargin < 4 ) 
     m = ones(1,K);
   else
     isvector(m) || \
-        usage( "m must be a vector" );
+        error( "m must be a vector" );
     m = m(:)'; # make m a row vector
     length(m) == K || \
-        usage( "m size mismatch (should be %d, is %d)", K, length(m) );
+        error( "m size mismatch (should be %d, is %d)", K, length(m) );
   endif
 
   if ( nargin < 5 )
     Z = zeros(1,C);
   else
     isvector(Z) || \
-        usage( "Z must be a vector" );
+        error( "Z must be a vector" );
     Z = Z(:)'; # make Z a row vector
     length(Z) == C || \
-	usage( "Z size mismatch (should be %d, is %d)", C, length(Z) );
+	error( "Z size mismatch (should be %d, is %d)", C, length(Z) );
   endif
 
   ## Check consistency of parameters
   all( all( S >= 0 ) ) || \
-      usage( "S must be >= 0" );
+      error( "S must be >= 0" );
   all( any(S>0,2) ) || \
-      usage( "S must contain at least a value >0 for each row" );
+      error( "S must contain at least a value >0 for each row" );
   all( all( V >= 0 ) ) || \
-      usage( "V must be >=0" );
+      error( "V must be >=0" );
 
   ## ensure that the service times for multiserver nodes
   ## are class-independent
@@ -476,7 +477,7 @@
 %! S = [1 2 3; 1 2 3];
 %! N = [1 1];
 %! V = zeros(3,2,3);
-%! fail( "qnclosedmultimva(N,S,V)", "third parameter" );
+%! fail( "qnclosedmultimva(N,S,V)", "third argument" );
 
 ## Check degenerate case (population is zero); LI servers
 %!test

Modified: trunk/octave-forge/main/queueing/inst/qnclosedmultimvaapprox.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedmultimvaapprox.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedmultimvaapprox.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -139,33 +139,33 @@
   endif
 
   isvector(N) && all( N>=0 ) || \
-      usage( "N must be a vector of positive integers" );
+      error( "N must be a vector of positive integers" );
   N = N(:)'; # make N a row vector
   C = length(N); ## Number of classes
   K = columns(S); ## Number of service centers
   size(S) == [C,K] || \
-      usage( "S size mismatch" );
+      error( "S size mismatch" );
   size(V) == [C,K] || \
-      usage( "V size mismatch" );
+      error( "V size mismatch" );
 
   if ( nargin < 4 )
     m = ones(1,K);
   else
     isvector(m) || \
-	usage( "m must be a vector");
+	error( "m must be a vector");
     m = m(:)'; # make m a row vector
     ( length(m) == K && all( m <= 1 ) ) || \
-        usage( "m must be <= 1 and have %d elements", K );
+        error( "m must be <= 1 and have %d elements", K );
   endif
 
   if ( nargin < 5 )
     Z = zeros(1,C);
   else
     isvector(Z) || \
-	usage( "Z must be a vector" );
+	error( "Z must be a vector" );
     Z = Z(:)'; # make Z a row vector
     ( length(Z) == C && all(Z >= 0 ) ) || \
-	usage( "Z must be >= 0 and have %d elements", C );
+	error( "Z must be >= 0 and have %d elements", C );
   endif
 
   if ( nargin < 6 )
@@ -178,9 +178,9 @@
 
   ## Check consistency of parameters
   all( all( S >= 0 ) ) || \
-      usage( "S contains negative values" );
+      error( "S contains negative values" );
   all( all( V >= 0 ) ) || \
-      usage( "V contains negative values" );
+      error( "V contains negative values" );
 
   ## Initialize results
   R = zeros( C, K );

Modified: trunk/octave-forge/main/queueing/inst/qnclosedpb.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedpb.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedpb.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -62,14 +62,14 @@
     print_usage();
   endif
   ( isscalar(N) && N > 0 ) || \
-      usage( "N must be a positive integer" );
+      error( "N must be a positive integer" );
   ( isvector(D) && length(D)>0 && all( D >= 0 ) ) || \
-      usage( "D must be a vector of nonnegative floats" );
+      error( "D must be a vector of nonnegative floats" );
   if ( nargin < 3 )
     Z = 0;
   else
     ( isscalar(Z) && Z >= 0 ) || \
-        usage( "Z must be a nonnegative scalar" );
+        error( "Z must be a nonnegative scalar" );
   endif
   D_tot = sum(D);
   X_max = 1/max(D);

Modified: trunk/octave-forge/main/queueing/inst/qnclosedsinglemva.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedsinglemva.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedsinglemva.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -119,13 +119,13 @@
   endif
 
   isscalar(N) && N >= 0 || \
-      usage( "N must be >= 0" );
+      error( "N must be >= 0" );
   isvector(S) || \
-      usage( "S must be a vector" );
+      error( "S must be a vector" );
   S = S(:)'; # make S a row vector
 
   isvector(V) || \
-      usage( "V must be a vector" );
+      error( "V must be a vector" );
   V = V(:)'; # make V a row vector
 
   K = length(S); # Number of servers
@@ -134,23 +134,23 @@
     m = ones(1,K);
   else
     isvector(m) || \
-	usage( "m must be a vector" );
+	error( "m must be a vector" );
     m = m(:)'; # make m a row vector
   endif
 
   [err S V m] = common_size(S, V, m);
   (err == 0) || \
-      usage( "S, V and m are of incompatible size" );
+      error( "S, V and m are of incompatible size" );
   all(S>=0) || \
-      usage( "S must be a vector >= 0" );
+      error( "S must be a vector >= 0" );
   all(V>=0) || \
-      usage( "V must be a vector >= 0" );
+      error( "V must be a vector >= 0" );
 
   if ( nargin < 5 )
     Z = 0;
   else
     (isscalar(Z) && Z >= 0) || \
-        usage( "Z must be >= 0" );
+        error( "Z must be >= 0" );
   endif
 
   U = R = Q = X = zeros( 1, K );

Modified: trunk/octave-forge/main/queueing/inst/qnclosedsinglemvaapprox.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedsinglemvaapprox.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedsinglemvaapprox.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -117,11 +117,11 @@
   endif
 
   isscalar(N) && N >= 0 || \
-      usage( "N must be >= 0" );
+      error( "N must be >= 0" );
   isvector(S) || \
-      usage( "S must be a vector" );
+      error( "S must be a vector" );
   isvector(V) || \
-      usage( "V must be a vector" );
+      error( "V must be a vector" );
   S = S(:)'; # make S a row vector
   V = V(:)'; # make V a row vector
 
@@ -131,39 +131,39 @@
     m = ones(1,K);
   else
     isvector(m) || \
-	usage( "m must be a vector" );
+	error( "m must be a vector" );
     m = m(:)'; # make m a row vector
   endif
 
   [err S V m] = common_size(S, V, m);
   (err == 0) || \
-      usage( "S, V and m are of incompatible size" );
+      error( "S, V and m are of incompatible size" );
   all(S>=0) || \
-      usage( "S must be a vector >= 0" );
+      error( "S must be a vector >= 0" );
   all(V>=0) || \
-      usage( "V must be a vector >= 0" );
+      error( "V must be a vector >= 0" );
   all(m<=1) || \
-      usage( "Vector m must be <= 1 (this function supports IS and single-server nodes only)" );
+      error( "Vector m must be <= 1 (this function supports IS and single-server nodes only)" );
 
   if ( nargin < 5 )
     Z = 0;
   else
     (isscalar(Z) && Z >= 0) || \
-        usage( "Z must be >= 0" );
+        error( "Z must be >= 0" );
   endif
 
   if ( nargin < 6 )
     tol = 1e-5;
   else
     ( isscalar(tol) && tol>0 ) || \
-	usage("tol must be a positive scalar");
+	error("tol must be a positive scalar");
   endif
 
   if ( nargin < 7 )
     iter_max = 100;
   else
     ( isscalar(iter_max) && iter_max > 0 ) || \
-	usage("iter_max must be a positive integer");
+	error("iter_max must be a positive integer");
   endif
 
   U = R = Q = X = zeros( 1, K );

Modified: trunk/octave-forge/main/queueing/inst/qnclosedsinglemvald.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnclosedsinglemvald.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnclosedsinglemvald.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -89,21 +89,21 @@
   endif
 
   isvector(V) && all(V>=0) || \
-      usage( "V must be a vector >= 0" );
+      error( "V must be a vector >= 0" );
   V = V(:)'; # make V a row vector
   K = length(V); # Number of servers
   isscalar(N) && N >= 0 || \
-      usage( "N must be >= 0" );
+      error( "N must be >= 0" );
   ( ismatrix(S) && rows(S) == K && columns(S) >= N ) || \
-      usage( "S size mismatch: is %dx%d, should be %dx%d", rows(S), columns(S), K, N );
+      error( "S size mismatch: is %dx%d, should be %dx%d", rows(S), columns(S), K, N );
   all(all(S>=0)) || \
-      usage( "S must be >= 0" );
+      error( "S must be >= 0" );
 
   if ( nargin < 4 ) 
     Z = 0;
   else
     isscalar(Z) && Z>=0 || \
-        usage( "Z must be >= 0" );
+        error( "Z must be >= 0" );
   endif
 
   ## Initialize results

Modified: trunk/octave-forge/main/queueing/inst/qncmva.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qncmva.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qncmva.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -91,24 +91,24 @@
   endif
 
   isscalar(N) && N >= 0 || \
-      usage("N must be a positive scalar");
+      error("N must be a positive scalar");
 
   isvector(S) || \
-      usage("S must be a vector");
+      error("S must be a vector");
   S = S(:)'; # make S a row vector
   M = length(S)+1; # number of service centers (escluding the delay center)
   
   isvector(Sld) && length(Sld) == N && all(Sld>=0) || \
-      usage("Sld must be a vector with %d elements >= 0", N);
+      error("Sld must be a vector with %d elements >= 0", N);
   Sld = Sld(:)'; # Make Sld a row vector
 
   isvector(V) && length(V) == M && all(V>=0) || \
-      usage("V must be a vector with %d elements", M);
+      error("V must be a vector with %d elements", M);
   V = V(:)'; # Make V a row vector
 
   if ( nargin == 5 )
     isscalar(Z) && Z>=0 || \
-	usage("Z must be nonnegative");
+	error("Z must be nonnegative");
   else
     Z = 0;
   endif

Modified: trunk/octave-forge/main/queueing/inst/qnconvolution.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnconvolution.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnconvolution.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -94,25 +94,25 @@
   endif
 
   ( isscalar(N) && N>0 ) || \
-      usage( "K must be a positive scalar" );
+      error( "K must be a positive scalar" );
   K = N; # To be compliant with the reference, we use K to denote the population size
   ( isvector(S) && all(S >= 0) ) || \
-      usage( "S must be a vector of positive scalars" );
+      error( "S must be a vector of positive scalars" );
   S = S(:)'; # make S a row vector
   N = length(S); # Number of service centers
   ( isvector(V) && size_equal(V,S) ) || \
-      usage( "V must be a vector of the same length as S" );
+      error( "V must be a vector of the same length as S" );
   V = V(:)';
 
   if ( nargin < 4 )
     m = ones(1,N);
   else
     isvector(m) || \
-	usage( "m must be a vector" );
+	error( "m must be a vector" );
     m = m(:)';
     [err m S] = common_size(m, S);
     (err == 0) || \
-        usage( "m and S have incompatible size" );
+        error( "m and S have incompatible size" );
   endif
 
   ## First, we remember the indexes of IS nodes
@@ -208,7 +208,7 @@
 ## and accepts a vector as parameter j.
 function result = F(i,j,v,S,m)
   isscalar(i) || \
-      usage( "i must be a scalar" );
+      error( "i must be a scalar" );
   k_i = j;
   if ( m(i) == 1 )
     result = ( v(i)*S(i) ).^k_i;

Modified: trunk/octave-forge/main/queueing/inst/qnconvolutionld.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnconvolutionld.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnconvolutionld.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -93,17 +93,17 @@
   endif
 
   ( isscalar(N) && N>0 ) || \
-      usage( "N must be a positive scalar" );
+      error( "N must be a positive scalar" );
   K = N; # To be compliant with the reference, we denote K as the population size
   ( isvector(V) ) || \
-      usage( "V must be a vector" );
+      error( "V must be a vector" );
   V = V(:)'; # Make V a row vector
   N = length(V); # Number of service centers
   if ( isnumeric(S) ) 
     ( rows(S) == N && columns(S) == K) || \
-        usage( sprintf("S size mismatch: is %dx%d, should be %dx%d", rows(S), columns(S),K,N ) );
+        error( sprintf("S size mismatch: is %dx%d, should be %dx%d", rows(S), columns(S),K,N ) );
     all( all(S>=0) ) || \
-        usage( "S must be >=0" );
+        error( "S must be >=0" );
   endif
 
   ## Initialization

Modified: trunk/octave-forge/main/queueing/inst/qnjackson.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnjackson.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnjackson.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -24,9 +24,9 @@
 ## @cindex open network, single class
 ## @cindex Jackson network
 ##
-## With three or four input parameters, this function computes the
-## steady-state occupancy probabilities for a Jackson network. With five
-## input parameters, this function computes the steady-state probability
+## With three or four arguments, this function computes the steady-state
+## occupancy probabilities for a Jackson network. With five arguments,
+## this function computes the steady-state probability
 ## @code{@var{pi}(j)} that there are @code{@var{k}(j)} requests at
 ## service center @math{j}.
 ##
@@ -66,8 +66,8 @@
 ## @code{@var{m}(i)} is the number of servers at service center
 ## @math{i}. If @code{@var{m}(i) < 1}, service center @math{i} is an
 ## infinite-server node. Otherwise, it is a regular FCFS queueing center with
-## @code{@var{m}(i)} servers. If this parameter is omitted, default is
-## @code{@var{m}(i) = 1} for all @math{i}. If this parameter is a scalar,
+## @code{@var{m}(i)} servers. If this argument is omitted, default is
+## @code{@var{m}(i) = 1} for all @math{i}. If this argument is a scalar,
 ## it will be promoted to a vector with the same size as @var{lambda}.
 ## Otherwise, @var{m} must be a vector of length @math{N}.
 ##
@@ -116,18 +116,18 @@
     print_usage();
   endif
   ( isvector(lambda) && all(lambda>=0) ) || \
-      usage( "lambda must be a vector >= 0" );
+      error( "lambda must be a vector >= 0" );
   lambda=lambda(:)'; # make lambda a row vector
   N = length(lambda);
   isvector(S) || \
-      usage( "S must be a vector" );
+      error( "S must be a vector" );
   S = S(:)'; # make S a row vector
   size_equal(lambda,S) || \
-      usage( "lambda and S must of be of the same length" );
+      error( "lambda and S must of be of the same length" );
   all(S>0) || \
-      usage( "S must be >0" );
+      error( "S must be >0" );
   [N,N] == size(P) || \
-      usage(" P must be a matrix of size length(lambda) x length(lambda)" );  
+      error(" P must be a matrix of size length(lambda) x length(lambda)" );  
   all(all(P>=0)) && all(sum(P,2)<=1) || \
       error( "P is not a transition probability matrix" );
 
@@ -136,7 +136,7 @@
   else
     [errorcode, lambda, m] = common_size(lambda, m);
     ( isvector(m) && (errorcode==0) ) || \
-        usage("m and lambda must have the same length" );
+        error("m and lambda must have the same length" );
   endif
 
   ## Compute the arrival rates using the traffic equation:
@@ -153,9 +153,9 @@
   if ( nargin == 5 )
 
     ( isvector(k) && size_equal(lambda,k) ) || \
-        usage( "k must be a vector of the same size as lambda" );
+        error( "k must be a vector of the same size as lambda" );
     all(k>=0) || \
-        usage( "k must be nonnegative" );
+        error( "k must be nonnegative" );
 
     ## compute occupancy probability
     rho = l .* S ./ m;      

Modified: trunk/octave-forge/main/queueing/inst/qnmarkov.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmarkov.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmarkov.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -144,17 +144,17 @@
     print_usage();
   endif
 
-  isvector(S) || usage( "S must be a vector" );
+  isvector(S) || error( "S must be a vector" );
   K = length(S); # number of service centers
 
   if ( nargin < 5 )
     m = ones(1,K);
   else
-    size_equal(m,S) || usage( "m must have the same langth as S" );
+    size_equal(m,S) || error( "m must have the same langth as S" );
   endif
 
   ( [K,K] == size(P) && all( all(P>=0)) && all(sum(P,2) <= 1)) || \
-      usage( "P must be SxS and nonnegative" );
+      error( "P must be SxS and nonnegative" );
 
   if ( isscalar(x) )
     is_open = false;
@@ -167,7 +167,7 @@
     is_open = true;
     lambda = x; # open network
     size_equal(lambda, S ) || \
-        usage( "lambda must have the same langth as S" );
+        error( "lambda must have the same langth as S" );
   endif
 
   ( all(m > 0) && all(m <= C) ) || \

Modified: trunk/octave-forge/main/queueing/inst/qnmg1.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmg1.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmg1.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -79,7 +79,7 @@
    ## bring the parameters to a common size
    [ err lambda xavg x2nd ] = common_size( lambda, xavg, x2nd );
    if ( err ) 
-      usage( "parameters are of incompatible size" );
+      error( "parameters are of incompatible size" );
    endif
 
    mu = 1 ./ xavg;

Modified: trunk/octave-forge/main/queueing/inst/qnmh1.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmh1.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmh1.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -95,12 +95,12 @@
       print_usage();
    endif
    if ( size(mu) != size(alpha) )
-      usage( "parameters are of incompatible size" );
+      error( "parameters are of incompatible size" );
    endif
    [n c] = size(mu);
 
    if (!is_scalar(lambda) && (n != length(lambda)) ) 
-      usage( "parameters are of incompatible size" );
+      error( "parameters are of incompatible size" );
    endif
    for i=1:n
       avg  = sum( alpha(i,:) .* (1 ./ mu(i,:)) );

Modified: trunk/octave-forge/main/queueing/inst/qnmix.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmix.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmix.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -121,34 +121,34 @@
     print_usage();
   endif
   isvector(lambda) || \
-      usage( "lambda must be a vector" );
+      error( "lambda must be a vector" );
   lambda = lambda(:)';
   isvector(N) || \
-      usage( "N must be a vector" );
+      error( "N must be a vector" );
   N = N(:)';
   size_equal(lambda,N) || \
-      usage( "lambda and N must be of equal length" );
+      error( "lambda and N must be of equal length" );
   ( !any( lambda>0 & N>0 ) ) || \
-      usage("A class cannot be open and closed at the same time. Check lambda and N" );
+      error("A class cannot be open and closed at the same time. Check lambda and N" );
   ( all( lambda>0 | N>0 ) ) || \
-      usage( "A class cannot be neither open nor closed. Check lambda and N" );
+      error( "A class cannot be neither open nor closed. Check lambda and N" );
   size_equal(S,V) || \
-      usage( "S and V must have the same size" );
+      error( "S and V must have the same size" );
   C = length(lambda); # number of classes
   K = columns(S); # number of service centers
   rows(S) == C || \
-      usage( "S must have %d rows", C );
+      error( "S must have %d rows", C );
   if ( nargin < 5 ) 
     m = ones(1,K);
   else
     isvector( m ) || \
-        usage( "m must be a vector" );
+        error( "m must be a vector" );
     m = m(:)';
     size_equal(lambda,m) || \
-        usage( "lambda and m must be of equal length" );
+        error( "lambda and m must be of equal length" );
   endif
   all( m<=1 ) || \
-      usage( "This function supports single-server and delay centers only. Check m" );
+      error( "This function supports single-server and delay centers only. Check m" );
   if ( !any(lambda>0) ) 
     warning( "qnmix(): There are no open classes. Using qnclosedmultimva()" );
     [U R Q X] = qnclosedmultimva( N, S, V, m );

Modified: trunk/octave-forge/main/queueing/inst/qnmknode.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmknode.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmknode.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -99,12 +99,12 @@
 function Q = qnmknode( node, S, varargin )
 
   ischar(node) || \
-      usage( "Parameter \"node\" must be a string" );
+      error( "Parameter \"node\" must be a string" );
 
   node = tolower(node);
 
   isvector(S) || ismatrix(S) || \
-      usage( "Parameter \"S\" must be a vector" );
+      error( "Parameter \"S\" must be a vector" );
   m = 1;
   s2 = ones( size(S) );
   if ( strcmp(node, "m/m/m-fcfs") )
@@ -115,7 +115,7 @@
     if ( 3 == nargin )
       m = varargin{1};
       m>=1 || \
-	  usage( "m must be >=1" );
+	  error( "m must be >=1" );
     endif
   elseif ( strcmp(node, "m/m/1/k-fcfs") )
     ## M/M/1/k finite capacity node
@@ -125,7 +125,7 @@
     if ( 3 == nargin )
       k = varargin{1};
       k>=1 || \
-	  usage( "k must be >=1" );
+	  error( "k must be >=1" );
     endif
   elseif ( strcmp(node, "-/g/1-lcfs-pr") )
     ## -/G/1-LCFS-PR node
@@ -149,7 +149,7 @@
       s2 = varargin{1};
     endif
   else
-    usage( "Unknown node type \"%s\". node type must be one of \"m/m/m-fcfs\", \"-/g/1-lcfs-pr\", \"-/g/1-ps\" and \"-/g/inf\"", node );
+    error( "Unknown node type \"%s\". node type must be one of \"m/m/m-fcfs\", \"-/g/1-lcfs-pr\", \"-/g/1-ps\" and \"-/g/inf\"", node );
   endif
   Q = struct( "node", node, "m", m, "S", S, "s2", s2, "c", rows(S), "comment", "" );
 endfunction

Modified: trunk/octave-forge/main/queueing/inst/qnmm1.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmm1.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmm1.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -89,14 +89,14 @@
   ## bring the parameters to a common size
   [ err lambda mu ] = common_size( lambda, mu );
   if ( err ) 
-    usage( "parameters are of incompatible size" );
+    error( "parameters are of incompatible size" );
   endif
   ( isvector(lambda) && isvector(mu) ) || \
-      usage( "lambda and mu must be vectors" );
+      error( "lambda and mu must be vectors" );
   all( lambda > 0 ) || \
-      usage( "lambda must be >0" );
+      error( "lambda must be >0" );
   all( mu > lambda ) || \
-      usage( "The system is not ergodic" );
+      error( "The system is not ergodic" );
   U = rho = lambda ./ mu; # utilization
   p0 = 1-rho;
   Q = rho ./ (1-rho);

Modified: trunk/octave-forge/main/queueing/inst/qnmm1k.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmm1k.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmm1k.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -95,17 +95,17 @@
   endif
 
   ( isvector(lambda) && isvector(mu) && isvector(K) ) || \
-      usage( "lambda, mu, K must be vectors of the same size" );
+      error( "lambda, mu, K must be vectors of the same size" );
 
   [err lambda mu K] = common_size( lambda, mu, K );
   if ( err ) 
-    usage( "Parameters are not of common size" );
+    error( "Parameters are not of common size" );
   endif
 
   all( K>0 ) || \
-      usage( "K must be >0" );
+      error( "K must be >0" );
   ( all( lambda>0 ) && all( mu>0 ) ) || \
-      usage( "lambda and mu must be >0" );
+      error( "lambda and mu must be >0" );
 
   U = R = Q = X = p0 = pK = 0*lambda;
   a = lambda./mu;

Modified: trunk/octave-forge/main/queueing/inst/qnmminf.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmminf.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmminf.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -93,13 +93,13 @@
   [ err lambda mu ] = common_size( lambda, mu );
 
   if ( err ) 
-    usage( "Parameters are of incompatible size" );
+    error( "Parameters are of incompatible size" );
   endif
   
   ( isvector(lambda) && isvector(mu) ) || \
-      usage( "lambda and mu must be vectors" );
+      error( "lambda and mu must be vectors" );
   ( all( lambda>0 ) && all( mu>0 ) ) || \
-      usage( "lambda and mu must be >0" );
+      error( "lambda and mu must be >0" );
   U = Q = lambda ./ mu; # Traffic intensity.
   p0 = exp(-lambda./mu); # probability that there are 0 requests in the system
   R = 1 ./ mu;

Modified: trunk/octave-forge/main/queueing/inst/qnmmm.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmmm.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmmm.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -111,14 +111,14 @@
   endif
   [err lambda mu m] = common_size( lambda, mu, m );
   if ( err ) 
-    usage( "parameters are not of common size" );
+    error( "parameters are not of common size" );
   endif
 
   ( isvector(lambda) && isvector(mu) && isvector(m) ) || \
-      usage( "the parameters must be vectors" );
+      error( "the parameters must be vectors" );
   
   all( m>0 ) || \
-      usage( "m must be >0" );
+      error( "m must be >0" );
 
   all( lambda < m .* mu ) || \
       error( "Processing capacity exceeded" );

Modified: trunk/octave-forge/main/queueing/inst/qnmmmk.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmmmk.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmmmk.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -115,7 +115,7 @@
   endif
 
   ( isvector(lambda) && isvector(mu) && isvector(m) && isvector(K) ) || ...
-      usage( "lambda, mu, m, K must be vectors of the same size" );
+      error( "lambda, mu, m, K must be vectors of the same size" );
   lambda = lambda(:)'; # make lambda a row vector
   mu = mu(:)'; # make mu a row vector
   m = m(:)'; # make m a row vector
@@ -123,15 +123,15 @@
 
   [err lambda mu m K] = common_size( lambda, mu, m, K );
   if ( err ) 
-    usage( "Parameters are not of common size" );
+    error( "Parameters are not of common size" );
   endif
 
   all( K>0 ) || \
-      usage( "k must be strictly positive" );
+      error( "k must be strictly positive" );
   all( m>0 ) && all( m <= K ) || \
-      usage( "m must be in the range 1:k" );
+      error( "m must be in the range 1:k" );
   all( lambda>0 ) && all( mu>0 ) || \
-      usage( "lambda and mu must be >0" );
+      error( "lambda and mu must be >0" );
   U = R = Q = X = p0 = pK = 0*lambda;
   for i=1:length(lambda)
     ## Build and solve the birth-death process describing the M/M/m/k system

Modified: trunk/octave-forge/main/queueing/inst/qnmvablo.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnmvablo.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnmvablo.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -91,15 +91,15 @@
     print_usage();
   endif
   ( isscalar(K) && K > 0 ) || \
-      usage( "K must be a positive integer" );
+      error( "K must be a positive integer" );
   isvector(S) && all(S>0) || \
       error ("S must be a vector > 0");
   S = S(:)'; # make S a row vector
   N = length(S);
   ( isvector(M) && length(M) == N ) || \
-      usage( "M must be a vector with %d elements", N );
+      error( "M must be a vector with %d elements", N );
   all( M >= 1) || \
-      usage( "M must be >= 1");
+      error( "M must be >= 1");
   M = M(:)'; # make M a row vector
 
   (K < sum(M)) || \

Modified: trunk/octave-forge/main/queueing/inst/qnopenab.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnopenab.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnopenab.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -64,9 +64,9 @@
     print_usage();
   endif
   ( isscalar(lambda) && lambda > 0 ) || \
-      usage( "lambda must be a positive scalar" );
+      error( "lambda must be a positive scalar" );
   ( isvector(D) && length(D)>0 && all( D>=0 ) ) || \
-      usage( "D must be a vector of nonnegative scalars" );
+      error( "D must be a vector of nonnegative scalars" );
 
   X_upper = 1/max(D);
   R_lower = sum(D);

Modified: trunk/octave-forge/main/queueing/inst/qnopenbsb.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnopenbsb.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnopenbsb.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -65,9 +65,9 @@
     print_usage();
   endif
   ( isscalar(lambda) && lambda>0 ) || \
-      usage( "lambda must be a positive scalar" );
+      error( "lambda must be a positive scalar" );
   ( isvector(D) && length(D)>0 && all(D>=0) ) || \
-      usage( "D must be a vector of nonnegative floats" );
+      error( "D must be a vector of nonnegative floats" );
 
   D_max = max(D);
   D_tot = sum(D);

Modified: trunk/octave-forge/main/queueing/inst/qnopenmulti.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnopenmulti.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnopenmulti.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -92,24 +92,24 @@
     print_usage();
   endif
   isvector(lambda) && all(lambda > 0) || \
-      usage( "lambda must be a vector of positive floats" );
+      error( "lambda must be a vector of positive floats" );
   lambda = lambda(:)'; # make lambda a row vector
   C = length(lambda);
   K = columns(S);
   [C,K] == size(S) || \
-      usage( "rows(S) must be equal to length(lambda)" );
+      error( "rows(S) must be equal to length(lambda)" );
   all(all( S > 0 )) || \
-      usage( "S(c,k) must be > 0" );
+      error( "S(c,k) must be > 0" );
   [C,K] == size(V) || \
-      usage( "V must be a matrix of the same size as S" );
+      error( "V must be a matrix of the same size as S" );
   all( all(V>= 0) ) || \
-      usage( "V must be >= 0 " );
+      error( "V must be >= 0 " );
 
   if ( nargin < 4 )
     m = ones(1,K);
   else
     ( isvector( m ) && length(m) == K && all( m <= 1 ) ) || \
-        usage( "m must be less than or equal to ones(1,K)" );
+        error( "m must be less than or equal to ones(1,K)" );
     m = m(:)'; # make m a row vector
   endif
 

Modified: trunk/octave-forge/main/queueing/inst/qnopensingle.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnopensingle.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnopensingle.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -101,25 +101,25 @@
     print_usage();
   endif
   ( isscalar(lambda) && lambda>0 ) || \
-      usage( "lambda must be a positive number" );
+      error( "lambda must be a positive number" );
   lambda = lambda(:)';
   ( isvector( S ) && all(S>0) ) || \
-      usage( "S must be a vector >0" );
+      error( "S must be a vector >0" );
   S = S(:)';
   K = length(S);
   ( isvector( V ) && length(V)==K && all(V>=0) ) || \
-      usage( "V must be a vector >=0 and of the same length as S" );
+      error( "V must be a vector >=0 and of the same length as S" );
   V = V(:)';
 
   if ( nargin < 4 )
     m = ones(1,K);
   else
     (isvector(m) && (length(m) == K)) || \
-	usage( "m must be a vector of %d elements", K);
+	error( "m must be a vector of %d elements", K);
     m = m(:)';
     [err m] = common_size(m,S);
     ( err == 0 ) || \
-        usage( "m and S are not of common size" );
+        error( "m and S are not of common size" );
   endif
 
   ## Compute maximum processing capacity

Modified: trunk/octave-forge/main/queueing/inst/qnsolve.m
===================================================================
--- trunk/octave-forge/main/queueing/inst/qnsolve.m	2012-04-13 12:11:56 UTC (rev 10211)
+++ trunk/octave-forge/main/queueing/inst/qnsolve.m	2012-04-13 12:20:21 UTC (rev 10212)
@@ -106,7 +106,7 @@
   endif
 
   ischar(network_type) || \
-      usage("First parameter must be a string");
+      error("First parameter must be a string");
 
   network_type = tolower(network_type);
 
@@ -117,7 +117,7 @@
   elseif (strcmp(network_type, "mixed" ) )
     [U R Q X] = __qnsolve_mixed( varargin{:} );
   else
-    usage( "Invalid network type %s: must be one of \"open\", \"closed\" or \"mixed\"", network_type );
+    error( "Invalid network type %s: must be one of \"open\", \"closed\" or \"mixed\"", network_type );
   endif
 endfunction
 
@@ -140,26 +140,26 @@
   endif
 
   ( isscalar(lambda) && (lambda>0) ) || \
-      usage( "lambda must be a scalar > 0" );
+      error( "lambda must be a scalar > 0" );
   
   iscell(QQ) || \
-      usage( "QQ must be a cell array" );
+      error( "QQ must be a cell array" );
 
   N = length(QQ);
 
   ( isvector(V) && length(V) == N ) || \
-      usage( "V must be a vector of length %d", N );
+      error( "V must be a vector of length %d", N );
 
   V = V(:); # make V a row vector
   all(V>=0) || \
-      usage( "V must be >= 0" );
+      error( "V must be >= 0" );
 
   ## Initialize vectors
   S = zeros(size(V));
   m = ones(size(V));
   for i=1:N
     QQ{i}.c == 1 || \
-	usage( "Multiclass networks are not supported by this function" );
+	error( "Multiclass networks are not supported by this function" );
     S(i) = QQ{i}.S;
     if __is_li(QQ{i})
       ; # nothing to do
@@ -168,7 +168,7 @@
     elseif __is_is(QQ{i})
       m(i) = -1;
     else
-      usage( "Unsupported type \"%s\" for node %d", QQ{i}.node, i );
+      error( "Unsupported type \"%s\" for node %d", QQ{i}.node, i );
     endif
   endfor
 
@@ -184,29 +184,29 @@
     print_usage();
   endif
   isvector(lambda) && all(lambda > 0) || \
-      usage( "lambda must be a vector >0" );
+      error( "lambda must be a vector >0" );
   lambda = lambda(:)'; # make lambda a row vector
   iscell(QQ) || \
-      usage( "QQ must be a cell array" );
+      error( "QQ must be a cell array" );
   C = length(lambda);
   K = length(QQ);
   [C,K] == size(V) || \
-      usage( "V size mismatch" );
+      error( "V size mismatch" );
   all( all( V>= 0 ) ) || \
-      usage( "V must be >= 0 " );
+      error( "V must be >= 0 " );
 
   S = zeros(C,K);
   m = ones(1,K);
   for i=1:K
     QQ{i}.c == C || \
-	usage( "Wrong number of classes for center %d (is %d, should be %d)", i, QQ{i}.c, C );
+	error( "Wrong number of classes for center %d (is %d, should be %d)", i, QQ{i}.c, C );
     S(:,i) = QQ{i}.S(:);
     if __is_li(QQ{i})
       ; # nothing to do
     elseif __is_is(QQ{i})
       m(i) = -1;
     else
-      usage( "Unsupported type \"%s\" for node %d", QQ{i}.node, i );
+      error( "Unsupported type \"%s\" for node %d", QQ{i}.node, i );
     endif  
   endfor
 
@@ -231,32 +231,32 @@
 function [U R Q X] = __qnsolve_closed_single( N, QQ, V, Z )
 
   if ( nargin < 3 || nargin > 4 )
-    usage();
+    error();
   endif
 
   isscalar(N) || \
-      usage( "Multiclass networks are not supported by this function" );
+      error( "Multiclass networks are not supported by this function" );
 
   iscell(QQ) || \
-      usage( "QQ must be a cell array" );
+      error( "QQ must be a cell array" );
 
   if ( nargin < 4 ) 
     Z = 0;
   else
     isscalar(Z) && Z >= 0 || \
-        usage( "Z must be >= 0" );
+        error( "Z must be >= 0" );
   endif
 
   K = length(QQ);
   
   ( isvector(V) && length(V) == K ) || \
-      usage( "V must be a vector of length %d", K );
+      error( "V must be a vector of length %d", K );
 
   ## Initialize vectors
   i_single = i_multi = i_delay = i_ld = [];
   for i=1:K
     ( QQ{i}.c == 1 ) || \
-	usage( "Multiclass networks are not supported by this function" );
+	error( "Multiclass networks are not supported by this function" );
     if __is_li(QQ{i})
       i_single = [i_single i];
     elseif __is_multi(QQ{i})
@@ -266,7 +266,7 @@
     elseif __is_ld(QQ{i})
       i_ld = [i_ld i];
     else
-      usage( "Unsupported type \"%s\" for node %d", QQ{i}.node, i );
+      error( "Unsupported type \"%s\" for node %d", QQ{i}.node, i );
     endif
   endfor
   p = cell( 1, K );
@@ -365,48 +365,48 @@
   endif
 
   isvector(N) && all( N>0 ) || \
-      usage( "N must be >0" );
+      error( "N must be >0" );
 
   iscell(QQ) || \
-      usage( "QQ must be a cell array" );
+      error( "QQ must be a cell array" );
 
   C = length(N); ## Number of classes
   K = length(QQ); ## Number of service centers
   size(V) == [C,K] || \
-      usage( "V size mismatch" );
+      error( "V size mismatch" );
 
   if ( nargin < 4 )
     Z = zeros(1,C);
   else
     isvector(Z) && length(Z) == C || \
-	usage( "Z size mismatch" );
+	error( "Z size mismatch" );
   endif
 
   ## Check consistence of parameters
   all( all( V >= 0 ) ) || \
-      usage( "V must be >=0" );
+      error( "V must be >=0" );
 
   ## Initialize vectors
   i_single = i_multi = i_delay = i_ld = [...
 
[truncated message content]

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

From: <car...@us...> - 2012-04-13 12:12:08

Revision: 10211
          http://octave.svn.sourceforge.net/octave/?rev=10211&view=rev
Author:   carandraug
Date:     2012-04-13 12:11:56 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
maint: reverting r10155 to Laurent Mazet old e-mail address <ma...@cr...>. It is still invalid but <lau...@ma...> is not the same person

Revision Links:
--------------
    http://octave.svn.sourceforge.net/octave/?rev=10155&view=rev

Modified Paths:
--------------
    trunk/octave-forge/AUTHORS
    trunk/octave-forge/admin/qhull.spec
    trunk/octave-forge/extra/Windows/src/grab.cc
    trunk/octave-forge/extra/graceplot/inst/alternatives/print.m
    trunk/octave-forge/main/io/inst/xmlwrite.m
    trunk/octave-forge/main/io/src/cell2csv.cc
    trunk/octave-forge/main/io/src/csv2cell.cc
    trunk/octave-forge/main/io/src/csvconcat.cc
    trunk/octave-forge/main/io/src/csvexplode.cc
    trunk/octave-forge/main/io/src/xmlread.cc
    trunk/octave-forge/main/io/src/xmltree.c
    trunk/octave-forge/main/io/src/xmltree.h
    trunk/octave-forge/main/io/src/xmltree_read.act
    trunk/octave-forge/main/io/src/xmltree_read.h
    trunk/octave-forge/main/plot/inst/dxfwrite.m
    trunk/octave-forge/main/signal/inst/tukeywin.m

Modified: trunk/octave-forge/AUTHORS
===================================================================
--- trunk/octave-forge/AUTHORS	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/AUTHORS	2012-04-13 12:11:56 UTC (rev 10211)
@@ -87,7 +87,7 @@
 Kai P. Mueller              <mu...@if...>
 Kurt Hornik                 <Kur...@wu...>
 Lance Norskog And Sundry Contributors
-Laurent Mazet               <lau...@ma...>
+Laurent Mazet               <ma...@cr...>
 Leopoldo Cerbaro            <red...@li...>
 Levente Torok / Tor...@gm...
 Luca Citi                   

Modified: trunk/octave-forge/admin/qhull.spec
===================================================================
--- trunk/octave-forge/admin/qhull.spec	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/admin/qhull.spec	2012-04-13 12:11:56 UTC (rev 10211)
@@ -80,13 +80,13 @@
 %_mandir/*
 
 %changelog
-* Wed Jun 16 2004 Laurent Mazet <lau...@ma...> 2003.1-1mdk
+* Wed Jun 16 2004 Laurent Mazet <ma...@cr...> 2003.1-1mdk
 - Update to qhull new version
 
-* Thu Sep 05 2002 Laurent Mazet <lau...@ma...> 2002.1-1mdk
+* Thu Sep 05 2002 Laurent Mazet <ma...@cr...> 2002.1-1mdk
 - Update to qhull new version
 
-* Thu May 30 2002 Laurent Mazet <lau...@ma...> 3.1-1mdk
+* Thu May 30 2002 Laurent Mazet <ma...@cr...> 3.1-1mdk
 - First package
 
 # end of file

Modified: trunk/octave-forge/extra/Windows/src/grab.cc
===================================================================
--- trunk/octave-forge/extra/Windows/src/grab.cc	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/extra/Windows/src/grab.cc	2012-04-13 12:11:56 UTC (rev 10211)
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copyright (C) 2001 Laurent Mazet <lau...@ma...>
+ * Copyright (C) 2001 Laurent Mazet <ma...@cr...>
  *
  * Fix error handler to avoid octave core-dump.
  * Change to avoid the input limit.

Modified: trunk/octave-forge/extra/graceplot/inst/alternatives/print.m
===================================================================
--- trunk/octave-forge/extra/graceplot/inst/alternatives/print.m	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/extra/graceplot/inst/alternatives/print.m	2012-04-13 12:11:56 UTC (rev 10211)
@@ -77,7 +77,7 @@
 ##
 
 ## Author: Daniel Heiserer <Dan...@ph...>
-## 2001-03-23  Laurent Mazet <lau...@ma...>
+## 2001-03-23  Laurent Mazet <ma...@cr...>
 ##     * simplified interface: guess the device from the extension
 ##     * font support
 ## 2001-03-25  Paul Kienzle <pki...@us...>
@@ -85,7 +85,7 @@
 ##     * use tmpnam to generate temporary name
 ##     * move "set term" before "set output" as required by gnuplot
 ##     * more options, and flexible options
-## 2001-03-29  Laurent Mazet <lau...@ma...>
+## 2001-03-29  Laurent Mazet <ma...@cr...>
 ##     * add solid and dashed options
 ##     * change PBMplus device
 ##     * add Corel device
@@ -95,7 +95,7 @@
 ##     * create a .ps for printing (avoid some filtering problems).
 ##     * default printing is mono, default convert is color.
 ##     * add font size support.
-## 2001-03-30  Laurent Mazet <lau...@ma...>
+## 2001-03-30  Laurent Mazet <ma...@cr...>
 ##     * correct correl into corel
 ##     * delete a irrelevant test
 ##     * check for convert before choosing the ouput device

Modified: trunk/octave-forge/main/io/inst/xmlwrite.m
===================================================================
--- trunk/octave-forge/main/io/inst/xmlwrite.m	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/inst/xmlwrite.m	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-## Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+## Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 ##
 ## 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/io/src/cell2csv.cc
===================================================================
--- trunk/octave-forge/main/io/src/cell2csv.cc	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/cell2csv.cc	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/io/src/csv2cell.cc
===================================================================
--- trunk/octave-forge/main/io/src/csv2cell.cc	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/csv2cell.cc	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/io/src/csvconcat.cc
===================================================================
--- trunk/octave-forge/main/io/src/csvconcat.cc	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/csvconcat.cc	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/io/src/csvexplode.cc
===================================================================
--- trunk/octave-forge/main/io/src/csvexplode.cc	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/csvexplode.cc	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/io/src/xmlread.cc
===================================================================
--- trunk/octave-forge/main/io/src/xmlread.cc	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/xmlread.cc	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/io/src/xmltree.c
===================================================================
--- trunk/octave-forge/main/io/src/xmltree.c	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/xmltree.c	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/io/src/xmltree.h
===================================================================
--- trunk/octave-forge/main/io/src/xmltree.h	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/xmltree.h	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/io/src/xmltree_read.act
===================================================================
--- trunk/octave-forge/main/io/src/xmltree_read.act	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/xmltree_read.act	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,6 +1,6 @@
 <!-- -*- XML -*- -->
 <!--
-  Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+  Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 
   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/io/src/xmltree_read.h
===================================================================
--- trunk/octave-forge/main/io/src/xmltree_read.h	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/io/src/xmltree_read.h	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+// Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 //
 // 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/plot/inst/dxfwrite.m
===================================================================
--- trunk/octave-forge/main/plot/inst/dxfwrite.m	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/plot/inst/dxfwrite.m	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,5 +1,5 @@
 ## Copyright (C) 2004 Patrick Labbe
-## Copyright (C) 2004 Laurent Mazet <lau...@ma...>
+## Copyright (C) 2004 Laurent Mazet <ma...@cr...>
 ## Copyright (C) 2005 Larry Doolittle <ldo...@re...>
 ##
 ## This program is free software; you can redistribute it and/or modify

Modified: trunk/octave-forge/main/signal/inst/tukeywin.m
===================================================================
--- trunk/octave-forge/main/signal/inst/tukeywin.m	2012-04-13 11:15:28 UTC (rev 10210)
+++ trunk/octave-forge/main/signal/inst/tukeywin.m	2012-04-13 12:11:56 UTC (rev 10211)
@@ -1,4 +1,4 @@
-## Copyright (C) 2007 Laurent Mazet <lau...@ma...>
+## Copyright (C) 2007 Laurent Mazet <ma...@cr...>
 ##
 ## 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

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

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

From: <car...@us...> - 2012-04-13 11:15:41

Revision: 10210
          http://octave.svn.sourceforge.net/octave/?rev=10210&view=rev
Author:   carandraug
Date:     2012-04-13 11:15:28 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
maint: update e-mail address of Etienne Grossmann

Modified Paths:
--------------
    trunk/octave-forge/main/image/inst/bwborder.m
    trunk/octave-forge/main/linear-algebra/inst/rotparams.m
    trunk/octave-forge/main/linear-algebra/inst/rotv.m
    trunk/octave-forge/main/miscellaneous/inst/nze.m
    trunk/octave-forge/main/optim/inst/d2_min.m
    trunk/octave-forge/main/optim/inst/nelder_mead_min.m
    trunk/octave-forge/main/optim/inst/test_d2_min_1.m
    trunk/octave-forge/main/optim/inst/test_d2_min_2.m
    trunk/octave-forge/main/optim/inst/test_d2_min_3.m
    trunk/octave-forge/main/optim/inst/test_fminunc_1.m
    trunk/octave-forge/main/optim/inst/test_min_1.m
    trunk/octave-forge/main/optim/inst/test_min_2.m
    trunk/octave-forge/main/optim/inst/test_min_3.m
    trunk/octave-forge/main/optim/inst/test_min_4.m
    trunk/octave-forge/main/optim/inst/test_minimize_1.m
    trunk/octave-forge/main/optim/inst/test_nelder_mead_min_1.m
    trunk/octave-forge/main/optim/inst/test_nelder_mead_min_2.m
    trunk/octave-forge/main/struct/DESCRIPTION
    trunk/octave-forge/main/struct/inst/getfields.m
    trunk/octave-forge/main/struct/inst/setfields.m
    trunk/octave-forge/main/struct/inst/tars.m
    trunk/octave-forge/main/struct/inst/test_struct.m
    trunk/octave-forge/main/vrml/DESCRIPTION
    trunk/octave-forge/main/vrml/inst/best_dir.m
    trunk/octave-forge/main/vrml/inst/best_dir_cov.m
    trunk/octave-forge/main/vrml/inst/bound_convex.m
    trunk/octave-forge/main/vrml/inst/checker_color.m
    trunk/octave-forge/main/vrml/inst/proplan.m
    trunk/octave-forge/main/vrml/inst/save_vrml.m
    trunk/octave-forge/main/vrml/inst/test_moving_surf.m
    trunk/octave-forge/main/vrml/inst/test_vmesh.m
    trunk/octave-forge/main/vrml/inst/test_vrml_faces.m
    trunk/octave-forge/main/vrml/inst/vmesh.m
    trunk/octave-forge/main/vrml/inst/vrml_Background.m
    trunk/octave-forge/main/vrml/inst/vrml_Box.m
    trunk/octave-forge/main/vrml/inst/vrml_DirectionalLight.m
    trunk/octave-forge/main/vrml/inst/vrml_PointLight.m
    trunk/octave-forge/main/vrml/inst/vrml_ROUTE.m
    trunk/octave-forge/main/vrml/inst/vrml_Sphere.m
    trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m
    trunk/octave-forge/main/vrml/inst/vrml_Viewpoint.m
    trunk/octave-forge/main/vrml/inst/vrml_anim.m
    trunk/octave-forge/main/vrml/inst/vrml_arrow.m
    trunk/octave-forge/main/vrml/inst/vrml_browse.m
    trunk/octave-forge/main/vrml/inst/vrml_cyl.m
    trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_1.m
    trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_2.m
    trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_3.m
    trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_4.m
    trunk/octave-forge/main/vrml/inst/vrml_ellipsoid.m
    trunk/octave-forge/main/vrml/inst/vrml_faces.m
    trunk/octave-forge/main/vrml/inst/vrml_flatten.m
    trunk/octave-forge/main/vrml/inst/vrml_frame.m
    trunk/octave-forge/main/vrml/inst/vrml_group.m
    trunk/octave-forge/main/vrml/inst/vrml_interp.m
    trunk/octave-forge/main/vrml/inst/vrml_kill.m
    trunk/octave-forge/main/vrml/inst/vrml_lines.m
    trunk/octave-forge/main/vrml/inst/vrml_material.m
    trunk/octave-forge/main/vrml/inst/vrml_newname.m
    trunk/octave-forge/main/vrml/inst/vrml_parallelepiped.m
    trunk/octave-forge/main/vrml/inst/vrml_parallelogram.m
    trunk/octave-forge/main/vrml/inst/vrml_points.m
    trunk/octave-forge/main/vrml/inst/vrml_surf.m
    trunk/octave-forge/main/vrml/inst/vrml_text.m
    trunk/octave-forge/main/vrml/inst/vrml_thick_surf.m
    trunk/octave-forge/main/vrml/inst/vrml_transfo.m

Modified: trunk/octave-forge/main/image/inst/bwborder.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwborder.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/image/inst/bwborder.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -23,7 +23,7 @@
 ## neighbor that is not set.
 ## @end deftypefn
 
-## Author:        Etienne Grossmann <et...@cs...>
+## Author:        Etienne Grossmann <et...@is...>
 ## Last modified: January 2000
 
 function b = bwborder(im)

Modified: trunk/octave-forge/main/linear-algebra/inst/rotparams.m
===================================================================
--- trunk/octave-forge/main/linear-algebra/inst/rotparams.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/linear-algebra/inst/rotparams.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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

Modified: trunk/octave-forge/main/linear-algebra/inst/rotv.m
===================================================================
--- trunk/octave-forge/main/linear-algebra/inst/rotv.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/linear-algebra/inst/rotv.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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

Modified: trunk/octave-forge/main/miscellaneous/inst/nze.m
===================================================================
--- trunk/octave-forge/main/miscellaneous/inst/nze.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/miscellaneous/inst/nze.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -19,7 +19,7 @@
 ## Optionally, returns also linear indices.
 ## @end deftypefn
 
-## Author:        Etienne Grossmann <et...@cs...>
+## Author:        Etienne Grossmann <et...@is...>
 ## Author:        Jaroslav Hajek <hi...@gm...>
 
 function [y, f] = nze (x)

Modified: trunk/octave-forge/main/optim/inst/d2_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/d2_min.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/d2_min.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/nelder_mead_min.m
===================================================================
--- trunk/octave-forge/main/optim/inst/nelder_mead_min.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/nelder_mead_min.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002-2008 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002-2008 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_d2_min_1.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_d2_min_1.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_d2_min_1.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_d2_min_2.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_d2_min_2.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_d2_min_2.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_d2_min_3.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_d2_min_3.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_d2_min_3.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_fminunc_1.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_fminunc_1.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_fminunc_1.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_min_1.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_min_1.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_min_1.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ## Copyright (C) 2004 Michael Creel <mic...@ua...>
 ##
 ## This program is free software; you can redistribute it and/or modify it under

Modified: trunk/octave-forge/main/optim/inst/test_min_2.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_min_2.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_min_2.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ## Copyright (C) 2004 Michael Creel <mic...@ua...>
 ##
 ## This program is free software; you can redistribute it and/or modify it under

Modified: trunk/octave-forge/main/optim/inst/test_min_3.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_min_3.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_min_3.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ## Copyright (C) 2004 Michael Creel <mic...@ua...>
 ##
 ## This program is free software; you can redistribute it and/or modify it under

Modified: trunk/octave-forge/main/optim/inst/test_min_4.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_min_4.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_min_4.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_minimize_1.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_minimize_1.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_minimize_1.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_nelder_mead_min_1.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_nelder_mead_min_1.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_nelder_mead_min_1.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/optim/inst/test_nelder_mead_min_2.m
===================================================================
--- trunk/octave-forge/main/optim/inst/test_nelder_mead_min_2.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/optim/inst/test_nelder_mead_min_2.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/struct/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/struct/DESCRIPTION	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/struct/DESCRIPTION	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,7 +1,7 @@
 Name: Struct
 Version: 1.0.10
 Date: 2012-03-25
-Author: Etienne Grossmann <et...@cs...>, Olaf Till <i7...@t-...>
+Author: Etienne Grossmann <et...@is...>, Olaf Till <i7...@t-...>
 Maintainer: Olaf Till <i7...@t-...>
 Title: Structure Handling.
 Description: Additional Structure manipulations functions.

Modified: trunk/octave-forge/main/struct/inst/getfields.m
===================================================================
--- trunk/octave-forge/main/struct/inst/getfields.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/struct/inst/getfields.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2000 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2000 Etienne Grossmann <et...@is...>
 ## Copyright (C) 2012 Olaf Till <i7...@t-...>
 ##
 ## This program is free software; you can redistribute it and/or modify it under

Modified: trunk/octave-forge/main/struct/inst/setfields.m
===================================================================
--- trunk/octave-forge/main/struct/inst/setfields.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/struct/inst/setfields.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2000 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2000 Etienne Grossmann <et...@is...>
 ## Copyright (C) 2000 Paul Kienzle <pki...@us...>
 ## Copyright (C) 2012 Olaf Till <i7...@t-...>
 ##

Modified: trunk/octave-forge/main/struct/inst/tars.m
===================================================================
--- trunk/octave-forge/main/struct/inst/tars.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/struct/inst/tars.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2000 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2000 Etienne Grossmann <et...@is...>
 ## Copyright (C) 2012 Olaf Till <i7...@t-...>
 ##
 ## This program is free software; you can redistribute it and/or modify it under

Modified: trunk/octave-forge/main/struct/inst/test_struct.m
===================================================================
--- trunk/octave-forge/main/struct/inst/test_struct.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/struct/inst/test_struct.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2000 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2000 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/vrml/DESCRIPTION	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/DESCRIPTION	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,8 +1,8 @@
 Name: Vrml
 Version: 1.0.12
 Date: 2010-04-11
-Author: Etienne Grossmann <et...@cs...>
-Maintainer: Etienne Grossmann <et...@cs...>
+Author: Etienne Grossmann <et...@is...>
+Maintainer: Etienne Grossmann <et...@is...>
 Title: VRML.
 Description: 3D graphics using VRML
 Depends: octave (>= 2.9.7), miscellaneous, struct, statistics

Modified: trunk/octave-forge/main/vrml/inst/best_dir.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/best_dir.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/best_dir.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/best_dir_cov.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/best_dir_cov.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/best_dir_cov.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/bound_convex.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/bound_convex.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/bound_convex.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/checker_color.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/checker_color.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/checker_color.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2010 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/proplan.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/proplan.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/proplan.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/save_vrml.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/save_vrml.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/save_vrml.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/test_moving_surf.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/test_moving_surf.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/test_moving_surf.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2005 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/test_vmesh.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/test_vmesh.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/test_vmesh.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/test_vrml_faces.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/test_vrml_faces.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/test_vrml_faces.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vmesh.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vmesh.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vmesh.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002-2009 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002-2009 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_Background.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_Background.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_Background.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_Box.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_Box.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_Box.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2010 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_DirectionalLight.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_DirectionalLight.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_DirectionalLight.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2005 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_PointLight.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_PointLight.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_PointLight.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_ROUTE.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_ROUTE.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_ROUTE.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2005 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_Sphere.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_Sphere.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_Sphere.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2010 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_TimeSensor.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_TimeSensor.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2005 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_Viewpoint.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_Viewpoint.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_Viewpoint.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2010 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2010 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_anim.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_anim.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_anim.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2005 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_arrow.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_arrow.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_arrow.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_browse.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_browse.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_browse.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_cyl.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_cyl.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_cyl.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_demo_tutorial_1.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_1.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_1.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002-2009 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002-2009 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_demo_tutorial_2.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_2.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_2.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_demo_tutorial_3.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_3.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_3.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_demo_tutorial_4.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_4.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_demo_tutorial_4.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002-2009 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002-2009 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_ellipsoid.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_ellipsoid.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_ellipsoid.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_faces.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_faces.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_faces.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_flatten.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_flatten.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_flatten.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_frame.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_group.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_group.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_group.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_interp.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_interp.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_interp.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2005 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_kill.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_kill.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_kill.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_lines.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_lines.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_lines.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_material.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_material.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_material.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_newname.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_newname.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_newname.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2005 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2005 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_parallelepiped.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_parallelepiped.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_parallelepiped.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2007-2010 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2007-2010 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_parallelogram.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_parallelogram.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_parallelogram.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2003 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2003 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_points.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_points.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_points.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_surf.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_surf.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_surf.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002-2009 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002-2009 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_text.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_text.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_text.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_thick_surf.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_thick_surf.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_thick_surf.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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/vrml/inst/vrml_transfo.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_transfo.m	2012-04-13 10:40:59 UTC (rev 10209)
+++ trunk/octave-forge/main/vrml/inst/vrml_transfo.m	2012-04-13 11:15:28 UTC (rev 10210)
@@ -1,4 +1,4 @@
-## Copyright (C) 2002 Etienne Grossmann <et...@cs...>
+## Copyright (C) 2002 Etienne Grossmann <et...@is...>
 ##
 ## 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

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

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

From: <jgp...@us...> - 2012-04-13 10:41:13

Revision: 10209
          http://octave.svn.sourceforge.net/octave/?rev=10209&view=rev
Author:   jgpallero
Date:     2012-04-13 10:40:59 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
OctPROJ updated to version 1.1.0

Modified Paths:
--------------
    trunk/octave-forge/main/octproj/ChangeLog
    trunk/octave-forge/main/octproj/DESCRIPTION
    trunk/octave-forge/main/octproj/doc/octproj.pdf
    trunk/octave-forge/main/octproj/doc/octproj.tex
    trunk/octave-forge/main/octproj/src/projwrap.c
    trunk/octave-forge/main/octproj/src/projwrap.h

Modified: trunk/octave-forge/main/octproj/ChangeLog
===================================================================
--- trunk/octave-forge/main/octproj/ChangeLog	2012-04-13 10:06:29 UTC (rev 10208)
+++ trunk/octave-forge/main/octproj/ChangeLog	2012-04-13 10:40:59 UTC (rev 10209)
@@ -1,3 +1,28 @@
+2012-04-13  José Luis García Pallero  <jgp...@gm...>
+
+	* .hgtags:
+	Version 1.1.0
+	[12956dd625ba] [tip]
+
+	* src/projwrap.c:
+	Fix bug with return of pj_transform (this bug was introduced in the
+	previous commit)
+	[37daef7c6a9f] [OctPROJ-1.1.0]
+
+	* DESCRIPTION:
+	Change DESCRIPTION file for the new version
+	[be913864a259]
+
+	* doc/octproj.pdf, doc/octproj.tex:
+	Put the date of different releases in the reference manual
+	[b08517c90fe3]
+
+	* src/projwrap.c, src/projwrap.h:
+	Changes for working with PROJ >= 4.8.0: include proj_api.h instead
+	of projects.h and change detection for inverse step in projections.
+	Remains backward compatible until PROJ 4.5.0
+	[b102562a313b]
+
 2011-05-13  José Luis García Pallero  <jgp...@gm...>
 
 	* .hgtags:
@@ -2,3 +27,3 @@
 	version 1.0.2
-	[9f5db47ce5c1] [tip]
+	[9f5db47ce5c1]
 

Modified: trunk/octave-forge/main/octproj/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/octproj/DESCRIPTION	2012-04-13 10:06:29 UTC (rev 10208)
+++ trunk/octave-forge/main/octproj/DESCRIPTION	2012-04-13 10:40:59 UTC (rev 10209)
@@ -1,8 +1,8 @@
 Name: OctPROJ
-Version: 1.0.2
-Date: 2011-05-13
-Author: José Luis García Pallero <jgp...@gm...>
-Maintainer: José Luis García Pallero <jgp...@gm...>
+Version: 1.1.0
+Date: 2012-04-13
+Author: José Luis García Pallero, <jgp...@gm...>
+Maintainer: José Luis García Pallero, <jgp...@gm...>
 Title: GNU Octave bindings to PROJ.4
 Description: This package allows to call functions of PROJ.4 library for
  cartographic projections transformations.
@@ -10,4 +10,4 @@
 Url: http://trac.osgeo.org/proj/ http://octave.sourceforge.net/index.html
 Autoload: yes
 License: GPL version 3 or later (PROJ.4 is under MIT license)
-SystemRequirements: libproj-dev (>= 4.7.0) (Debian system)
+SystemRequirements: libproj-dev (>= 4.5.0) (Debian system)

Modified: trunk/octave-forge/main/octproj/doc/octproj.pdf
===================================================================
--- trunk/octave-forge/main/octproj/doc/octproj.pdf	2012-04-13 10:06:29 UTC (rev 10208)
+++ trunk/octave-forge/main/octproj/doc/octproj.pdf	2012-04-13 10:40:59 UTC (rev 10209)
@@ -1,200 +1,29 @@
-%PDF-1.4
+%PDF-1.5
 %\xD0\xD4\xC5\xD8
-1 0 obj
-<< /S /GoTo /D (section.1) >>
-endobj
-4 0 obj
-(Overview)
-endobj
-5 0 obj
-<< /S /GoTo /D (section.2) >>
-endobj
-8 0 obj
-(Installation)
-endobj
-9 0 obj
-<< /S /GoTo /D (section.3) >>
-endobj
-12 0 obj
-(Kernel wrapper)
-endobj
-13 0 obj
-<< /S /GoTo /D (subsection.3.1) >>
-endobj
-16 0 obj
-(Error handling)
-endobj
-17 0 obj
-<< /S /GoTo /D (section.4) >>
-endobj
-20 0 obj
-(GNU Octave functions)
-endobj
-21 0 obj
-<< /S /GoTo /D (subsection.4.1) >>
-endobj
-24 0 obj
-(*.oct functions)
-endobj
-25 0 obj
-<< /S /GoTo /D (subsection.4.2) >>
-endobj
-28 0 obj
-(*.m functions)
-endobj
-29 0 obj
-<< /S /GoTo /D (subsection.4.3) >>
-endobj
-32 0 obj
-(Error handling)
-endobj
-33 0 obj
-<< /S /GoTo /D (section.5) >>
-endobj
-36 0 obj
-(Examples)
-endobj
-37 0 obj
-<< /S /GoTo /D (subsection.5.1) >>
-endobj
-40 0 obj
-(Geodetic to geocentric and vice versa)
-endobj
-41 0 obj
-<< /S /GoTo /D (subsection.5.2) >>
-endobj
-44 0 obj
-(Forward and inverse projection)
-endobj
-45 0 obj
-<< /S /GoTo /D (subsection.5.3) >>
-endobj
-48 0 obj
-(Forward and inverse projection: op\137transform)
-endobj
-49 0 obj
-<< /S /GoTo /D (subsubsection.5.3.1) >>
-endobj
-52 0 obj
-(With altitude)
-endobj
-53 0 obj
-<< /S /GoTo /D (subsubsection.5.3.2) >>
-endobj
-56 0 obj
-(Without altitude)
-endobj
-57 0 obj
-<< /S /GoTo /D (subsection.5.4) >>
-endobj
-60 0 obj
-(Error due to an erroneous parameter)
-endobj
-61 0 obj
-<< /S /GoTo /D (subsection.5.5) >>
-endobj
-64 0 obj
-(Error due to latitude too big)
-endobj
-65 0 obj
-<< /S /GoTo /D (section*.2) >>
-endobj
-68 0 obj
-(References)
-endobj
-69 0 obj
-<< /S /GoTo /D [70 0 R  /Fit ] >>
-endobj
-78 0 obj <<
-/Length 2229      
+79 0 obj <<
+/Length 2325      
 /Filter /FlateDecode
 >>
 stream
-xڥX[sܶ~ׯ\xE0#\xB7\xD1B\xB8\xFDЩ\xAA\xD6{\x92\xDAI\x94\xE9d\x9C<p\xB9Њ֒\xDC\xF2"Y\xFD\xF5=\xE4\x92\xDAU\x9DNG3Z88

[Octave-cvsupdate] SF.net SVN: octave:[10208] trunk/octave-forge/main/vrml/NEWS

From: <car...@us...> - 2012-04-13 10:06:41

Revision: 10208
          http://octave.svn.sourceforge.net/octave/?rev=10208&view=rev
Author:   carandraug
Date:     2012-04-13 10:06:29 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
vrml: created NEWS file

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

Added: trunk/octave-forge/main/vrml/NEWS
===================================================================
--- trunk/octave-forge/main/vrml/NEWS	                        (rev 0)
+++ trunk/octave-forge/main/vrml/NEWS	2012-04-13 10:06:29 UTC (rev 10208)
@@ -0,0 +1,23 @@
+Summary of important user-visible changes for vrml 1.0.13:
+-------------------------------------------------------------------
+
+ ** The following functions are new:
+
+      checker_color
+      vrml_Box
+      vrml_Sphere
+      vrml_parallelepiped
+      vrml_Viewpoint
+
+ ** The following functions have been removed:
+
+      select_3D_points
+      vrml_select_points
+
+ ** Use of deprecated/removed functions have been fixed to work with later
+    Octave releases.
+
+ ** The function `vmesh' is now able to handle vectors
+
+ ** Some bug fixes on the function `vrml_cyl' and `vrml_material' to handles
+    colors correctly

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

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

From: <car...@us...> - 2012-04-13 09:44:41

Revision: 10207
          http://octave.svn.sourceforge.net/octave/?rev=10207&view=rev
Author:   carandraug
Date:     2012-04-13 09:44:31 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
vrml: removal of deprecated function nth

Modified Paths:
--------------
    trunk/octave-forge/main/vrml/inst/save_vrml.m
    trunk/octave-forge/main/vrml/inst/vrml_frame.m

Modified: trunk/octave-forge/main/vrml/inst/save_vrml.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/save_vrml.m	2012-04-13 09:28:27 UTC (rev 10206)
+++ trunk/octave-forge/main/vrml/inst/save_vrml.m	2012-04-13 09:44:31 UTC (rev 10207)
@@ -75,7 +75,7 @@
 args = nargin; # nargin is now a function
 while --args,
 
-  tmp = nth (varargin, i++);
+  tmp = varargin{i++};
   if     strcmp (tmp, "nobg"),
     bg_node = "";
   elseif strcmp (tmp, "nolight"),
@@ -111,7 +111,7 @@
 
   if verbose, printf ("save_vrml : %i'th string\n",i); end
 
-  fprintf (fid,"%s", nth (varargin, i)) ;
+  fprintf (fid,"%s", varargin{i}) ;
   i++ ;
 end
 

Modified: trunk/octave-forge/main/vrml/inst/vrml_frame.m
===================================================================
--- trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-13 09:28:27 UTC (rev 10206)
+++ trunk/octave-forge/main/vrml/inst/vrml_frame.m	2012-04-13 09:44:31 UTC (rev 10207)
@@ -48,7 +48,7 @@
 while args && numeric_args<2,
 
 
-  tmp = nth (varargin, numeric_args + 1);
+  tmp = varargin{numeric_args + 1};
   if ischar (tmp), break; end
   --args;
   numeric_args++;

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

[Octave-cvsupdate] SF.net SVN: octave:[10206] trunk/octave-forge/main/comm/inst/convenc.m

From: <car...@us...> - 2012-04-13 09:28:36

Revision: 10206
          http://octave.svn.sourceforge.net/octave/?rev=10206&view=rev
Author:   carandraug
Date:     2012-04-13 09:28:27 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
convenc: help text to texinfo and basic input checking

Modified Paths:
--------------
    trunk/octave-forge/main/comm/inst/convenc.m

Modified: trunk/octave-forge/main/comm/inst/convenc.m
===================================================================
--- trunk/octave-forge/main/comm/inst/convenc.m	2012-04-13 09:08:01 UTC (rev 10205)
+++ trunk/octave-forge/main/comm/inst/convenc.m	2012-04-13 09:28:27 UTC (rev 10206)
@@ -13,38 +13,53 @@
 ## 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 File: convenv(m, G, k)
-%    Compute the output of an (n, k, L) convolutional encoder with vector input
-%    m and matrix of generator polynomials G.
-%
-%   The input vector m can be of arbitrary length.   G is a matrix with n rows
-%   and k*(L+1) columns.  The rows of G are the generator polynomials for each
-%   of the n output bits (per k input bits).
-%
-%   The output is a vector whose length is n*floor([length(m)+k*(L+1)-1]/k).
-%   With two inputs, k is assumed to be equal to 1.
-%
-%   Example 1: Compute the output from a (2, 1, 2)  convolutional encoder
-%   with generator polynomials g1 = [ 1 1 1 ] and g2 = [ 1 0 1 ]
-%   when the input message is m = [ 1 1 0 1 1 1 0 0 1 0 0 0 ]
-%
-%   x = convenc(m, [g1; g2])
-%   x = 1101010001100111111011000000
-%
-%   Example 2: Compute the output from a (3, 2, 1) conv encoder with
-%   generator polynomials g1 = [ 1 0 1 1 ], g2 = [ 1 1 0 1 ] and
-%   g3 = [ 1 0 1 0 ] when the input is m = [ 0   1   1   0   0   0   1   1 ]
-%
-%   x = convenc(m, [g1; g2; g3], 2)
-%   x = 111 111 110 101
-%
-%   Note: This function is not compatible with Matlab's convenc()
+## -*- texinfo -*-
+## @deftypefn {Function File} {@var{x} =} convenc (@var{m}, @var{G}, @var{k})
+## Compute output of an (n, @var{k}, L) convolutional encoder with vector input
+## @var{m} and matrix of generator polynomials @var{G}.
+##
+## The input vector @var{m} can be of arbitrary length. @var{G} is a matrix with n rows
+## and @var{k}*(L+1) columns. The rows of @var{G} are the generator polynomials for each
+## of the n output bits (per @var{k} input bits).
+##
+## The output is a vector whose length is n*floor([length(@var{m})+@var{k}*(L+1)-1]/@var{k}).
+## If unspecified, @var{k} defaults to 1.
+##
+## Example 1: Compute the output from a (2, 1, 2) convolutional encoder
+## @example
+## @group
+## m  = [ 1 1 0 1 1 1 0 0 1 0 0 0];
+## g1 = [1 1 1];
+## g2 = [1 0 1];
+## convenc (m, [g1; g2])
+##      @result{} [1 1 0 1 0 1 0 0 0 1 1 0 0 1 1 1 1 1 1 0 1 1 0 0 0 0 0 0]
+## @end group
+## @end example
+##
+## Example 2: Compute the output from a (3, 2, 1) convolutional encoder
+## @example
+## @group
+## m  = [0 1 1 0 0 0 1 1 ];
+## g1 = [1 0 1 1];
+## g2 = [1 1 0 1];
+## g3 = [1 0 1 0];
+## convenc (m, [g1; g2; g3], 2)
+##      @result{} [1 1 1 1 1 1 1 1 0 1 0 1]
+## @end group
+## @end example
+##
+## @strong{Caution:}: this function is not compatible with @sc{matlab}'s convenc().
+## @end deftypefn
 
-function x = convenc(m, G, k=1)
-	% Use conv2 to do repeated 1d convolutions of m with each row of G. 
-	% rem is used to transform the standard convolution result to one
-	% which uses modulo-2 addition.  Only cols with index a mult. of k 
-	% are in the actual enc. output
+function x = convenc (m, G, k = 1)
+  if (nargin < 2 || nargin > 3)
+    print_usage;
+  endif
 
-	x = rem(conv2(1, m(:)', G),2)(:,!rem(1:numel(m),k))(:)';
-end
+  # Use conv2 to do repeated 1d convolutions of m with each row of G. 
+  # rem is used to transform the standard convolution result to one
+  # which uses modulo-2 addition.  Only cols with index a mult. of k 
+  # are in the actual enc. output
+
+  x = rem(conv2(1, m(:)', G),2)(:,!rem(1:numel(m),k))(:)';
+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:[10205] trunk/octave-forge/main/comm

From: <car...@us...> - 2012-04-13 09:08:08

Revision: 10205
          http://octave.svn.sourceforge.net/octave/?rev=10205&view=rev
Author:   carandraug
Date:     2012-04-13 09:08:01 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
convenc: new function for comm package by Anthony Richardson <ar...@ev...> on octave-forge mailing list

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

Added Paths:
-----------
    trunk/octave-forge/main/comm/inst/convenc.m

Modified: trunk/octave-forge/main/comm/NEWS
===================================================================
--- trunk/octave-forge/main/comm/NEWS	2012-04-12 21:22:47 UTC (rev 10204)
+++ trunk/octave-forge/main/comm/NEWS	2012-04-13 09:08:01 UTC (rev 10205)
@@ -1,6 +1,10 @@
 Summary of important user-visible changes for communications 1.1.1:
 -------------------------------------------------------------------
 
+ ** The following functions are new:
+
+      convenc
+
  ** The function `reedmullerdec' had a bug fix introduced on the
     previous release
 
@@ -10,4 +14,3 @@
  ** Use of deprecated functions has been removed
 
  ** Package is no longer automatically loaded.
-

Added: trunk/octave-forge/main/comm/inst/convenc.m
===================================================================
--- trunk/octave-forge/main/comm/inst/convenc.m	                        (rev 0)
+++ trunk/octave-forge/main/comm/inst/convenc.m	2012-04-13 09:08:01 UTC (rev 10205)
@@ -0,0 +1,50 @@
+## Copyright (C) 2012 Tony Richardson <richardson.tony@gmailcom>
+##
+## 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/>.
+
+% -- Function File: convenv(m, G, k)
+%    Compute the output of an (n, k, L) convolutional encoder with vector input
+%    m and matrix of generator polynomials G.
+%
+%   The input vector m can be of arbitrary length.   G is a matrix with n rows
+%   and k*(L+1) columns.  The rows of G are the generator polynomials for each
+%   of the n output bits (per k input bits).
+%
+%   The output is a vector whose length is n*floor([length(m)+k*(L+1)-1]/k).
+%   With two inputs, k is assumed to be equal to 1.
+%
+%   Example 1: Compute the output from a (2, 1, 2)  convolutional encoder
+%   with generator polynomials g1 = [ 1 1 1 ] and g2 = [ 1 0 1 ]
+%   when the input message is m = [ 1 1 0 1 1 1 0 0 1 0 0 0 ]
+%
+%   x = convenc(m, [g1; g2])
+%   x = 1101010001100111111011000000
+%
+%   Example 2: Compute the output from a (3, 2, 1) conv encoder with
+%   generator polynomials g1 = [ 1 0 1 1 ], g2 = [ 1 1 0 1 ] and
+%   g3 = [ 1 0 1 0 ] when the input is m = [ 0   1   1   0   0   0   1   1 ]
+%
+%   x = convenc(m, [g1; g2; g3], 2)
+%   x = 111 111 110 101
+%
+%   Note: This function is not compatible with Matlab's convenc()
+
+function x = convenc(m, G, k=1)
+	% Use conv2 to do repeated 1d convolutions of m with each row of G. 
+	% rem is used to transform the standard convolution result to one
+	% which uses modulo-2 addition.  Only cols with index a mult. of k 
+	% are in the actual enc. output
+
+	x = rem(conv2(1, m(:)', G),2)(:,!rem(1:numel(m),k))(:)';
+end

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

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

From: <jpi...@us...> - 2012-04-12 21:22:54

Revision: 10204
          http://octave.svn.sourceforge.net/octave/?rev=10204&view=rev
Author:   jpicarbajal
Date:     2012-04-12 21:22:47 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
geometry: Adding curveval and cuve2polyline. functions to convert form polygonal curves to polylines.

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/DESCRIPTION
    trunk/octave-forge/main/geometry/INDEX
    trunk/octave-forge/main/geometry/NEWS
    trunk/octave-forge/main/geometry/inst/shape2d/shape2polygon.m

Added Paths:
-----------
    trunk/octave-forge/main/geometry/inst/shape2d/curve2polyline.m
    trunk/octave-forge/main/geometry/inst/shape2d/curveval.m

Modified: trunk/octave-forge/main/geometry/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/geometry/DESCRIPTION	2012-04-12 13:47:32 UTC (rev 10203)
+++ trunk/octave-forge/main/geometry/DESCRIPTION	2012-04-12 21:22:47 UTC (rev 10204)
@@ -1,11 +1,11 @@
 Name: Geometry
-Version: 1.4.1
-Date: 2012-03-24
+Version: 1.4.2
+Date: 2012-XX-XX
 Author: David Legland <dav...@gr...>, José Luis García Pallero <jgp...@gm...>, Juan Pablo Carbajal <car...@if...>
 Maintainer: Juan Pablo Carbajal <car...@if...>
 Title: Computational Geometry
 Description: Library for geometric computing extending MatGeom functions. Useful to create, transform, manipulate and display geometric primitives.
-Depends: octave (>= 3.4.0)
+Depends: octave (>= 3.4.0), general (>= 1.3.0)
 Autoload: yes
 License: GPLv3+, FreeBSD
 Url: http://octave.sf.net, http://matgeom.sf.net, http://davis.wpi.edu/~matt/courses/clipping/, https://bitbucket.org/jgpallero/octclip

Modified: trunk/octave-forge/main/geometry/INDEX
===================================================================
--- trunk/octave-forge/main/geometry/INDEX	2012-04-12 13:47:32 UTC (rev 10203)
+++ trunk/octave-forge/main/geometry/INDEX	2012-04-12 21:22:47 UTC (rev 10204)
@@ -124,6 +124,8 @@
  shapecentroid
  shapeplot
  shapetransform
+ curvelval
+ curve2polyline
 2D Others
  bisector
  crackPattern2

Modified: trunk/octave-forge/main/geometry/NEWS
===================================================================
--- trunk/octave-forge/main/geometry/NEWS	2012-04-12 13:47:32 UTC (rev 10203)
+++ trunk/octave-forge/main/geometry/NEWS	2012-04-12 21:22:47 UTC (rev 10204)
@@ -1,6 +1,19 @@
 Summary of important user-visible changes for releases of the geometry package
 
 ===============================================================================
+geometry-1.4.2   Release Date: 2012-XX-XX  Release Manager: Juan Pablo Carbajal
+===============================================================================
+
+* Added function
+ - curveval.m: Evaluates a polynomial curve defined as a 2-by-N matrix.
+ - curve2polyline.m: Converts a polynomial curve into a polyline by the adaptive
+                     sampling method.
+
+* Known issues
+ - simplifypolygon.m returns empty polygons when points are repeated, i.e when
+  the polygon is not correctly formed.
+
+===============================================================================
 geometry-1.4.1   Release Date: 2012-03-24  Release Manager: Juan Pablo Carbajal
 ===============================================================================
 

Added: trunk/octave-forge/main/geometry/inst/shape2d/curve2polyline.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/shape2d/curve2polyline.m	                        (rev 0)
+++ trunk/octave-forge/main/geometry/inst/shape2d/curve2polyline.m	2012-04-12 21:22:47 UTC (rev 10204)
@@ -0,0 +1,139 @@
+%% Copyright (c) 2012 Juan Pablo Carbajal <car...@if...>
+%%
+%%    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
+%%    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{polyline} = } curve2polyline (@var{curve})
+%% @deftypefnx {Function File} {@var{polyline} = } curve2polyline (@dots,@var{property},@var{value},@dots)
+%% Adaptive sampling of a parametric curve.
+%%
+%% The @var{curve} is described as a 2-by-N matrix. Rows correspond to the
+%% polynomial (compatible with @code{polyval}) describing the respective component
+%% of the curve. The curve must be parametrized in the interval [0,1].
+%% The vertices of the polyline are accumulated in regions of the curve where
+%% the curvature is higher.
+%%
+%% @strong{Parameters}
+%% @table @samp
+%% @item 'Nmax'
+%% Maximum number of vertices. Not used.
+%% @item 'Tol'
+%% Tolerance for the error criteria. Default value @code{1e-4}.
+%% @item 'MaxIter'
+%% Maximum number of iterations. Default value @code{10}.
+%% @item 'Method'
+%% Not implemented.
+%% @end table
+%%
+%% @seealso{shape2polygon, curveval}
+%% @end deftypefn
+
+%% This function is based on the algorithm described in
+%% L. H. de Figueiredo (1993). "Adaptive Sampling of Parametric Curves". Graphic Gems III.
+%% I had to remove the recursion so this version could be improved.
+%% Thursday, April 12 2012 -- JuanPi
+
+function [polyline t bump]= curve2polyline (curve, varargin)
+
+  # --- Parse arguments --- #
+  parser = inputParser ();
+  parser.FunctionName = "curve2polyline";
+  parser = addParamValue (parser,'Nmax', 32, @(x)x>0);
+  parser = addParamValue (parser,'Tol', 1e-4, @(x)x>0);
+  parser = addParamValue (parser,'MaxIter', 10, @(x)x>0);
+  parser = parse(parser,varargin{:});
+
+  Nmax      = parser.Results.Nmax;
+  tol       = parser.Results.Tol;
+  MaxIter   = parser.Results.MaxIter;
+
+  clear parser
+  # ------ #
+
+  t = [0; 1];
+  tf = 1;
+  points = 1;
+  for iter = 1:MaxIter
+    % Add parameter values where error is still bigger than tol.
+    t = interleave(t, tf);
+    nt = length(t);
+
+    % Update error
+    polyline = curveval (curve,t);
+    bump = bumpyness(polyline);
+
+    % Check which intervals must be subdivided
+    idx = find(bump > tol);
+    % The position of the bumps mpas into intervals
+    % 1 -> 1 2
+    % 2 -> 3 4
+    % 3 -> 5 6
+    % and so on
+    idx = [2*(idx-1)+1; 2*idx](:);
+    tf = false (nt-1,1);
+    tf(idx) = true;
+
+    if all (!tf)
+      break;
+    end
+
+  end
+
+endfunction
+
+function f = bumpyness (p)
+%% Check for co-linearity
+%% TODO implement various method for this
+%% -- Area of the triangle close to zero (used currently).
+%% -- Angle close to pi.
+%% -- abs(p0-pt) + abs(pt-p1) - abs(p0-p1) almost zero.
+%% -- Curve's tange at 0,t,1 are almost parallel.
+%% -- pt is in chord p0 -> p1.
+
+  PL = p(1:2:end-2,:);
+  PC = p(2:2:end-1,:);
+  PR = p(3:2:end,:);
+
+  a = PL - PC;
+  b = PR - PC;
+
+  f = (a(:,1).*b(:,2) - a(:,2).*b(:,1)).^2;
+
+endfunction
+
+function tt = interleave (t,varargin)
+
+ nt   = length(t);
+ ntt = 2 * nt -1;
+ tt = zeros(ntt,1);
+ tt(1:2:ntt) = t;
+ beta = 0.4 + 0.2*rand(nt-1, 1);
+ tt(2:2:ntt) = t(1:end-1) + beta.*(t(2:end)-t(1:end-1));
+
+ if nargin > 1
+  tf = true (ntt,1);
+  tf(2:2:ntt) = varargin{1};
+  tt(!tf) = [];
+ end
+
+endfunction
+
+%!demo
+%! curve    = [0 0 1 0;1 -0.3-1 0.3 0];
+%! polyline = curve2polyline(curve,'tol',1e-8);
+%!
+%! t  = linspace(0,1,100)';
+%! pc = curveval(curve,t);
+%!
+%! plot(p(:,1),p(:,2),'-o',pc(:,1),pc(:,2),'-r')

Added: trunk/octave-forge/main/geometry/inst/shape2d/curveval.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/shape2d/curveval.m	                        (rev 0)
+++ trunk/octave-forge/main/geometry/inst/shape2d/curveval.m	2012-04-12 21:22:47 UTC (rev 10204)
@@ -0,0 +1,30 @@
+%% Copyright (c) 2012 Juan Pablo Carbajal <car...@if...>
+%%
+%%    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
+%%    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{p} = } curveval (@var{curve}, @var{t})
+%% Evaluates parametric @var{curve} at @var{t}.
+%%
+%% @end deftypefn
+function p = curveval (curve, t)
+
+  dim = size (curve,1);
+  p = zeros (length(t), dim);
+
+  for i = 1:dim
+    p(:,i) = polyval (curve(i,:), t);
+  end
+
+endfunction

Modified: trunk/octave-forge/main/geometry/inst/shape2d/shape2polygon.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/shape2d/shape2polygon.m	2012-04-12 13:47:32 UTC (rev 10203)
+++ trunk/octave-forge/main/geometry/inst/shape2d/shape2polygon.m	2012-04-12 21:22:47 UTC (rev 10204)
@@ -21,7 +21,7 @@
 %% @var{shape} is a n-by-1 cell where each element is a pair of polynomials
 %% compatible with polyval.
 %% @var{polygon} is a k-by-2 matrix, where each row represents a vertex.
-%% @var{N} defines the number of points to be used in non-straigth edges.
+%% @var{N} defines the number of points to be used in non-straight edges.
 %%
 %% @seealso{polygon2shape, drawPolygon}
 %% @end deftypefn

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

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

From: <car...@us...> - 2012-04-12 13:47:47

Revision: 10203
          http://octave.svn.sourceforge.net/octave/?rev=10203&view=rev
Author:   carandraug
Date:     2012-04-12 13:47:32 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
maint: adjust copyright headers on statistics package. Move them to top of file, update to GPLv3, add e-mail address, list them on DESCRIPTION file

Modified Paths:
--------------
    trunk/octave-forge/main/statistics/COPYING
    trunk/octave-forge/main/statistics/DESCRIPTION
    trunk/octave-forge/main/statistics/inst/anderson_darling_cdf.m
    trunk/octave-forge/main/statistics/inst/anderson_darling_test.m
    trunk/octave-forge/main/statistics/inst/anovan.m
    trunk/octave-forge/main/statistics/inst/betastat.m
    trunk/octave-forge/main/statistics/inst/binostat.m
    trunk/octave-forge/main/statistics/inst/boxplot.m
    trunk/octave-forge/main/statistics/inst/caseread.m
    trunk/octave-forge/main/statistics/inst/casewrite.m
    trunk/octave-forge/main/statistics/inst/chi2stat.m
    trunk/octave-forge/main/statistics/inst/cl_multinom.m
    trunk/octave-forge/main/statistics/inst/copulacdf.m
    trunk/octave-forge/main/statistics/inst/copulapdf.m
    trunk/octave-forge/main/statistics/inst/expstat.m
    trunk/octave-forge/main/statistics/inst/ff2n.m
    trunk/octave-forge/main/statistics/inst/fstat.m
    trunk/octave-forge/main/statistics/inst/fullfact.m
    trunk/octave-forge/main/statistics/inst/gamfit.m
    trunk/octave-forge/main/statistics/inst/gamlike.m
    trunk/octave-forge/main/statistics/inst/gamstat.m
    trunk/octave-forge/main/statistics/inst/geomean.m
    trunk/octave-forge/main/statistics/inst/geostat.m
    trunk/octave-forge/main/statistics/inst/harmmean.m
    trunk/octave-forge/main/statistics/inst/histfit.m
    trunk/octave-forge/main/statistics/inst/hmmestimate.m
    trunk/octave-forge/main/statistics/inst/hmmgenerate.m
    trunk/octave-forge/main/statistics/inst/hmmviterbi.m
    trunk/octave-forge/main/statistics/inst/hygestat.m
    trunk/octave-forge/main/statistics/inst/jackknife.m
    trunk/octave-forge/main/statistics/inst/jsucdf.m
    trunk/octave-forge/main/statistics/inst/jsupdf.m
    trunk/octave-forge/main/statistics/inst/kmeans.m
    trunk/octave-forge/main/statistics/inst/linkage.m
    trunk/octave-forge/main/statistics/inst/lognstat.m
    trunk/octave-forge/main/statistics/inst/mad.m
    trunk/octave-forge/main/statistics/inst/monotone_smooth.m
    trunk/octave-forge/main/statistics/inst/mvncdf.m
    trunk/octave-forge/main/statistics/inst/mvnpdf.m
    trunk/octave-forge/main/statistics/inst/mvnrnd.m
    trunk/octave-forge/main/statistics/inst/mvtcdf.m
    trunk/octave-forge/main/statistics/inst/nanmax.m
    trunk/octave-forge/main/statistics/inst/nanmean.m
    trunk/octave-forge/main/statistics/inst/nanmedian.m
    trunk/octave-forge/main/statistics/inst/nanmin.m
    trunk/octave-forge/main/statistics/inst/nanstd.m
    trunk/octave-forge/main/statistics/inst/nansum.m
    trunk/octave-forge/main/statistics/inst/nanvar.m
    trunk/octave-forge/main/statistics/inst/nbinstat.m
    trunk/octave-forge/main/statistics/inst/normplot.m
    trunk/octave-forge/main/statistics/inst/normstat.m
    trunk/octave-forge/main/statistics/inst/pdist.m
    trunk/octave-forge/main/statistics/inst/poisstat.m
    trunk/octave-forge/main/statistics/inst/princomp.m
    trunk/octave-forge/main/statistics/inst/private/tbl_delim.m
    trunk/octave-forge/main/statistics/inst/random.m
    trunk/octave-forge/main/statistics/inst/raylcdf.m
    trunk/octave-forge/main/statistics/inst/raylinv.m
    trunk/octave-forge/main/statistics/inst/raylpdf.m
    trunk/octave-forge/main/statistics/inst/raylrnd.m
    trunk/octave-forge/main/statistics/inst/raylstat.m
    trunk/octave-forge/main/statistics/inst/regress.m
    trunk/octave-forge/main/statistics/inst/repanova.m
    trunk/octave-forge/main/statistics/inst/squareform.m
    trunk/octave-forge/main/statistics/inst/tabulate.m
    trunk/octave-forge/main/statistics/inst/tblread.m
    trunk/octave-forge/main/statistics/inst/tblwrite.m
    trunk/octave-forge/main/statistics/inst/trimmean.m
    trunk/octave-forge/main/statistics/inst/tstat.m
    trunk/octave-forge/main/statistics/inst/unidstat.m
    trunk/octave-forge/main/statistics/inst/unifstat.m
    trunk/octave-forge/main/statistics/inst/vmpdf.m
    trunk/octave-forge/main/statistics/inst/vmrnd.m
    trunk/octave-forge/main/statistics/inst/wblstat.m

Modified: trunk/octave-forge/main/statistics/COPYING
===================================================================
--- trunk/octave-forge/main/statistics/COPYING	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/COPYING	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1 +1 @@
-See the individual files for licenses.
+See individual files for licenses

Modified: trunk/octave-forge/main/statistics/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/statistics/DESCRIPTION	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/DESCRIPTION	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,12 +1,12 @@
 Name: Statistics
 Version: 1.1.1
 Date: 2012-04-12
-Author: Various Authors
+Author: various authors
 Maintainer: Arno Onken <as...@as...>
 Title: Statistics
 Description: Additional statistics functions for Octave.
 Categories: Statistics
 Depends: octave (>= 2.9.7), miscellaneous
 Autoload: yes
-License: See individual files
+License: GPLv3+, public domain
 Url: http://octave.sf.net

Modified: trunk/octave-forge/main/statistics/inst/anderson_darling_cdf.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/anderson_darling_cdf.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/anderson_darling_cdf.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,3 +1,6 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
 ## -*- texinfo -*-
 ## @deftypefn {Function File} @var{p} = anderson_darling_cdf (@var{A}, @var{n})
 ##
@@ -73,9 +76,6 @@
 ## @seealso{anderson_darling_test}
 ## @end deftypefn
 
-## Author: Paul Kienzle
-## This code is granted to the public domain.
-  
 function y = anderson_darling_cdf(z,n)
   y = ADinf(z);
   y += ADerrfix(y,n);

Modified: trunk/octave-forge/main/statistics/inst/anderson_darling_test.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/anderson_darling_test.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/anderson_darling_test.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,3 +1,6 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
 ## -*- texinfo -*-
 ## @deftypefn {Function File} {[@var{q}, @var{Asq}, @var{info}] = } = @
 ## anderson_darling_test (@var{x}, @var{distribution})
@@ -51,9 +54,6 @@
 ## @seealso{anderson_darling_cdf}
 ## @end deftypefn
 
-
-## Author: Paul Kienzle
-## This program is granted to the public domain.
 function [q,Asq,info] = anderson_darling_test(x,dist)
 
   if size(x,1) == 1, x=x(:); end

Modified: trunk/octave-forge/main/statistics/inst/anovan.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/anovan.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/anovan.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,18 +1,17 @@
-## Copyright (C) 2003-2005 Andy Adler
+## Copyright (C) 2003-2005 Andy Adler <ad...@nc...>
 ##
-## Octave 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, 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 software 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 software; see the file COPYING.  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{pval}, @var{f}, @var{df_b}, @var{df_e}] =} anovan (@var{data}, @var{grps})
@@ -77,7 +76,6 @@
 ##      g3 = {'may'; 'may'; 'may'; 'may'; 'june'; 'june'; 'june'; 'june'}; 
 ##      anovan( y', [g1',g2',g3'])
 ##    % Fails because we always do interactions
-                                                                           
 
 function [PVAL, FSTAT, DF_B, DFE] = anovan (data, grps, varargin)
 

Modified: trunk/octave-forge/main/statistics/inst/betastat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/betastat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/betastat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{m}, @var{v}] =} betastat (@var{a}, @var{b})

Modified: trunk/octave-forge/main/statistics/inst/binostat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/binostat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/binostat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{m}, @var{v}] =} binostat (@var{n}, @var{p})

Modified: trunk/octave-forge/main/statistics/inst/boxplot.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/boxplot.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/boxplot.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,20 @@
-## Copyright (C) 2002 Alberto Terruzzi
+## Copyright (C) 2002 Alberto Terruzzi <t-a...@li...>
+## Copyright (C) 2006 Alberto Pose <ap...@al...>
+## Copyright (C) 2011 Pascal Dupuis <Pas...@wo...>
+## Copyright (C) 2012 Juan Pablo Carbajal <car...@if...>
 ##
-## 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{s} =} boxplot (@var{data}, @var{notched}, @

Modified: trunk/octave-forge/main/statistics/inst/caseread.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/caseread.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/caseread.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2008 Bill Denney
+## Copyright (C) 2008 Bill Denney <bi...@de...>
 ##
-## 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 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{names} =} caseread (@var{filename})

Modified: trunk/octave-forge/main/statistics/inst/casewrite.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/casewrite.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/casewrite.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2008 Bill Denney
+## Copyright (C) 2008 Bill Denney <bi...@de...>
 ##
-## 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 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} {} casewrite (@var{strmat}, @var{filename})

Modified: trunk/octave-forge/main/statistics/inst/chi2stat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/chi2stat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/chi2stat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{m}, @var{v}] =} chi2stat (@var{n})

Modified: trunk/octave-forge/main/statistics/inst/cl_multinom.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/cl_multinom.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/cl_multinom.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,70 +1,70 @@
-# -*- texinfo -*-
-#
-# @deftypefn {Function File} {@var{CL} =} cl_multinom (@var{x}, @var{N}, @var{b}, @var{calculation_type} ) - Confidence level of multinomial portions
-#    Returns confidence level of multinomial parameters estimated @math{ p = x / sum(x) } with predefined confidence interval @var{b}.
-#    Finite population is also considered.
-#
-# This function calculates the level of confidence at which the samples represent the true distribution
-# given that there is a predefined tolerance (confidence interval).
-# This is the upside down case of the typical excercises at which we want to get the confidence interval
-# given the confidence level (and the estimated parameters of the underlying distribution).
-# But once we accept (lets say at elections) that we have a standard predefined
-# maximal acceptable error rate (e.g. @var{b}=0.02 ) in the estimation and we just want to know that how sure we
-# can be that the measured proportions are the same as in the
-# entire population (ie. the expected value and mean of the samples are roghly the same) we need to use this function.
-#
-# @subheading Arguments
-# @itemize @bullet
-# @item @var{x}  : int vector  : sample frequencies bins
-# @item @var{N}  : int         : Population size that was sampled by x. If N<sum(x), infinite number assumed
-# @item @var{b}  : real, vector :  confidence interval
-#            if vector, it should be the size of x containing confence interval for each cells
-#            if scalar, each cell will have the same value of b unless it is zero or -1
-#            if value is 0, b=.02 is assumed which is standard choice at elections
-#            otherwise it is calculated in a way that one sample in a cell alteration defines the confidence interval
-# @item @var{calculation_type}  : string    : (Optional), described below
-#           "bromaghin"     (default) - do not change it unless you have a good reason to do so
-#           "cochran"
-#           "agresti_cull"  this is not exactly the solution at reference given below but an adjustment of the solutions above
-# @end itemize
-#
-# @subheading Returns
-#   Confidence level.
-#
-# @subheading Example
-#   CL = cl_multinom( [27;43;19;11], 10000, 0.05 )
-#     returns 0.69 confidence level.
-#
-# @subheading References
-#
-# "bromaghin" calculation type (default) is based on
-# is based on the article
-#   Jeffrey F. Bromaghin, "Sample Size Determination for Interval Estimation of Multinomial Probabilities", The American Statistician  vol 47, 1993, pp 203-206.
-#
-# "cochran" calculation type
-# is based on article
-#   Robert T. Tortora, "A Note on Sample Size Estimation for Multinomial Populations", The American Statistician, , Vol 32. 1978,  pp 100-102.
-#
-# "agresti_cull" calculation type
-# is based on article in which Quesenberry Hurst and Goodman result is combined
-#   A. Agresti and B.A. Coull, "Approximate is better than \"exact\" for interval estimation of binomial portions", The American Statistician, Vol. 52, 1998, pp 119-126
-#
-# @end deftypefn
+## Copyright (C) 2009 Levente Torok <Tor...@gm...>
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 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/>.
 
-# Copyright (C) 2009 Levente Torok / Tor...@gm... 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.^
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License"
-# along with this program; If not, see <http://www.gnu.org/licenses/>. 
-#
+## -*- texinfo -*-
+##
+## @deftypefn {Function File} {@var{CL} =} cl_multinom (@var{x}, @var{N}, @var{b}, @var{calculation_type} ) - Confidence level of multinomial portions
+##    Returns confidence level of multinomial parameters estimated @math{ p = x / sum(x) } with predefined confidence interval @var{b}.
+##    Finite population is also considered.
+##
+## This function calculates the level of confidence at which the samples represent the true distribution
+## given that there is a predefined tolerance (confidence interval).
+## This is the upside down case of the typical excercises at which we want to get the confidence interval
+## given the confidence level (and the estimated parameters of the underlying distribution).
+## But once we accept (lets say at elections) that we have a standard predefined
+## maximal acceptable error rate (e.g. @var{b}=0.02 ) in the estimation and we just want to know that how sure we
+## can be that the measured proportions are the same as in the
+## entire population (ie. the expected value and mean of the samples are roghly the same) we need to use this function.
+##
+## @subheading Arguments
+## @itemize @bullet
+## @item @var{x}  : int vector  : sample frequencies bins
+## @item @var{N}  : int         : Population size that was sampled by x. If N<sum(x), infinite number assumed
+## @item @var{b}  : real, vector :  confidence interval
+##            if vector, it should be the size of x containing confence interval for each cells
+##            if scalar, each cell will have the same value of b unless it is zero or -1
+##            if value is 0, b=.02 is assumed which is standard choice at elections
+##            otherwise it is calculated in a way that one sample in a cell alteration defines the confidence interval
+## @item @var{calculation_type}  : string    : (Optional), described below
+##           "bromaghin"     (default) - do not change it unless you have a good reason to do so
+##           "cochran"
+##           "agresti_cull"  this is not exactly the solution at reference given below but an adjustment of the solutions above
+## @end itemize
+##
+## @subheading Returns
+##   Confidence level.
+##
+## @subheading Example
+##   CL = cl_multinom( [27;43;19;11], 10000, 0.05 )
+##     returns 0.69 confidence level.
+##
+## @subheading References
+##
+## "bromaghin" calculation type (default) is based on
+## is based on the article
+##   Jeffrey F. Bromaghin, "Sample Size Determination for Interval Estimation of Multinomial Probabilities", The American Statistician  vol 47, 1993, pp 203-206.
+##
+## "cochran" calculation type
+## is based on article
+##   Robert T. Tortora, "A Note on Sample Size Estimation for Multinomial Populations", The American Statistician, , Vol 32. 1978,  pp 100-102.
+##
+## "agresti_cull" calculation type
+## is based on article in which Quesenberry Hurst and Goodman result is combined
+##   A. Agresti and B.A. Coull, "Approximate is better than \"exact\" for interval estimation of binomial portions", The American Statistician, Vol. 52, 1998, pp 119-126
+##
+## @end deftypefn
 
 function CL = cl_multinom( x, N, b = .05, calculation_type = "bromaghin")
 

Modified: trunk/octave-forge/main/statistics/inst/copulacdf.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/copulacdf.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/copulacdf.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2008  Arno Onken
+## Copyright (C) 2008 Arno Onken <as...@as...>
 ##
-## 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 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{p} =} copulacdf (@var{family}, @var{x}, @var{theta})

Modified: trunk/octave-forge/main/statistics/inst/copulapdf.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/copulapdf.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/copulapdf.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2008  Arno Onken
+## Copyright (C) 2008 Arno Onken <as...@as...>
 ##
-## 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 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{p} =} copulapdf (@var{family}, @var{x}, @var{theta})

Modified: trunk/octave-forge/main/statistics/inst/expstat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/expstat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/expstat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{m}, @var{v}] =} expstat (@var{l})

Modified: trunk/octave-forge/main/statistics/inst/ff2n.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/ff2n.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/ff2n.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,3 +1,6 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
 ## -*- texinfo -*-
 ## @deftypefn {Function File} ff2n (@var{n})
 ## Full-factor design with n binary terms.
@@ -5,9 +8,6 @@
 ## @seealso {fullfact}
 ## @end deftypefn
 
-## Author: Paul Kienzle <pki...@us...>
-## This program is public domain
-
 function A=ff2n(n)
   A = fullfact (2 * ones (1,n)) - 1;
 endfunction

Modified: trunk/octave-forge/main/statistics/inst/fstat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/fstat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/fstat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{mn}, @var{v}] =} fstat (@var{m}, @var{n})

Modified: trunk/octave-forge/main/statistics/inst/fullfact.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/fullfact.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/fullfact.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,3 +1,6 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
 ## -*- texinfo -*-
 ## @deftypefn {Function File} fullfact (@var{N})
 ## Full factorial design.
@@ -10,9 +13,6 @@
 ##
 ## @end deftypefn
 
-## Author: Paul Kienzle <pki...@us...>
-## This program is public domain.
-
 function A = fullfact(n)
   if length(n) == 1
     % combinatorial design with n either/or choices

Modified: trunk/octave-forge/main/statistics/inst/gamfit.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/gamfit.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/gamfit.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,3 +1,6 @@
+## Author: Martijn van Oosterhout <kl...@sv...>
+## This program is granted to the public domain.
+
 ## -*- texinfo -*-
 ## @deftypefn {Function File} {} [A B] = gamfit (@var{R})
 ## Finds the maximumlikelihood estimator for the Gamma distribution for R
@@ -15,9 +18,6 @@
 ## Matlab. To work for Matlab, value of b needs to be inverted in a few
 ## places (marked with **)
 
-## Written by Martijn van Oosterhout <kl...@sv...> (Nov 2006)
-## This code is public domain
-
 function res = gamfit(R)
 
   if (nargin != 1)

Modified: trunk/octave-forge/main/statistics/inst/gamlike.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/gamlike.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/gamlike.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,3 +1,6 @@
+## Author: Martijn van Oosterhout <kl...@sv...>
+## This program is granted to the public domain.
+
 ## -*- texinfo -*-
 ## @deftypefn {Function File} {@var{X} =} gamlike ([@var{A} @var{B}], @var{R})
 ## Calculates the negative log-likelihood function for the Gamma
@@ -5,9 +8,6 @@
 ## @seealso{gampdf, gaminv, gamrnd, gamfit}
 ## @end deftypefn
 
-## Written by Martijn van Oosterhout <kl...@sv...> (Nov 2006)
-## This code is public domain
-
 function res = gamlike(P,K)
 
   if (nargin != 2)

Modified: trunk/octave-forge/main/statistics/inst/gamstat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/gamstat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/gamstat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{m}, @var{v}] =} gamstat (@var{a}, @var{b})

Modified: trunk/octave-forge/main/statistics/inst/geomean.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/geomean.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/geomean.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2001 Paul Kienzle
+## Copyright (C) 2001 Paul Kienzle <pki...@us...>
 ##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 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} geomean (@var{x})

Modified: trunk/octave-forge/main/statistics/inst/geostat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/geostat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/geostat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{m}, @var{v}] =} geostat (@var{p})

Modified: trunk/octave-forge/main/statistics/inst/harmmean.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/harmmean.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/harmmean.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2001 Paul Kienzle
+## Copyright (C) 2001 Paul Kienzle <pki...@us...>
 ##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 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} harmmean (@var{x})

Modified: trunk/octave-forge/main/statistics/inst/histfit.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/histfit.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/histfit.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2003 Alberto Terruzzi
+## Copyright (C) 2003 Alberto Terruzzi <t-a...@li...>
 ##
-## 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} histfit (@var{data}, @var{nbins})

Modified: trunk/octave-forge/main/statistics/inst/hmmestimate.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/hmmestimate.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/hmmestimate.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{transprobest}, @var{outprobest}] =} hmmestimate (@var{sequence}, @var{states})

Modified: trunk/octave-forge/main/statistics/inst/hmmgenerate.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/hmmgenerate.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/hmmgenerate.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{sequence}, @var{states}] =} hmmgenerate (@var{len}, @var{transprob}, @var{outprob})

Modified: trunk/octave-forge/main/statistics/inst/hmmviterbi.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/hmmviterbi.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/hmmviterbi.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{vpath} =} hmmviterbi (@var{sequence}, @var{transprob}, @var{outprob})

Modified: trunk/octave-forge/main/statistics/inst/hygestat.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/hygestat.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/hygestat.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006, 2007  Arno Onken
+## Copyright (C) 2006, 2007 Arno Onken <as...@as...>
 ##
-## 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 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{mn}, @var{v}] =} hygestat (@var{t}, @var{m}, @var{n})

Modified: trunk/octave-forge/main/statistics/inst/jackknife.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/jackknife.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/jackknife.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,18 +1,17 @@
-## Copyright (C) 2011 Alexander Klein
-## 
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or
-## (at your option) any later version.
-## 
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
+## Copyright (C) 2011 Alexander Klein <ale...@ma...>
+##
+## 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{jackstat} =} jackknife (@var{E}, @var{x}, @dots{})

Modified: trunk/octave-forge/main/statistics/inst/jsucdf.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/jsucdf.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/jsucdf.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,11 +1,17 @@
-## Copyright (C) 2006 Frederick (Rick) A Niles
+## Copyright (C) 2006 Frederick (Rick) A Niles <ni...@ri...>
 ##
-## This file is intended to be used with this software.
+## 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 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, 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} {} jsucdf (@var{x}, @var{alpha1}, @var{alpha2})

Modified: trunk/octave-forge/main/statistics/inst/jsupdf.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/jsupdf.m	2012-04-12 10:13:25 UTC (rev 10202)
+++ trunk/octave-forge/main/statistics/inst/jsupdf.m	2012-04-12 13:47:32 UTC (rev 10203)
@@ -1,11 +1,17 @@
-## Copyright (C) 2006 Frederick (Rick) A Niles
+## Copyright (C) 2006 Frederick (Rick) A Niles <ni...@ri...>
 ##
-## This file is intended to be used with this software.
+## 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 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, 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} {} jsupdf (@var{x}, @var{alpha1}, @var{alpha2})

Modified: trunk/octave-forge/main/statistics/inst/kmeans.m
===============================...
 
[truncated message content]

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

From: <as...@us...> - 2012-04-12 10:13:35

Revision: 10202
          http://octave.svn.sourceforge.net/octave/?rev=10202&view=rev
Author:   asnelt
Date:     2012-04-12 10:13:25 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Updates DESCRIPTION and NEWS for new package release.

Modified Paths:
--------------
    trunk/octave-forge/main/statistics/DESCRIPTION
    trunk/octave-forge/main/statistics/NEWS

Modified: trunk/octave-forge/main/statistics/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/statistics/DESCRIPTION	2012-04-12 09:49:33 UTC (rev 10201)
+++ trunk/octave-forge/main/statistics/DESCRIPTION	2012-04-12 10:13:25 UTC (rev 10202)
@@ -1,6 +1,6 @@
 Name: Statistics
-Version: 1.1.0
-Date: 2011-11-10
+Version: 1.1.1
+Date: 2012-04-12
 Author: Various Authors
 Maintainer: Arno Onken <as...@as...>
 Title: Statistics

Modified: trunk/octave-forge/main/statistics/NEWS
===================================================================
--- trunk/octave-forge/main/statistics/NEWS	2012-04-12 09:49:33 UTC (rev 10201)
+++ trunk/octave-forge/main/statistics/NEWS	2012-04-12 10:13:25 UTC (rev 10202)
@@ -1,7 +1,7 @@
-Summary of important user-visible changes for statistics 1XXXXXXXX:
+Summary of important user-visible changes for statistics 1.1.1:
 -------------------------------------------------------------------
 
- ** The following functions are new in 1.1.X:
+ ** The following functions are new in 1.1.1:
 
       monotone_smooth kmeans jackknife
 
@@ -15,7 +15,7 @@
 
       zscore
 
- ** boxplot.m now retunrs a structure with handles to the plot elemenets.
+ ** boxplot.m now returns a structure with handles to the plot elemenets.
 
 Summary of important user-visible changes for statistics 1.1.0:
 -------------------------------------------------------------------

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

[Octave-cvsupdate] SF.net SVN: octave:[10201] trunk/octave-forge/main/image/inst/mat2gray.m

From: <car...@us...> - 2012-04-12 09:49:42

Revision: 10201
          http://octave.svn.sourceforge.net/octave/?rev=10201&view=rev
Author:   carandraug
Date:     2012-04-12 09:49:33 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
mat2gray: help text to mention situation when min and max are equal

Modified Paths:
--------------
    trunk/octave-forge/main/image/inst/mat2gray.m

Modified: trunk/octave-forge/main/image/inst/mat2gray.m
===================================================================
--- trunk/octave-forge/main/image/inst/mat2gray.m	2012-04-12 09:42:32 UTC (rev 10200)
+++ trunk/octave-forge/main/image/inst/mat2gray.m	2012-04-12 09:49:33 UTC (rev 10201)
@@ -30,10 +30,22 @@
 ## in @var{M} above @var{max} will be set to 0 while the ones below @var{min}
 ## will be set to 1.
 ##
-## @strong{Caution:} For compatibility with @sc{matlab}, Octave's mat2gray
-## will return a matrix of ones if @var{min} and @var{max} are equal, even for
-## values below @var{min}.
+## @strong{Caution:} For compatibility with @sc{matlab}, if @var{min} and @var{max}
+## are equal (either from being actually being set manually or automatically
+## calculated from the @var{M} min and max values, Octave's mat2gray will truncate
+## all values between [0 1]. For example
 ##
+## @example
+## @group
+## mat2gray ([-2 0 0.5 0.9 5], [2 2])
+##      @result{} [0  0  0.5  0.9  1]
+## mat2gray ([0.5 0.5 0.5])
+##      @result{} [0.5  0.5  0.5]
+## mat2gray ([4 4 4])
+##      @result{} [1  1  1]
+## @end group
+## @end example
+##
 ## @seealso{gray2ind, ind2gray, rgb2gray, im2double, im2uin16, im2uint8, im2int16}
 ## @end deftypefn
 

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

[Octave-cvsupdate] SF.net SVN: octave:[10200] trunk/octave-forge/main/image/inst/mat2gray.m

From: <car...@us...> - 2012-04-12 09:42:43

Revision: 10200
          http://octave.svn.sourceforge.net/octave/?rev=10200&view=rev
Author:   carandraug
Date:     2012-04-12 09:42:32 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
mat2gray: use less memory by editing the input image rather than creating a copy and editing that one

Modified Paths:
--------------
    trunk/octave-forge/main/image/inst/mat2gray.m

Modified: trunk/octave-forge/main/image/inst/mat2gray.m
===================================================================
--- trunk/octave-forge/main/image/inst/mat2gray.m	2012-04-12 09:33:03 UTC (rev 10199)
+++ trunk/octave-forge/main/image/inst/mat2gray.m	2012-04-12 09:42:32 UTC (rev 10200)
@@ -37,7 +37,7 @@
 ## @seealso{gray2ind, ind2gray, rgb2gray, im2double, im2uin16, im2uint8, im2int16}
 ## @end deftypefn
 
-function out = mat2gray (in, scale)
+function in = mat2gray (in, scale)
 
   if (nargin < 1 || nargin > 2)
     print_usage;
@@ -67,26 +67,27 @@
   if (out_min == out_max)
     in(in>1) = 1;
     in(in<0) = 0;
-    out = in;
     return
-  else
-    out = ones (size (in));
   endif
 
-  out(in <= out_min) = 0;
-  ## no need to worry with values above or equal to out_max because
-  ## the output matrix was already generated with ones()
+  ## we are editing the input matrix rather than creating a new one to save
+  ## memory. We need to make sure it's double though
+  in = double(in);
 
   ## it's faster to get the index of values between max and min only once
-  ## than to have it calculated on both sides of the assignment
-  idx      = (in > out_min & in < out_max);
-  out(idx) =  (1/(out_max - out_min)) * (double(in(idx)) - out_min);
+  ## than to have it calculated on both sides of the assignment later on. We
+  ## need to get the index before starting editing
+  idx = (in > out_min & in < out_max);
 
+  in(in <= out_min) = 0;
+  in(in >= out_max) = 1;
+  in(idx) = (1/(out_max - out_min)) * (double(in(idx)) - out_min);
+
   ## if the given min and max are in the inverse order...
   if (nargin > 1 && scale(1) > scale (2))
     ## matlab seems to allow setting the min higher than the max but not by
     ## checking which one is actually correct. Seems to just invert it
-    out = abs (out - 1);
+    in = abs (in - 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:[10199] trunk/octave-forge/main/image/inst/mat2gray.m

From: <car...@us...> - 2012-04-12 09:33:14

Revision: 10199
          http://octave.svn.sourceforge.net/octave/?rev=10199&view=rev
Author:   carandraug
Date:     2012-04-12 09:33:03 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
mat2gray: matlab compatibility fixes for when max and min are the same

Modified Paths:
--------------
    trunk/octave-forge/main/image/inst/mat2gray.m

Modified: trunk/octave-forge/main/image/inst/mat2gray.m
===================================================================
--- trunk/octave-forge/main/image/inst/mat2gray.m	2012-04-11 19:11:07 UTC (rev 10198)
+++ trunk/octave-forge/main/image/inst/mat2gray.m	2012-04-12 09:33:03 UTC (rev 10199)
@@ -61,11 +61,16 @@
   out_min = double (out_min);
   out_max = double (out_max);
 
-  out = ones (size (in));
+  ## if max and min are the same, matlab seems to simple truncate the input
+  ## between 0 and 1, and ignores the min/max values set. Don't get the logic
+  ## but hey! Matlab compatibility
   if (out_min == out_max)
-    ## if max and min are the same, matlab seems to simple return 1s, even
-    ## for values under the minimum/maximum. As such, we are done here
+    in(in>1) = 1;
+    in(in<0) = 0;
+    out = in;
     return
+  else
+    out = ones (size (in));
   endif
 
   out(in <= out_min) = 0;
@@ -89,4 +94,6 @@
 %!assert(mat2gray([1 2 3]), [0 0.5 1]);           # standard use
 %!assert(mat2gray(repmat ([1 2; 3 3], [1 1 3])), repmat ([0 0.5; 1 1], [1 1 3])); # setting min and max
 %!assert(mat2gray([1 2 3], [2 2]), [1 1 1]);      # equal min and max
+%!assert(mat2gray([-1 0 0.5 3], [2 2]), [0 0 0.5 1]);      # equal min and max
+%!assert(mat2gray(ones(3*0.5)), ones(3*0.5));      # equal min and max from the image (not set)
 %!assert(mat2gray([1 2 3], [3 1]), [1 0.5 0]);    # max and min inverted

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

48 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 34 35 36 37 38 .. 540 > >> (Page 36 of 540)