[Octave-cvsupdate] octave-forge/main/odepkg/doc ChangeLog,1.3,1.4

[Thomas Treichl <treichl@us...>]

Update of /cvsroot/octave/octave-forge/main/odepkg/doc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14527

Modified Files:
	ChangeLog 
Log Message:
Updated.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/odepkg/doc/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog	22 Oct 2006 17:49:59 -0000	1.3
+++ ChangeLog	29 Dec 2006 16:57:39 -0000	1.4
@@ -3,6 +3,10 @@
 Creator:     Thomas Treichl
 Description: OdePkg ChangeLog File
 
+2006.12.25 Thomas Treichl
+	* ode23.m, ode45.m, ode54.m, ode78.m, odeprint:
+	  Did some updates and improved functionality
+
 2006.10.22 Thomas Treichl
 	* -NEEDED-: update all -*-texinfo-*- help texts in all function files
 	* OdePkg-0.1.1: ready to put it into cvs-repository

[Octave-cvsupdate] octave-forge/main/image/inst bwdist.m,1.1,1.2

[soren hauberg <hauberg@us...>]

Update of /cvsroot/octave/octave-forge/main/image/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15815

Modified Files:
	bwdist.m 
Log Message:
Missing sqrt

Index: bwdist.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/inst/bwdist.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- bwdist.m	28 Dec 2006 22:42:12 -0000	1.1
+++ bwdist.m	29 Dec 2006 00:34:19 -0000	1.2
@@ -44,6 +44,7 @@
     case "e" 
       ## Euclidian distance transform
       D = __bwdist(bw);
+      D = sqrt(D);
     otherwise
       error("bwdist: unsupported method '%s'", method);
   endswitch

[Octave-cvsupdate] octave-forge/main/image/src __bwdist.cc, NONE, 1.1 Makefile, 1.4, 1.5

[soren hauberg <hauberg@us...>]

Update of /cvsroot/octave/octave-forge/main/image/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32167/src

Modified Files:
	Makefile 
Added Files:
	__bwdist.cc 
Log Message:
First revision of bwarea.m and __bwarea.cc

Index: Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/src/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	8 Dec 2006 11:06:56 -0000	1.4
+++ Makefile	28 Dec 2006 22:42:12 -0000	1.5
@@ -13,7 +13,7 @@
 endif
 
 all: cordflt2.oct bwlabel.oct bwfill.oct rotate_scale.oct \
-	houghtf.oct graycomatrix.oct deriche.oct \
+	houghtf.oct graycomatrix.oct deriche.oct __bwdist.oct \
 	$(JPEG) $(PNG) $(IMAGEMAGICK)
 
 jpgread.oct: jpgread.cc

--- NEW FILE: __bwdist.cc ---
/*
Copyright (C) 2006 Pedro Felzenszwalb

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, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
*/

/* 
 * Remark by Søren Hauberg, december 28th 2006.
 *
 * This code was mainly written by Pedro Felzenszwalb and published
 * on http://people.cs.uchicago.edu/~pff/dt/
 * Pedro kindly released his code under the GPL and I ported it to
 * Octave.
 */

#include <octave/oct.h>

#define INF 1E20

template <class T>
inline T square(const T &x) { return x*x; };

/* dt of 1d function using squared distance */
static float *dt(float *f, int n) {
  float *d = new float[n];
  int *v = new int[n];
  float *z = new float[n+1];
  int k = 0;
  v[0] = 0;
  z[0] = -INF;
  z[1] = +INF;
  for (int q = 1; q <= n-1; q++) {
    float s  = ((f[q]+square(q))-(f[v[k]]+square(v[k])))/(2*q-2*v[k]);
    while (s <= z[k]) {
      k--;
      s  = ((f[q]+square(q))-(f[v[k]]+square(v[k])))/(2*q-2*v[k]);
    }
    k++;
    v[k] = q;
    z[k] = s;
    z[k+1] = +INF;
  }

  k = 0;
  for (int q = 0; q <= n-1; q++) {
    while (z[k+1] < q)
      k++;
    d[q] = square(q-v[k]) + f[v[k]];
  }

  delete [] v;
  delete [] z;
  return d;
}

/* dt of 2d function using squared distance */
static void dt(NDArray &im) {
  const int width = im.dim2();
  const int height = im.dim1();
  float *f = new float[std::max(width,height)];

  // transform along columns
  for (int x = 0; x < width; x++) {
    for (int y = 0; y < height; y++) {
      f[y] = im(x, y);
    }
    float *d = dt(f, height);
    for (int y = 0; y < height; y++) {
      im(x, y) = d[y];
    }
    delete [] d;
  }

  // transform along rows
  for (int y = 0; y < height; y++) {
    for (int x = 0; x < width; x++) {
      f[x] = im(x, y);
    }
    float *d = dt(f, width);
    for (int x = 0; x < width; x++) {
      im(x, y) = d[x];
    }
    delete [] d;
  }

  delete f;
}


/* dt of binary image using squared distance */
void dt(boolNDArray &im, NDArray &out) {
  const int width = im.dim2();
  const int height = im.dim1();

  for (int y = 0; y < height; y++) {
    for (int x = 0; x < width; x++) {
      if (im(x, y))
        out(x, y) = 0;
      else
        out(x, y) = INF;
    }
  }

  dt(out);
}

DEFUN_DLD(__bwdist, args, nargout, "\
-*- texinfo -*-\n\
@deftypefn {Function File} __bwdist (@var{bw})\n\
Computes the Euclidian Distance Transform for a binary image @var{bw}.\n\
You should not call this function directly, instead call 'bwdist'.\n\
@seealso{bwdist}\n\
@end deftypefn\n\
")
{
  octave_value_list retval;
  
  boolNDArray bw = args(0).bool_array_value();
  if (error_state) {
    error("__bwdist: input must be a boolean matrix");
    return retval;
  }
  
  const dim_vector dims = bw.dims();
  if (dims.length() != 2) {
    error("__bwdist: currently only binary images are supported");
    return retval;
  }
  
  NDArray *out = new NDArray(dims);
  
  dt(bw, *out);
  
  retval.append(*out);
  return retval;
}

[Octave-cvsupdate] octave-forge/main/image/inst bwdist.m,NONE,1.1

[soren hauberg <hauberg@us...>]

Update of /cvsroot/octave/octave-forge/main/image/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32167/inst

Added Files:
	bwdist.m 
Log Message:
First revision of bwarea.m and __bwarea.cc

--- NEW FILE: bwdist.m ---
(This appears to be a binary file; contents omitted.)

[Octave-cvsupdate] octave-forge/main/optim/inst wpolyfit.m, 1.1, 1.2

[Paul Kienzle <pkienzle@us...>]

Update of /cvsroot/octave/octave-forge/main/optim/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6118

Modified Files:
	wpolyfit.m 
Log Message:
Corrections to comments regarding F-test for polynomial degree


Index: wpolyfit.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optim/inst/wpolyfit.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wpolyfit.m	20 Aug 2006 13:37:57 -0000	1.1
+++ wpolyfit.m	28 Dec 2006 06:15:12 -0000	1.2
@@ -44,12 +44,12 @@
 ## @example
 ## [poly1,S1] = wpolyfit(x,y,dy,n);
 ## [poly2,S2] = wpolyfit(x,y,dy,n+1);
-## F = (S1.normr^2 - S2.normr^2)/(S2.normr^2/S2.df);
-## p = 1-f_cdf(F,1,S2.df);
+## F = (S1.normr^2 - S2.normr^2)/(S1.df-S2.df)/(S2.normr^2/S2.df);
+## p = 1-f_cdf(F,S1.df-S2.df,S2.df);
 ## @end example
 ## p is the probability of observing the improvement in chi^2 obtained
 ## by adding the extra parameter to the fit.  If p < 0.01, you can reject 
-## the higher order polynomial at the 1% level.
+## the lower order polynomial at the 1% level.
 ##
 ## You can estimate the uncertainty in the polynomial coefficients 
 ## themselves using

[Octave-cvsupdate] octave-forge/main/image/inst fspecial.m, NONE, 1.1

[soren hauberg <hauberg@us...>]

Update of /cvsroot/octave/octave-forge/main/image/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11355

Added Files:
	fspecial.m 
Log Message:
First revision

--- NEW FILE: fspecial.m ---
(This appears to be a binary file; contents omitted.)

[Octave-cvsupdate] octave-forge/main/image/inst imread.m,1.2,1.3

[soren hauberg <hauberg@us...>]

Update of /cvsroot/octave/octave-forge/main/image/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21710/main/image/inst

Modified Files:
	imread.m 
Log Message:
imread now uses tilde_expand

Index: imread.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/inst/imread.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imread.m	20 Dec 2006 12:59:30 -0000	1.2
+++ imread.m	23 Dec 2006 12:19:40 -0000	1.3
@@ -43,6 +43,7 @@
 	error("imread: filename must be a string")
     endif
 
+    filename = tilde_expand(filename);
     fn = file_in_path(IMAGE_PATH, filename);
     if isempty(fn)
 	error("imread: cannot find %s", filename);

[Octave-cvsupdate] octave-forge/main/odepkg/inst ode23.m, 1.5, 1.6 ode45.m, 1.5, 1.6 ode54.m, 1.6, 1.7 ode78.m, 1.6, 1.7 odeprint.m, 1.4, 1.5

[Thomas Treichl <treichl@us...>]

Update of /cvsroot/octave/octave-forge/main/odepkg/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30264

Modified Files:
	ode23.m ode45.m ode54.m ode78.m odeprint.m 
Log Message:
Read the local ChangeLog file /main/odepkg/doc/ChangeLog.


Index: ode45.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/odepkg/inst/ode45.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ode45.m	22 Oct 2006 17:49:59 -0000	1.5
+++ ode45.m	22 Dec 2006 16:09:44 -0000	1.6
@@ -386,35 +386,50 @@
 
   %# Print additional information if option Stats is set
   if (strcmp (vodeoptions.Stats, 'on') == true)
+    vhavestats = true;
+    vsuccess   = vcntloop-2;                    %# vcntloop from 2..end
+    vfailed    = (vcntcycles-1)-(vcntloop-2)+1; %# vcntcycl from 1..end
+    vfuncalls  = 13*(vcntcycles-1);
+    vludecomp  = 0;
+    vpartderv  = 0;
+    vxxxxxxxx  = 0;
     vmsg = sprintf ('Number of successful steps:   %d', ...
-                    vcntloop-1); disp (vmsg);
+                    vsuccess); disp (vmsg);
     vmsg = sprintf ('Number of failed attempts:    %d', ...
-                    ((vcntcycles-1)-(vcntloop-1))); disp (vmsg);
+                    vfailed); disp (vmsg);
     vmsg = sprintf ('Number of ode function calls: %d', ...
-                    (6*(vcntcycles-1))); disp (vmsg);
+                    vfuncalls); disp (vmsg);
   end
 
   if (nargout == 1)                 %# Sort output variables, depends on nargout
     varargout{1}.x = vretvaltime;   %# Time stamps are saved in field x
     varargout{1}.y = vretvalresult; %# Results are saved in field y
-    varargout{1}.solver = 'ode45';  %# Solver name is saved in field solver
-  elseif (nargout == 2)
-    varargout{1} = vretvaltime;     %# Time stamps are first output argument
-    varargout{2} = vretvalresult;   %# Results are second output argument
+    varargout{1}.solver = 'ode78';  %# Solver name is saved in field solver
     if (vhaveeventfunction == true) 
       varargout{1}.ie = vevent{2};  %# Index info which event occured
       varargout{1}.xe = vevent{3};  %# Time info when an event occured
       varargout{1}.ye = vevent{4};  %# Results when an event occured
     end
+    if (vhavestats == true)
+      varargout{1}.stats.success = vsuccess;
+      varargout{1}.stats.failed  = vfailed;    
+      varargout{1}.stats.fevals  = vfuncalls;  
+      varargout{1}.stats.partial = vpartderv; 
+      varargout{1}.stats.ludecom = vludecomp; 
+    end
+  elseif (nargout == 2)
+    varargout{1} = vretvaltime;     %# Time stamps are first output argument
+    varargout{2} = vretvalresult;   %# Results are second output argument
   elseif (nargout == 5)
     varargout{1} = vretvaltime;     %# Same as (nargout == 2)
     varargout{2} = vretvalresult;   %# Same as (nargout == 2)
+    varargout{3} = [];              %# LabMat doesn't accept lines like
+    varargout{4} = [];              %# varargout{3} = varargout{4} = [];
+    varargout{5} = [];
     if (vhaveeventfunction == true) 
       varargout{3} = vevent{3};     %# Time info when an event occured
       varargout{4} = vevent{4};     %# Results when an event occured
       varargout{5} = vevent{2};     %# Index info which event occured
-    else
-      varargout{3} = varargout{4} = varargout{5} = [];
     end
   %# else nothing will be returned, varargout{1} undefined
   end

Index: ode78.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/odepkg/inst/ode78.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ode78.m	22 Oct 2006 17:49:59 -0000	1.6
+++ ode78.m	22 Dec 2006 16:09:44 -0000	1.7
@@ -402,12 +402,19 @@
 
   %# Print additional information if option Stats is set
   if (strcmp (vodeoptions.Stats, 'on') == true)
+    vhavestats = true;
+    vsuccess   = vcntloop-2;                    %# vcntloop from 2..end
+    vfailed    = (vcntcycles-1)-(vcntloop-2)+1; %# vcntcycl from 1..end
+    vfuncalls  = 13*(vcntcycles-1);
+    vludecomp  = 0;
+    vpartderv  = 0;
+    vxxxxxxxx  = 0;
     vmsg = sprintf ('Number of successful steps:   %d', ...
-                    vcntloop-1); disp (vmsg);
+                    vsuccess); disp (vmsg);
     vmsg = sprintf ('Number of failed attempts:    %d', ...
-                    ((vcntcycles-1)-(vcntloop-1))); disp (vmsg);
+                    vfailed); disp (vmsg);
     vmsg = sprintf ('Number of ode function calls: %d', ...
-                    (13*(vcntcycles-1))); disp (vmsg);
+                    vfuncalls); disp (vmsg);
   end
 
   if (nargout == 1)                 %# Sort output variables, depends on nargout
@@ -419,18 +426,26 @@
       varargout{1}.xe = vevent{3};  %# Time info when an event occured
       varargout{1}.ye = vevent{4};  %# Results when an event occured
     end
+    if (vhavestats == true)
+      varargout{1}.stats.success = vsuccess;
+      varargout{1}.stats.failed  = vfailed;    
+      varargout{1}.stats.fevals  = vfuncalls;  
+      varargout{1}.stats.partial = vpartderv; 
+      varargout{1}.stats.ludecom = vludecomp; 
+    end
   elseif (nargout == 2)
     varargout{1} = vretvaltime;     %# Time stamps are first output argument
     varargout{2} = vretvalresult;   %# Results are second output argument
   elseif (nargout == 5)
     varargout{1} = vretvaltime;     %# Same as (nargout == 2)
     varargout{2} = vretvalresult;   %# Same as (nargout == 2)
+    varargout{3} = [];              %# LabMat doesn't accept lines like
+    varargout{4} = [];              %# varargout{3} = varargout{4} = [];
+    varargout{5} = [];
     if (vhaveeventfunction == true) 
       varargout{3} = vevent{3};     %# Time info when an event occured
       varargout{4} = vevent{4};     %# Results when an event occured
       varargout{5} = vevent{2};     %# Index info which event occured
-    else
-      varargout{3} = varargout{4} = varargout{5} = [];
     end
   %# else nothing will be returned, varargout{1} undefined
   end

Index: ode54.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/odepkg/inst/ode54.m,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ode54.m	22 Oct 2006 17:49:59 -0000	1.6
+++ ode54.m	22 Dec 2006 16:09:44 -0000	1.7
@@ -380,35 +380,50 @@
 
   %# Print additional information if option Stats is set
   if (strcmp (vodeoptions.Stats, 'on') == true)
+    vhavestats = true;
+    vsuccess   = vcntloop-2;                    %# vcntloop from 2..end
+    vfailed    = (vcntcycles-1)-(vcntloop-2)+1; %# vcntcycl from 1..end
+    vfuncalls  = 13*(vcntcycles-1);
+    vludecomp  = 0;
+    vpartderv  = 0;
+    vxxxxxxxx  = 0;
     vmsg = sprintf ('Number of successful steps:   %d', ...
-                    vcntloop-1); disp (vmsg);
+                    vsuccess); disp (vmsg);
     vmsg = sprintf ('Number of failed attempts:    %d', ...
-                    ((vcntcycles-1)-(vcntloop-1))); disp (vmsg);
+                    vfailed); disp (vmsg);
     vmsg = sprintf ('Number of ode function calls: %d', ...
-                    (7*(vcntcycles-1))); disp (vmsg);
+                    vfuncalls); disp (vmsg);
   end
 
   if (nargout == 1)                 %# Sort output variables, depends on nargout
     varargout{1}.x = vretvaltime;   %# Time stamps are saved in field x
     varargout{1}.y = vretvalresult; %# Results are saved in field y
-    varargout{1}.solver = 'ode54';  %# Solver name is saved in field solver
+    varargout{1}.solver = 'ode78';  %# Solver name is saved in field solver
     if (vhaveeventfunction == true) 
       varargout{1}.ie = vevent{2};  %# Index info which event occured
       varargout{1}.xe = vevent{3};  %# Time info when an event occured
       varargout{1}.ye = vevent{4};  %# Results when an event occured
     end
+    if (vhavestats == true)
+      varargout{1}.stats.success = vsuccess;
+      varargout{1}.stats.failed  = vfailed;    
+      varargout{1}.stats.fevals  = vfuncalls;  
+      varargout{1}.stats.partial = vpartderv; 
+      varargout{1}.stats.ludecom = vludecomp; 
+    end
   elseif (nargout == 2)
     varargout{1} = vretvaltime;     %# Time stamps are first output argument
     varargout{2} = vretvalresult;   %# Results are second output argument
   elseif (nargout == 5)
     varargout{1} = vretvaltime;     %# Same as (nargout == 2)
     varargout{2} = vretvalresult;   %# Same as (nargout == 2)
+    varargout{3} = [];              %# LabMat doesn't accept lines like
+    varargout{4} = [];              %# varargout{3} = varargout{4} = [];
+    varargout{5} = [];
     if (vhaveeventfunction == true) 
       varargout{3} = vevent{3};     %# Time info when an event occured
       varargout{4} = vevent{4};     %# Results when an event occured
       varargout{5} = vevent{2};     %# Index info which event occured
-    else
-      varargout{3} = varargout{4} = varargout{5} = [];
     end
   %# else nothing will be returned, varargout{1} undefined
   end

Index: odeprint.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/odepkg/inst/odeprint.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- odeprint.m	22 Oct 2006 17:49:59 -0000	1.4
+++ odeprint.m	22 Dec 2006 16:09:44 -0000	1.5
@@ -41,9 +41,11 @@
 
   if (strcmp (vflag, 'init') == true)
     fprintf (1, '%f%s\n', vt (1,1), sprintf (' %f', vy) );
+    fflush (1);
 
   elseif (isempty (vflag) == true) %# Return varargout{1}
     fprintf (1, '%f%s\n', vt (1,1), sprintf (' %f', vy) );
+    fflush (1);
     varargout{1} = true; 
     %# Do not stop the integration algorithm
     %# if varargout{1} = false; stop the integration algorithm

Index: ode23.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/odepkg/inst/ode23.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ode23.m	22 Oct 2006 17:49:59 -0000	1.5
+++ ode23.m	22 Dec 2006 16:09:44 -0000	1.6
@@ -375,35 +375,50 @@
 
   %# Print additional information if option Stats is set
   if (strcmp (vodeoptions.Stats, 'on') == true)
+    vhavestats = true;
+    vsuccess   = vcntloop-2;                    %# vcntloop from 2..end
+    vfailed    = (vcntcycles-1)-(vcntloop-2)+1; %# vcntcycl from 1..end
+    vfuncalls  = 13*(vcntcycles-1);
+    vludecomp  = 0;
+    vpartderv  = 0;
+    vxxxxxxxx  = 0;
     vmsg = sprintf ('Number of successful steps:   %d', ...
-                    vcntloop-1); disp (vmsg);
+                    vsuccess); disp (vmsg);
     vmsg = sprintf ('Number of failed attempts:    %d', ...
-                    ((vcntcycles-1)-(vcntloop-1))); disp (vmsg);
+                    vfailed); disp (vmsg);
     vmsg = sprintf ('Number of ode function calls: %d', ...
-                    (4*(vcntcycles-1))); disp (vmsg);
+                    vfuncalls); disp (vmsg);
   end
 
   if (nargout == 1)                 %# Sort output variables, depends on nargout
     varargout{1}.x = vretvaltime;   %# Time stamps are saved in field x
     varargout{1}.y = vretvalresult; %# Results are saved in field y
-    varargout{1}.solver = 'ode23';  %# Solver name is saved in field solver
+    varargout{1}.solver = 'ode78';  %# Solver name is saved in field solver
     if (vhaveeventfunction == true) 
       varargout{1}.ie = vevent{2};  %# Index info which event occured
       varargout{1}.xe = vevent{3};  %# Time info when an event occured
       varargout{1}.ye = vevent{4};  %# Results when an event occured
     end
+    if (vhavestats == true)
+      varargout{1}.stats.success = vsuccess;
+      varargout{1}.stats.failed  = vfailed;    
+      varargout{1}.stats.fevals  = vfuncalls;  
+      varargout{1}.stats.partial = vpartderv; 
+      varargout{1}.stats.ludecom = vludecomp; 
+    end
   elseif (nargout == 2)
     varargout{1} = vretvaltime;     %# Time stamps are first output argument
     varargout{2} = vretvalresult;   %# Results are second output argument
   elseif (nargout == 5)
     varargout{1} = vretvaltime;     %# Same as (nargout == 2)
     varargout{2} = vretvalresult;   %# Same as (nargout == 2)
+    varargout{3} = [];              %# LabMat doesn't accept lines like
+    varargout{4} = [];              %# varargout{3} = varargout{4} = [];
+    varargout{5} = [];
     if (vhaveeventfunction == true) 
       varargout{3} = vevent{3};     %# Time info when an event occured
       varargout{4} = vevent{4};     %# Results when an event occured
       varargout{5} = vevent{2};     %# Index info which event occured
-    else
-      varargout{3} = varargout{4} = varargout{5} = [];
     end
   %# else nothing will be returned, varargout{1} undefined
   end

[Octave-cvsupdate] octave-forge/main/image/inst imread.m,1.1,1.2

[David Bateman <adb014@us...>]

Update of /cvsroot/octave/octave-forge/main/image/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7643

Modified Files:
	imread.m 
Log Message:
Probe image depth from bits rather than Red field, fixes grayscale images (For Thomas Weber)

Index: imread.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/image/inst/imread.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- imread.m	20 Aug 2006 12:59:34 -0000	1.1
+++ imread.m	20 Dec 2006 12:59:30 -0000	1.2
@@ -28,6 +28,11 @@
 ##
 ## Modified: Stefan van der Walt <stefan@...>
 ## Date: 24 January 2005
+##
+## Modified: Thomas Weber <thomas.weber.mail@...>
+## Date: 20 December 2006
+## Change parsing of imagemagick's output to get the 'color' depth for grayscale
+## images
 
 function varargout = imread(filename, varargin)
     if (nargin != 1)
@@ -64,12 +69,12 @@
       break
     endif
     
-    [sys, ident] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
-				  fn));
+    [sys, ident] = system(sprintf('identify -verbose %s | grep -e "bits" -e Type',
+				  fn))
     if (sys != 0)
 	error("imread: error running ImageMagick's 'identify' on %s", fn)
     endif
-    depth = re_grab("Red: ([[:digit:]]{1,2})", ident);
+    depth = re_grab("([[:digit:]]{1,2})-bits", ident)
     imtype = re_grab("Type: ([[:alpha:]]*)", ident);
 
     depth = str2num(depth);

[Octave-cvsupdate] octave-forge/main/optiminterp/src configure.base, 1.1, 1.2

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5095/src

Modified Files:
	configure.base 
Log Message:
better autoconf test for Fortran 90

Index: configure.base
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/src/configure.base,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.base	12 Dec 2006 23:30:33 -0000	1.1
+++ configure.base	17 Dec 2006 22:28:59 -0000	1.2
@@ -332,6 +332,8 @@
 AC_COMPILE_IFELSE([[\
 module test_module; \
 contains; \
+subroutine foo()
+end subroutine 
 end module \
 ]], MKOCTFILE_FORTRAN_90=yes, MKOCTFILE_FORTRAN_90=no)
 

[Octave-cvsupdate] octave-forge/main/optiminterp/src example_optiminterp.F90, 1.1, 1.2

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3461/src

Modified Files:
	example_optiminterp.F90 
Log Message:
Fix example

Index: example_optiminterp.F90
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/src/example_optiminterp.F90,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- example_optiminterp.F90	12 Dec 2006 23:30:33 -0000	1.1
+++ example_optiminterp.F90	17 Dec 2006 21:01:58 -0000	1.2
@@ -53,8 +53,7 @@
  ! random_number in the hope that the results will be
  ! platform independent
 
- integer(8), parameter :: A = 1664525_8, B = 1013904223_8,
- &              Mo = 4294967296_8
+ integer(8), parameter :: A = 1664525_8, B = 1013904223_8, Mo = 4294967296_8
  integer(8) :: next = 0_8
 
 

[Octave-cvsupdate] octave-forge/extra/xraylib/src Makefile, 1.1.1.1, 1.2 xraylib.cc, 1.2, 1.3

[Teemu Ikonen <tpikonen@us...>]

Update of /cvsroot/octave/octave-forge/extra/xraylib/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27672

Modified Files:
	Makefile xraylib.cc 
Log Message:
Fix indexing errors, Makefile and init a few vars in xraylib


Index: Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/xraylib/src/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile	12 Dec 2006 15:27:46 -0000	1.1.1.1
+++ Makefile	15 Dec 2006 16:16:38 -0000	1.2
@@ -8,4 +8,4 @@
 	touch xraylib_stamp
 clean:
 	make -C xraylib/src clean
-	-rm *.o *~ xraylib_stamp xraylib.oct
+	-rm *.o *.oct *~ xraylib_stamp

Index: xraylib.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/xraylib/src/xraylib.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xraylib.cc	14 Dec 2006 16:34:14 -0000	1.2
+++ xraylib.cc	15 Dec 2006 16:16:38 -0000	1.3
@@ -64,7 +64,7 @@
    for(int i = 0; i < p.length(); i++) { \
       for(int j = 0; j < m.length(); j++) { \
          for(int k = 0; k < n.length(); k++) { \
-            y(k, j, i) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(j)), \
+            y(k, j, i) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(k)), \
                                                    static_cast<T2>(m.xelem(j)), \
                                                    static_cast<T3>(p.xelem(i)))); \
          } \
@@ -89,8 +89,8 @@
       idx(2) = k; \
       for(int l = 0; l < n.length(); l++) { \
       idx(3) = i; \
-	 y(idx) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(j)), \
-                                            static_cast<T2>(m.xelem(j)), \
+	 y(idx) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(l)), \
+                                            static_cast<T2>(m.xelem(k)), \
                                             static_cast<T3>(p.xelem(j)), \
                                             static_cast<T4>(q.xelem(i)))); \
       } } } \

[Octave-cvsupdate] octave-forge/extra/xraylib/src/xraylib/src xrayvars.c, 1.1.1.1, 1.2

[Teemu Ikonen <tpikonen@us...>]

Update of /cvsroot/octave/octave-forge/extra/xraylib/src/xraylib/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27672/xraylib/src

Modified Files:
	xrayvars.c 
Log Message:
Fix indexing errors, Makefile and init a few vars in xraylib


Index: xrayvars.c
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/xraylib/src/xraylib/src/xrayvars.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- xrayvars.c	12 Dec 2006 15:28:00 -0000	1.1.1.1
+++ xrayvars.c	15 Dec 2006 16:16:38 -0000	1.2
@@ -8,8 +8,8 @@
 /////            Variables                                       /////
 //////////////////////////////////////////////////////////////////////
 
-int HardExit;
-int ExitStatus;
+int HardExit = 0;
+int ExitStatus = 0;
 char XRayLibDir[MAXFILENAMESIZE];
 
 char ShellName[][5] = {

[Octave-cvsupdate] octave-forge/extra/xraylib/src xraylib.cc, 1.1.1.1, 1.2

[Teemu Ikonen <tpikonen@us...>]

Update of /cvsroot/octave/octave-forge/extra/xraylib/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29742

Modified Files:
	xraylib.cc 
Log Message:
Make 1-argument functions work, fix numerous type errors in macro calls.


Index: xraylib.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/xraylib/src/xraylib.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- xraylib.cc	12 Dec 2006 15:27:46 -0000	1.1.1.1
+++ xraylib.cc	14 Dec 2006 16:34:14 -0000	1.2
@@ -39,8 +39,10 @@
    for(int i = 0; i < n.length(); i++) { \
       y(i) = static_cast<double>(FNAME(static_cast<T1>(n.xelem(i)))); \
    } \
-__MULTIEND__
-
+   y.resize(dim_vector(y.dims().elem(0), 1)); \
+   retval = octave_value(y).squeeze(); \
+   return retval; \
+}
 
 #define DEF_MULTIMAPPER2(ONAME, FNAME, T1, T2, DOCSTRING) \
 __MULTIBEG__(ONAME, 2, DOCSTRING) \
@@ -122,7 +124,7 @@
 @end deftypefn\n\
 ")		      
 
-DEF_MULTIMAPPER3(CS_FluorLine, CS_FluorLine, int, int, int, "\
+DEF_MULTIMAPPER3(CS_FluorLine, CS_FluorLine, int, int, float, "\
   -*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{a} =} CS_FluorLine (@var{Z}, @var{E},@var{line})\n\
 \n\
@@ -130,7 +132,6 @@
 \n\
 @example\n\
 @var{Z} : atomic number\n\
-@...{E} : energy (keV)\n\
 @var{line} :\n\
 KA_LINE 0\n\
 KB_LINE 1\n\
@@ -138,6 +139,7 @@
 LB_LINE 3\n\
 (Individual lines are also defined with negative flags\n\
 See file lines.h in src directory for equivalences.)\n\
+@var{E} : energy (keV)\n\
 @end example\n\
 @end deftypefn\n\
 ")
@@ -260,7 +262,7 @@
 @end deftypefn\n\
 ")    									    
 
-DEF_MULTIMAPPER3(DCSP_KN, DCSP_KN, int, int, int, "\
+DEF_MULTIMAPPER3(DCSP_KN, DCSP_KN, float, float, float, "\
   -*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{a} =} DCSP_KN (@var{E}, @var{theta}, @var{phi})\n\
 \n\
@@ -275,7 +277,7 @@
 @end deftypefn\n\
 ")    
 
-DEF_MULTIMAPPER2(DCSP_Thoms, DCSP_Thoms, int, int, "\
+DEF_MULTIMAPPER2(DCSP_Thoms, DCSP_Thoms, float, float, "\
   -*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{a} =} DCSP_Thoms (@var{theta}, @var{phi})\n\
 \n\
@@ -334,7 +336,7 @@
 @end deftypefn\n\
 ")
 
-DEF_MULTIMAPPER1(DCS_Thoms, DCS_Thoms, int, "\
+DEF_MULTIMAPPER1(DCS_Thoms, DCS_Thoms, float, "\
   -*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{a} =} DCS_Thoms (@var{theta})\n\
 \n\
@@ -439,7 +441,7 @@
 @end deftypefn\n\
 ")
    
-DEF_MULTIMAPPER2(CS_Photo, CS_Photo, int, int, "\
+DEF_MULTIMAPPER2(CS_Photo, CS_Photo, int, float, "\
   -*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{a} =} CS_Photo (@var{Z}, @var{E})\n\
 \n\

[Octave-cvsupdate] octave-forge/main/optiminterp/inst example_optiminterp.m, 1.1, 1.2 optiminterp1.m, 1.2, 1.3 optiminterp2.m, 1.2, 1.3 optiminterp3.m, 1.2, 1.3

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7638/inst

Modified Files:
	example_optiminterp.m optiminterp1.m optiminterp2.m 
	optiminterp3.m 
Log Message:
Improve example and fix typos

Index: optiminterp2.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/inst/optiminterp2.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- optiminterp2.m	13 Dec 2006 16:56:11 -0000	1.2
+++ optiminterp2.m	13 Dec 2006 17:20:30 -0000	1.3
@@ -31,7 +31,7 @@
 ##
 ## The background field of the optimal interpolation is zero.
 ## For a different background field, the background field
-## must be substracted from the observation, the difference 
+## must be subtracted from the observation, the difference 
 ## is mapped by OI onto the background grid and finally the
 ## background is added back to the interpolated field.
 ## The error variance of the background field is assumed to 

Index: example_optiminterp.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/inst/example_optiminterp.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- example_optiminterp.m	12 Dec 2006 23:29:54 -0000	1.1
+++ example_optiminterp.m	13 Dec 2006 17:20:30 -0000	1.2
@@ -1,6 +1,13 @@
 % Example program of the optimal interpolation toolbox
 
 
+% the grid onto which the observations are interpolated
+
+[xi,yi] = ndgrid(linspace(0,1,100));
+
+% background estimate or first guess
+xb = 10 + xi;
+
 % number of observations to interpolate
 
 on = 200;
@@ -13,15 +20,12 @@
 
 % the underlying function to interpolate
 
-f = sin(6*x) .* cos(6*y);
-
-% the error variance of the observations
-
-var = 0.0 * ones(on,1);
+yo = 10 + x + sin(6*x) .* cos(6*y);
 
-% the grid onto which the observations are interpolated
+% the error variance of the observations divided by the error 
+% variance of the background field
 
-[xi,yi] = ndgrid(linspace(0,1,100));
+var = 0.1 * ones(on,1);
 
 % the correlation length in x and y direction
 
@@ -32,8 +36,17 @@
 
 m = 30;
 
+% subtract the first guess from the observations
+% (DON'T FORGET THIS - THIS IS VERY IMPORTANT)
+
+Hxb = interp2(xi(:,1),yi(1,:),xb',x,y);
+f = yo - Hxb;
+
 % run the optimal interpolation
 % fi is the interpolated field and vari is its error variance
 
 [fi,vari] = optiminterp2(x,y,f,var,lenx,leny,m,xi,yi);
 
+% Add the first guess back
+
+xa = fi + xb;
\ No newline at end of file

Index: optiminterp1.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/inst/optiminterp1.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- optiminterp1.m	13 Dec 2006 16:56:11 -0000	1.2
+++ optiminterp1.m	13 Dec 2006 17:20:30 -0000	1.3
@@ -30,7 +30,7 @@
 ##
 ## The background field of the optimal interpolation is zero.
 ## For a different background field, the background field
-## must be substracted from the observation, the difference 
+## must be subtracted from the observation, the difference 
 ## is mapped by OI onto the background grid and finally the
 ## background is added back to the interpolated field.
 ## @end deftypefn

Index: optiminterp3.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/inst/optiminterp3.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- optiminterp3.m	13 Dec 2006 16:56:11 -0000	1.2
+++ optiminterp3.m	13 Dec 2006 17:20:30 -0000	1.3
@@ -32,7 +32,7 @@
 ##
 ## The background field of the optimal interpolation is zero.
 ## For a different background field, the background field
-## must be substracted from the observation, the difference 
+## must be subtracted from the observation, the difference 
 ## is mapped by OI onto the background grid and finally the
 ## background is added back to the interpolated field.
 ##

[Octave-cvsupdate] octave-forge/main/optiminterp/src optiminterp.cc, 1.2, 1.3

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7638/src

Modified Files:
	optiminterp.cc 
Log Message:
Improve example and fix typos

Index: optiminterp.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/src/optiminterp.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- optiminterp.cc	13 Dec 2006 16:56:11 -0000	1.2
+++ optiminterp.cc	13 Dec 2006 17:20:30 -0000	1.3
@@ -1,5 +1,5 @@
 /*
-  n-dimentional optimal interpolation
+  n-dimensional optimal interpolation
   Copyright (C) 2005 Alexander Barth <abarth@...>
 
   This program is free software; you can redistribute it and/or
@@ -51,7 +51,7 @@
 \n\
 The background field of the optimal interpolation is zero.\n\
 For a different background field, the background field\n\
-must be substracted from the observation, the difference \n\
+must be subtracted from the observation, the difference \n\
 is mapped by OI onto the background grid and finally the\n\
 background is added back to the interpolated field.\n\
 \n\
@@ -81,7 +81,7 @@
    In Octave and Matlab convention (see gridatan), the positions of series 
    of points in n-D space is represented by an m-by-n matrix. However, it is more
    efficient to represent it as a n-ny-m matrix. The Fortran code uses
-   the later convension. Therefore we need to transpose the following 
+   the later convention. Therefore we need to transpose the following 
    matrices:
   */
 
@@ -112,7 +112,7 @@
   }
 
   if (ox.cols() != of.cols() || ox.cols() != ovar.numel()) {
-    error ("optiminterp: number of colums in ox must be equal to the number of elements in of and ovar");
+    error ("optiminterp: number of columns in ox must be equal to the number of elements in of and ovar");
     return octave_value();
   }
 

[Octave-cvsupdate] octave-forge/main/optiminterp/inst optiminterp1.m, 1.1, 1.2 optiminterp2.m, 1.1, 1.2 optiminterp3.m, 1.1, 1.2

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31100/inst

Modified Files:
	optiminterp1.m optiminterp2.m optiminterp3.m 
Log Message:
make the use of the correlation length uniform

Index: optiminterp2.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/inst/optiminterp2.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- optiminterp2.m	12 Dec 2006 23:29:55 -0000	1.1
+++ optiminterp2.m	13 Dec 2006 16:56:11 -0000	1.2
@@ -73,7 +73,7 @@
 
 %whos ox gx f
 
-[fi,vari] = optiminterp(ox,f,var,1./[lenx leny],m,gx);
+[fi,vari] = optiminterp(ox,f,var,[lenx leny],m,gx);
 
 fi = reshape(fi,[size(xi) nf]);
 vari = reshape(vari,size(xi));

Index: optiminterp1.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/inst/optiminterp1.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- optiminterp1.m	12 Dec 2006 23:29:55 -0000	1.1
+++ optiminterp1.m	13 Dec 2006 16:56:11 -0000	1.2
@@ -15,7 +15,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ## -*- texinfo -*-
-## @deftypefn {Loadable Function} {[@var{fi},@var{vari}] = } optiminterp(@var{x},@var{f},@var{var},@var{lenx},@var{m},@var{xi})
+## @deftypefn {Loadable Function} {[@var{fi},@var{vari}]} = optiminterp(@var{x},@var{f},@var{var},@var{lenx},@var{m},@var{xi})
 ## Performs a 1D-optimal interpolation (objective analysis).
 ##
 ## Every elements in @var{f} corresponds to a data point (observation)
@@ -57,7 +57,7 @@
 ox(:,1) = x(:);
 
 %whos ox f var lenx m
-[fi,vari] = optiminterp(ox,f,var,1/lenx,m,gx);
+[fi,vari] = optiminterp(ox,f,var,lenx,m,gx);
 
 
 %fi = reshape(fi,[numel(xi) size(f,2)]);

Index: optiminterp3.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/inst/optiminterp3.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- optiminterp3.m	12 Dec 2006 23:29:55 -0000	1.1
+++ optiminterp3.m	13 Dec 2006 16:56:11 -0000	1.2
@@ -75,7 +75,7 @@
 
 f=reshape(f,[on nf]);
 
-[fi,vari] = optiminterp(ox,f,var,1./[lenx leny lenz],m,gx);
+[fi,vari] = optiminterp(ox,f,var,[lenx leny lenz],m,gx);
 
 fi = reshape(fi,[size(xi) nf]);
 vari = reshape(vari,size(xi));

[Octave-cvsupdate] octave-forge/main/optiminterp/src optiminterp.cc, 1.1, 1.2

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31100/src

Modified Files:
	optiminterp.cc 
Log Message:
make the use of the correlation length uniform

Index: optiminterp.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/optiminterp/src/optiminterp.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- optiminterp.cc	12 Dec 2006 23:30:36 -0000	1.1
+++ optiminterp.cc	13 Dec 2006 16:56:11 -0000	1.2
@@ -34,9 +34,31 @@
 }
 
 DEFUN_DLD (optiminterp, args, ,
-	   "- Loadable Function: [gf,gvar] = optiminterp(ox,of,ovar,param,m,gx)\n\
-     \n\
-     Performs an N-dimensional optimal interpolation.")
+"-*- texinfo -*-\n\
+@deftypefn {Loadable Function} {[@var{fi},@var{vari}]} = optiminterp(@var{x},@var{f},@var{var},@var{len},@var{m},@var{xi}) \n\
+Performs an @var{n}-dimensional optimal interpolation. \n\
+\n\
+Every elements in @var{f} corresponds to a data point (observation)\n\
+at location the @var{x(:,1)}, @var{x(:,2)},... @var{x(:,n)} in a @var{n}-dimensional space with the error variance @var{var}\n\
+\n\
+Each element of the @var{n} by 1 vector @var{len} is the correlation length in the corresponding direction.\n\
+\n\
+@var{m} represents the number of influential points.\n\
+\n\
+@var{xi(:,1)}, @var{xi(:,2)} ... @var{xi(:,n)} are the coordinates of the points where the field is\n\
+interpolated. @var{fi} is the interpolated field and @var{vari} is \n\
+its error variance.\n\
+\n\
+The background field of the optimal interpolation is zero.\n\
+For a different background field, the background field\n\
+must be substracted from the observation, the difference \n\
+is mapped by OI onto the background grid and finally the\n\
+background is added back to the interpolated field.\n\
+\n\
+The error variance of the background field is assumed to \n\
+have a error variance of one. The error variances of the observations need to be scaled accordingly. \n\
+@end deftypefn\n\
+@seealso{optiminterp1,optiminterp2,optiminterp3}\n")
 {
   octave_value_list retval;
   
@@ -52,6 +74,9 @@
   int m = (int)args(4).scalar_value();
   Matrix gx = args(5).matrix_value();
 
+  // The Fortran routine expects the inverse of the correlation length
+  param = 1/param;
+
   /*
    In Octave and Matlab convention (see gridatan), the positions of series 
    of points in n-D space is represented by an m-by-n matrix. However, it is more

[Octave-cvsupdate] octave-forge/main/optiminterp/inst test_optiminterp_mult.m, NONE, 1.1 test_optiminterp2.m, 1.1, NONE

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23603

Added Files:
	test_optiminterp_mult.m 
Removed Files:
	test_optiminterp2.m 
Log Message:
Rename test

--- test_optiminterp2.m DELETED ---

--- NEW FILE: test_optiminterp_mult.m ---
% Tests 1D, 2D and 3D optimal interpolation.
% All tests should pass; any error indicates that either 
% there is a bug in the optimal interpolation package or 
% that it is incrorrectly installed.

function test_optiminterp_mult

more off

printf('Testing multiple 1D-optimal interpolation: ');

try
  % grid of background field
  xi = linspace(0,1,50)';
  fi_ref(:,1) = sin( xi*6 );
  fi_ref(:,2) = cos( xi*6 );

  % grid of observations
  x = linspace(0,1,20)';

  on = numel(x);
  var = 0.01 * ones(on,1);
  f(:,1) = sin( x*6 );
  f(:,2) = cos( x*6 );

  m = 15;

  [fi,vari] = optiminterp1(x,f,var,0.1,m,xi);


  rms = sqrt(mean((fi_ref(:) - fi(:)).^2));

  if (rms > 0.005) 
    error('unexpected large difference with reference field');
  end

  disp('OK');

catch
  disp('failed');
  disp(lasterr);
end



printf('Testing multiple 2D-optimal interpolation: ');

try
  clear fi_ref f
  % grid of background field
  [xi,yi] = ndgrid(linspace(0,1,30));

  fi_ref(:,:,1) = sin( xi*6 ) .* cos( yi*6);
  fi_ref(:,:,2) = cos( xi*6 ) .* sin( yi*6);

  % grid of observations
  [x,y] = ndgrid(linspace(0,1,20));

  on = numel(x);
  var = 0.01 * ones(on,1);
  f(:,:,1) = sin( x*6 ) .* cos( y*6);
  f(:,:,2) = cos( x*6 ) .* sin( y*6);

  m = 30;

  [fi,vari] = optiminterp2(x,y,f,var,0.1,0.1,m,xi,yi);


  rms = sqrt(mean((fi_ref(:) - fi(:)).^2));

  if (rms > 0.005) 
    error('unexpected large difference with reference field');
  end

  disp('OK');

catch
  disp('failed');
  disp(lasterr);
end

printf('Testing multiple 3D-optimal interpolation: ');


try
   clear fi_ref f

  % grid of background field
  [xi,yi,zi] = ndgrid(linspace(0,1,15));
  
  fi_ref(:,:,:,1) = sin(6*xi) .* cos(6*yi) .* sin(6*zi);
  fi_ref(:,:,:,2) = sin(6*xi) .* cos(6*yi) .* sin(6*zi);

  % grid of observations
  [x,y,z] = ndgrid(linspace(0,1,10));

  on = numel(x);
  var = 0.01 * ones(on,1);
  f(:,:,:,1) = sin(6*x) .* cos(6*y) .* sin(6*z);
  f(:,:,:,2) = sin(6*x) .* cos(6*y) .* sin(6*z);

  m = 20;

  [fi,vari] = optiminterp3(x,y,z,f,var,0.1,0.1,0.1,m,xi,yi,zi);


  rms = sqrt(mean((fi_ref(:) - fi(:)).^2));

  if (rms > 0.04) 
    error('unexpected large difference with reference field');
  end

  disp('OK');

catch
  disp('failed');
  disp(lasterr);
end

[Octave-cvsupdate] octave-forge/main/optiminterp/src Makefile, NONE, 1.1

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14640

Added Files:
	Makefile 
Log Message:
Initial import

--- NEW FILE: Makefile ---

sinclude Makeconf

SOURCES=optiminterp.cc optimal_interpolation.F90 optiminterp_wrapper.F90

OBJECTS=optiminterp.o optimal_interpolation.o optiminterp_wrapper.o

TARGETS=optiminterp.oct

# Rule for compiling Fortran 90 programs

%.o: %.F90 ; $(MKOCTFILE) -c $<

ifeq ($(MKOCTFILE_FORTRAN_90),yes)
all: $(TARGETS)
else
all:
        @echo "*** mkoctfile lacks Fortran 90 support"; false
endif


optiminterp.oct: $(OBJECTS)
	$(MKOCTFILE) -o $@ $(OBJECTS) $(LIBS)

check:
	octave --silent --norc --eval test_optiminterp

clean:
	rm -f *.o *.oct *~ *.mod

[Octave-cvsupdate] octave-forge/extra/pdb/src Makefile,1.1,1.2

[Teemu Ikonen <tpikonen@us...>]

Update of /cvsroot/octave/octave-forge/extra/pdb/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25041

Modified Files:
	Makefile 
Log Message:
Fix Makefile


Index: Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/pdb/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	25 Aug 2006 19:49:30 -0000	1.1
+++ Makefile	13 Dec 2006 15:14:13 -0000	1.2
@@ -1,6 +1,4 @@
-all: $(wildcard *.cc)
-
-%.oct: %.cc
-	mkoctfile $<
+all: 
+	mkoctfile creadpdb.cc
 
 clean: ; -$(RM) *.o core octave-core *.oct *~

[Octave-cvsupdate] octave-forge/extra/xraylib PKG_ADD,1.1.1.1,1.2

[Teemu Ikonen <tpikonen@us...>]

Update of /cvsroot/octave/octave-forge/extra/xraylib
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv425

Modified Files:
	PKG_ADD 
Log Message:
Add missing CS_Compt


Index: PKG_ADD
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/xraylib/PKG_ADD,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- PKG_ADD	12 Dec 2006 15:27:46 -0000	1.1.1.1
+++ PKG_ADD	13 Dec 2006 14:13:30 -0000	1.2
@@ -21,6 +21,7 @@
 autoload ("CS_Total", "xraylib.oct");
 autoload ("CS_Photo", "xraylib.oct");
 autoload ("CS_Rayl", "xraylib.oct");
+autoload ("CS_Compt", "xraylib.oct");
 autoload ("CSb_FluorLine", "xraylib.oct");
 autoload ("CSb_Total", "xraylib.oct");
 autoload ("CSb_Photo", "xraylib.oct");

[Octave-cvsupdate] octave-forge/main/optiminterp/src .cvsignore, NONE, 1.1 autogen.sh, NONE, 1.1

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28182/src

Added Files:
	.cvsignore autogen.sh 
Log Message:


--- NEW FILE: .cvsignore ---
configure
autom4te.cache
*~
*.oct
*.mod
--- NEW FILE: autogen.sh ---
#! /bin/sh

## Generate ./configure
rm -f configure.in
echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" > configure.in
cat configure.base >> configure.in
cat <<EOF >> configure.in
  AC_OUTPUT(\$CONFIGURE_OUTPUTS)
  dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions

  echo " "
  echo "  \"\\\$prefix\" is \$prefix"
  echo "  \"\\\$exec_prefix\" is \$exec_prefix"
  AC_MSG_RESULT([\$STATUS_MSG

find . -name NOINSTALL -print    # shows which toolboxes won't be installed
])
EOF

autoconf && rm -f configure.in

[Octave-cvsupdate] octave-forge/main/optiminterp/inst .cvsignore, NONE, 1.1

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp/inst
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28182/inst

Added Files:
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
configure
autom4te.cache

[Octave-cvsupdate] octave-forge/main/optiminterp COPYING, NONE, 1.1 DESCRIPTION, NONE, 1.1 INDEX, NONE, 1.1

[alex <abarth93@us...>]

Update of /cvsroot/octave/octave-forge/main/optiminterp
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27772

Added Files:
	COPYING DESCRIPTION INDEX 
Log Message:


--- NEW FILE: INDEX ---
optiminterp >> OptimInterp
OptimInterp
 optiminterp1 
 optiminterp2
 optiminterp3
 optiminterp
Examples
 example_optiminterp


--- NEW FILE: DESCRIPTION ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    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, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Lesser General
Public License instead of this License.