[Pkg-octave-commit] r1935 - in octave-forge-pkgs/octave-octgpr/trunk/debian: . patches

Fri May 16 19:29:01 UTC 2008

Author: thomas-guest
Date: 2008-05-16 19:29:00 +0000 (Fri, 16 May 2008)
New Revision: 1935

Added:
   octave-forge-pkgs/octave-octgpr/trunk/debian/octave-octgpr.examples
   octave-forge-pkgs/octave-octgpr/trunk/debian/patches/rev5054.diff
Modified:
   octave-forge-pkgs/octave-octgpr/trunk/debian/changelog
   octave-forge-pkgs/octave-octgpr/trunk/debian/check.m
   octave-forge-pkgs/octave-octgpr/trunk/debian/control
   octave-forge-pkgs/octave-octgpr/trunk/debian/patches/series
Log:
Prepration for next release
 - Adapt patches
 - demo_octgpr changed, adapt check.m accordingly
 - save images from demo_octpgr in doc/examples directory


Modified: octave-forge-pkgs/octave-octgpr/trunk/debian/changelog
===================================================================

--- octave-forge-pkgs/octave-octgpr/trunk/debian/changelog	2008-05-16 14:09:20 UTC (rev 1934)
+++ octave-forge-pkgs/octave-octgpr/trunk/debian/changelog	2008-05-16 19:29:00 UTC (rev 1935)
@@ -6,6 +6,10 @@
   [ Thomas Weber ]
   * Refresh gfortran-fpic.diff against new upstream release
   * Adapt mister-proper.diff to upstream changes.
+  * New patch: rev5054.diff, bumping the demo_octgrp.m skript to the
+    respective upstream revision. Non-interactive plotting works as part of
+    the build process with this and the resulting images can be saved.
+  * Add gnuplot-nox to build-depends, in order to save images during demo run.
 
  -- Ólafur Jens Sigurðsson <ojsbug at gmail.com>  Sun, 04 May 2008 16:04:36 +0200
 

Modified: octave-forge-pkgs/octave-octgpr/trunk/debian/check.m
===================================================================
--- octave-forge-pkgs/octave-octgpr/trunk/debian/check.m	2008-05-16 14:09:20 UTC (rev 1934)
+++ octave-forge-pkgs/octave-octgpr/trunk/debian/check.m	2008-05-16 19:29:00 UTC (rev 1935)
@@ -1,4 +1,7 @@
-function noop, endfunction ;
-dispatch ("pause", "noop", "any");
-figure(1, "visible", "off");
-demo_octgpr;
+# call once for setting non-interactive mode
+demo_octgpr("octgpr%d_%d.eps")
+
+# run the two demos
+demo_octgpr(1);
+demo_octgpr(2);
+

Modified: octave-forge-pkgs/octave-octgpr/trunk/debian/control
===================================================================
--- octave-forge-pkgs/octave-octgpr/trunk/debian/control	2008-05-16 14:09:20 UTC (rev 1934)
+++ octave-forge-pkgs/octave-octgpr/trunk/debian/control	2008-05-16 19:29:00 UTC (rev 1935)
@@ -6,7 +6,7 @@
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.5.5), quilt
+Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.5.5), gnuplot-nox, quilt
 Standards-Version: 3.7.3
 Homepage: http://octave.sourceforge.net/octgpr/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave-forge-pkgs/octave-octgpr/trunk

Added: octave-forge-pkgs/octave-octgpr/trunk/debian/octave-octgpr.examples
===================================================================
--- octave-forge-pkgs/octave-octgpr/trunk/debian/octave-octgpr.examples	                        (rev 0)
+++ octave-forge-pkgs/octave-octgpr/trunk/debian/octave-octgpr.examples	2008-05-16 19:29:00 UTC (rev 1935)
@@ -0,0 +1 @@
+*.eps

Added: octave-forge-pkgs/octave-octgpr/trunk/debian/patches/rev5054.diff
===================================================================
--- octave-forge-pkgs/octave-octgpr/trunk/debian/patches/rev5054.diff	                        (rev 0)
+++ octave-forge-pkgs/octave-octgpr/trunk/debian/patches/rev5054.diff	2008-05-16 19:29:00 UTC (rev 1935)
@@ -0,0 +1,125 @@
+Index: main/octgpr/inst/demo_octgpr.m
+===================================================================
+--- main/octgpr/inst/demo_octgpr.m	(Revision 5053)
++++ main/octgpr/inst/demo_octgpr.m	(Revision 5054)
+@@ -37,16 +37,43 @@
+ % @end itemize
+ % @end deftypefn
+ function demo_octgpr (number, varargin)
+-  switch (number)
+-  case 1
+-    demo_octgpr1 (varargin{:})
+-  case 2
+-    demo_octgpr2 (varargin{:})
+-  otherwise
+-    error ("demo_octgpr: invalid demo number")
+-  endswitch
++  
++  global prntfmt = '';
++
++  if (nargin < 1)
++    print_usage ();
++  elseif (ischar (number))
++    prntfmt = number;
++  elseif (isscalar (number))
++    figure ();
++    if (! isempty (prntfmt))
++      figure (gcf, "visible", "off");
++    endif
++
++    switch (number)
++    case 1
++      demo_octgpr1 (varargin{:})
++    case 2
++      demo_octgpr2 (varargin{:})
++    otherwise
++      error ("demo_octgpr: invalid demo number")
++    endswitch
++  else
++    print_usage ();
++  endif
++
+ endfunction
+ 
++function demo_octgpr_pause (idemo, iplot)
++  global prntfmt;
++  if (isempty (prntfmt))
++    pause;
++  else
++    print (sprintf (prntfmt, idemo, iplot));
++    fflush (stdout);
++  endif
++endfunction
++
+ % define the test function (the well-known matlab "peaks" plus some sines)
+ function z = testfun1 (x, y)
+   z = 4 + 3 * (1-x).^2 .* exp(-(x.^2) - (y+1).^2) ...
+@@ -56,6 +83,7 @@
+ endfunction
+ 
+ function demo_octgpr1 (nsamp = 150)
++  global prntfmt;
+   tit = "a peaked surface";
+   disp (tit);
+ 
+@@ -71,7 +99,7 @@
+   title (tit);
+   subplot (2, 2, 3);
+   contourf (xi, yi, zi, 20);
+-  pause;
++  demo_octgpr_pause (1, 1);
+ 
+   tit = sprintf ("sampled at %d random points", nsamp);
+   disp (tit);
+@@ -87,7 +115,7 @@
+   title (tit);
+   subplot (2, 2, 4);
+   plot (xs, ys, ".+");
+-  pause
++  demo_octgpr_pause (1, 2);
+ 
+   tit = "GPR model with heuristic hypers";
+   disp (tit);
+@@ -104,7 +132,7 @@
+   contourf (xi, yi, zm, 20);
+   plot (xs, ys, "+6");
+   hold off
+-  pause
++  demo_octgpr_pause (1, 3);
+ 
+   tit = "GPR model with MLE training";
+   disp (tit);
+@@ -121,20 +149,21 @@
+   contourf (xi, yi, zm, 20);
+   plot (xs, ys, "+6");
+   hold off
+-  pause
++  demo_octgpr_pause (1, 4);
++  close
+ 
+-  close
+ endfunction
+ 
+ function demo_octgpr2 (ncnt = 50, npt = 500)
+ 
++  global prntfmt;
+   npt = ncnt*ceil (npt/ncnt);
+   U = rand (ncnt, 2);
+   cs = min (pdist2_mw (U, 2) + diag (Inf (ncnt, 1)));
+   X = repmat (U, npt/ncnt, 1) + repmat (cs', npt/ncnt, 2) .* randn (npt, 2);
+   disp ("slightly clustered random points")
+   plot (X(:,1), X(:,2), "+");
+-  pause
++  demo_octgpr_pause (2, 1);
+ 
+   [U, ur] = rbf_centers(X, ncnt);
+ 
+@@ -147,7 +176,7 @@
+     line (xc, yc);
+   endfor
+   hold off
+-  pause
++  demo_octgpr_pause (2, 2);
+   close
+ 
+ endfunction

Modified: octave-forge-pkgs/octave-octgpr/trunk/debian/patches/series
===================================================================
--- octave-forge-pkgs/octave-octgpr/trunk/debian/patches/series	2008-05-16 14:09:20 UTC (rev 1934)
+++ octave-forge-pkgs/octave-octgpr/trunk/debian/patches/series	2008-05-16 19:29:00 UTC (rev 1935)
@@ -1,2 +1,3 @@
 gfortran-fpic.diff
 mister-proper.diff
+rev5054.diff -p2


