From: <car...@us...> - 2011-11-03 01:27:54
|
Revision: 8950 http://octave.svn.sourceforge.net/octave/?rev=8950&view=rev Author: carandraug Date: 2011-11-03 01:27:47 +0000 (Thu, 03 Nov 2011) Log Message: ----------- removal of deprecated functions: loadimage, spdiag, split, clearplot, diag, weibull_cdf, clg Modified Paths: -------------- trunk/octave-forge/extra/MacOSX/src/image.m.in trunk/octave-forge/extra/Windows/src/image.m.in trunk/octave-forge/main/comm/inst/comms.m trunk/octave-forge/main/econometrics/inst/kernel_example.m trunk/octave-forge/main/fixed/inst/fixedpoint.m trunk/octave-forge/main/gsl/inst/test_ellint.m trunk/octave-forge/main/gsl/inst/test_hyperg.m trunk/octave-forge/main/gsl/src/test/check.m trunk/octave-forge/main/image/INDEX trunk/octave-forge/main/miscellaneous/inst/hilbert_curve.m trunk/octave-forge/main/miscellaneous/inst/peano_curve.m trunk/octave-forge/main/miscellaneous/inst/xmlwrite.m trunk/octave-forge/main/miscellaneous/inst/z_curve.m trunk/octave-forge/main/octgpr/inst/rbf_centers.m trunk/octave-forge/main/odebvp/inst/lfdif.m trunk/octave-forge/main/plot/inst/dxfwrite.m trunk/octave-forge/main/signal/inst/pburg.m trunk/octave-forge/main/signal/inst/pyulear.m trunk/octave-forge/main/statistics/inst/anderson_darling_test.m Modified: trunk/octave-forge/extra/MacOSX/src/image.m.in =================================================================== --- trunk/octave-forge/extra/MacOSX/src/image.m.in 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/extra/MacOSX/src/image.m.in 2011-11-03 01:27:47 UTC (rev 8950) @@ -40,7 +40,7 @@ if (nargin == 0) ## Load Bobbie Jo Richardson (Born 3/16/94) - A = loadimage ("default.img"); + A = imread ("default.img"); zoom = 2; elseif (nargin == 1) A = x; Modified: trunk/octave-forge/extra/Windows/src/image.m.in =================================================================== --- trunk/octave-forge/extra/Windows/src/image.m.in 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/extra/Windows/src/image.m.in 2011-11-03 01:27:47 UTC (rev 8950) @@ -38,7 +38,7 @@ function image (x, y, A, zoom) if (nargin == 0) ## Load Bobbie Jo Richardson (Born 3/16/94) - A = loadimage ("default.img"); + A = imread ("default.img"); zoom = []; elseif (nargin == 1) A = x; Modified: trunk/octave-forge/main/comm/inst/comms.m =================================================================== --- trunk/octave-forge/main/comm/inst/comms.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/comm/inst/comms.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -97,11 +97,11 @@ help ("comms"); elseif (strcmp(typ,"info")) infopaths = ["."]; - if (!isempty(split(path,":"))) - infopaths =[infopaths; split(path,":")]; + if (!isempty(char(strsplit (path, ":")))) + infopaths =[infopaths; char(strsplit (path, ":"))]; endif - if (!isempty(split(DEFAULT_LOADPATH,":"))) - infopaths =[infopaths; split(DEFAULT_LOADPATH,":")]; + if (!isempty(char(strsplit (DEFAULT_LOADPATH, ":")))) + infopaths =[infopaths; char(strsplit (DEFAULT_LOADPATH, ":"))]; endif for i=1:size(infopaths,1) infopath = deblank(infopaths(i,:)); @@ -109,7 +109,7 @@ if (len) if (len > 1 && strcmp(infopath([len-1, len]),"//")) [status, showfile] = system(["find '", infopath(1:len-1), ... - "' -name ", infofile]); + "' -name ", infofile]); else [status, showfile] = system(["find '", infopath, "' -name ", ... infofile, " -maxdepth 1"]); Modified: trunk/octave-forge/main/econometrics/inst/kernel_example.m =================================================================== --- trunk/octave-forge/main/econometrics/inst/kernel_example.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/econometrics/inst/kernel_example.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -109,7 +109,7 @@ printf("########################################################################\n"); printf("kernel regression example with several sample sizes serial/parallel timings\n"); figure(); - clg; + clf; title("Compute time versus nodes, kernel regression with different sample sizes"); xlabel("nodes"); ylabel("time (sec)"); Modified: trunk/octave-forge/main/fixed/inst/fixedpoint.m =================================================================== --- trunk/octave-forge/main/fixed/inst/fixedpoint.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/fixed/inst/fixedpoint.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -93,11 +93,11 @@ help ("fixedpoint"); elseif (strcmp(typ,"info")) infopaths = ["."]; - if (!isempty(split(path,":"))) - infopaths =[infopaths; split(path,":")]; + if (!isempty(char (strsplit (path, ":")))) + infopaths =[infopaths; char (strsplit (path, ":"))]; endif - if (!isempty(split(DEFAULT_LOADPATH,":"))) - infopaths =[infopaths; split(DEFAULT_LOADPATH,":")]; + if (!isempty(char (strsplit (DEFAULT_LOADPATH, ":")))) + infopaths =[infopaths; char (strsplit (DEFAULT_LOADPATH, ":"))]; endif for i=1:size(infopaths,1) infopath = deblank(infopaths(i,:)); @@ -105,10 +105,10 @@ if (len) if (len > 1 && strcmp(infopath([len-1, len]),"//")) [status, showfile] = system(["find '", infopath(1:len-1), ... - "' -name ", infofile]); + "' -name ", infofile]); else [status, showfile] = system(["find '", infopath, "' -name ", ... - infofile, " -maxdepth 1"]); + infofile, " -maxdepth 1"]); endif if (length(showfile)) break; Modified: trunk/octave-forge/main/gsl/inst/test_ellint.m =================================================================== --- trunk/octave-forge/main/gsl/inst/test_ellint.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/gsl/inst/test_ellint.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -77,7 +77,7 @@ str_p=index(input_line,"gsl_sf_ellint_Kcomp_e"); if (str_p != 0) # Take it apart - string_split=split(input_line,","); + string_split=char (strsplit (input_line, ",")); arg1=str2double(substr(string_split(3,:),3)); arg2=str2double(string_split(4,:)); arg3=(string_split(5,:)); @@ -98,7 +98,7 @@ str_p=index(input_line,"gsl_sf_ellint_Ecomp_e"); if (str_p != 0) # Take it apart - string_split=split(input_line,","); + string_split=char (strsplit (input_line, ",")); arg1=str2double(substr(string_split(3,:),3)); arg2=str2double(string_split(4,:)); arg3=(string_split(5,:)); Modified: trunk/octave-forge/main/gsl/inst/test_hyperg.m =================================================================== --- trunk/octave-forge/main/gsl/inst/test_hyperg.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/gsl/inst/test_hyperg.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -82,7 +82,7 @@ str_p=index(input_line,"hyperg_1F1_e"); if (str_p != 0) # Take it apart - string_split=split(input_line,","); + string_split=char (strsplit (input_line, ",")); arg1=str2double(substr(string_split(3,:),3)); arg2=str2double(string_split(4,:)); arg3=str2double(string_split(5,:)); @@ -103,7 +103,7 @@ str_p=index(input_line,"hyperg_U_e"); if (str_p != 0) # Take it apart - string_split=split(input_line,","); + string_split=char (strsplit (input_line, ",")); arg1=str2double(substr(string_split(3,:),3)); arg2=str2double(string_split(4,:)); arg3=str2double(string_split(5,:)); Modified: trunk/octave-forge/main/gsl/src/test/check.m =================================================================== --- trunk/octave-forge/main/gsl/src/test/check.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/gsl/src/test/check.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -82,7 +82,7 @@ str_p=index(input_line,"hyperg_1F1_e"); if (str_p != 0) # Take it apart - string_split=split(input_line,","); + string_split=char (strsplit (input_line, ",")); arg1=str2double(substr(string_split(3,:),3)); arg2=str2double(string_split(4,:)); arg3=str2double(string_split(5,:)); @@ -98,12 +98,12 @@ else printf("\n Failed KummerM: %s\n value=%e, computed=%e, tol=%e, returned error=%e ",input_line,val,ret,tol,err) printf("\n error %e", abs((ret-val)/val)) - endif + endif endif str_p=index(input_line,"hyperg_U_e"); if (str_p != 0) # Take it apart - string_split=split(input_line,","); + string_split=char (strsplit (input_line, ",")); arg1=str2double(substr(string_split(3,:),3)); arg2=str2double(string_split(4,:)); arg3=str2double(string_split(5,:)); @@ -119,7 +119,7 @@ else printf("\n Failed KummerU: %s\n value=%e, computed=%e, tol=%e, returned error=%e ",input_line,val,ret,tol,err) printf("\n error %e", abs((ret-val)/val)) - endif + endif endif endwhile fclose(source_id); @@ -133,7 +133,7 @@ hyperg_U(1,1,mat1) hyperg_U(1,mat1,1) hyperg_U(mat1,1,1) - hyperg_U(mat1,mat1,mat1) + hyperg_U(mat1,mat1,mat1) res=""; end Modified: trunk/octave-forge/main/image/INDEX =================================================================== --- trunk/octave-forge/main/image/INDEX 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/image/INDEX 2011-11-03 01:27:47 UTC (rev 8950) @@ -75,6 +75,7 @@ imdilate imopen imclose + imbothat imtophat mmgradm Colour controls Modified: trunk/octave-forge/main/miscellaneous/inst/hilbert_curve.m =================================================================== --- trunk/octave-forge/main/miscellaneous/inst/hilbert_curve.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/miscellaneous/inst/hilbert_curve.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -71,7 +71,7 @@ %!error hilbert_curve (n); %!demo -%! clg +%! clf %! n = 4; %! [x, y] = hilbert_curve (n); %! line (x, y, "linewidth", 4, "color", "blue"); @@ -80,10 +80,10 @@ %! % with 4 points on each axis. %!demo -%! clg +%! clf %! n = 64; %! [x, y] = hilbert_curve (n); %! line (x, y, "linewidth", 2, "color", "blue"); %! % ---------------------------------------------------------------------- %! % the figure window shows an iteration of the Hilbert space-fillig curve -%! % with 64 points on each axis. \ No newline at end of file +%! % with 64 points on each axis. Modified: trunk/octave-forge/main/miscellaneous/inst/peano_curve.m =================================================================== --- trunk/octave-forge/main/miscellaneous/inst/peano_curve.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/miscellaneous/inst/peano_curve.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -82,7 +82,7 @@ %!error peano_curve (n); %!demo -%! clg +%! clf %! n = 9; %! [x, y] = peano_curve (n); %! line (x, y, "linewidth", 4, "color", "red"); @@ -91,10 +91,10 @@ %! % with 9 points on each axis. %!demo -%! clg +%! clf %! n = 81; %! [x, y] = peano_curve (n); %! line (x, y, "linewidth", 2, "color", "red"); %! % -------------------------------------------------------------------- %! % the figure window shows an iteration of the Peano space-fillig curve -%! % with 81 points on each axis. \ No newline at end of file +%! % with 81 points on each axis. Modified: trunk/octave-forge/main/miscellaneous/inst/xmlwrite.m =================================================================== --- trunk/octave-forge/main/miscellaneous/inst/xmlwrite.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/miscellaneous/inst/xmlwrite.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -40,8 +40,8 @@ isopen = false; if ischar(filename) - ## Check file name - sn = split(filename, "."); + ## Check file name + sn = char (strsplit (filename, ".")); if !strcmp(tolower(deblank(sn(end,:))), "xml") filename = [filename, ".xml"]; endif Modified: trunk/octave-forge/main/miscellaneous/inst/z_curve.m =================================================================== --- trunk/octave-forge/main/miscellaneous/inst/z_curve.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/miscellaneous/inst/z_curve.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -73,7 +73,7 @@ %!error z_curve (n); %!demo -%! clg +%! clf %! n = 4; %! [x, y] = z_curve (n); %! line (x, y, "linewidth", 4, "color", "blue"); @@ -82,10 +82,10 @@ %! % with 4 points on each axis. %!demo -%! clg +%! clf %! n = 32; %! [x, y] = z_curve (n); %! line (x, y, "linewidth", 2, "color", "blue"); %! % ---------------------------------------------------------------------- %! % the figure window shows an iteration of the Z-order space-fillig curve -%! % with 32 points on each axis. \ No newline at end of file +%! % with 32 points on each axis. Modified: trunk/octave-forge/main/octgpr/inst/rbf_centers.m =================================================================== --- trunk/octave-forge/main/octgpr/inst/rbf_centers.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/octgpr/inst/rbf_centers.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -83,7 +83,7 @@ endif if (nargin == 3) - U = dmult (U, 1./theta); + diag (U) * (1./theta); if (any(theta == 0)) U(:,theta == 0) = 0; endif Modified: trunk/octave-forge/main/odebvp/inst/lfdif.m =================================================================== --- trunk/octave-forge/main/odebvp/inst/lfdif.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/odebvp/inst/lfdif.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -52,7 +52,7 @@ b = -1 +(h / 2.) * p(x); c = -1 - (h / 2.) * p(x); - A = spdiag(c(2 : n), -1) + spdiag(a) + spdiag(b(1 : n - 1), 1); + A = sparse(diag(c(2 : n)), -1) + sparse(diag(a)) + sparse(diag(b(1 : n - 1), 1)); d(1) = -h^2 * r(x(1)) + (1 + (h / 2.) * p(x(1))) * alpha; d(2 : n - 1) = -h^2 * r(x(2 : n - 1)); Modified: trunk/octave-forge/main/plot/inst/dxfwrite.m =================================================================== --- trunk/octave-forge/main/plot/inst/dxfwrite.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/plot/inst/dxfwrite.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -26,7 +26,7 @@ function [nb] = dxfwrite (filename, varargin) ## Check file name - sn = split(filename, "."); + sn = char (strsplit (filename, ".")); if !strcmp(tolower(deblank(sn(end,:))), "dxf") filename = [filename, ".dxf"]; endif Modified: trunk/octave-forge/main/signal/inst/pburg.m =================================================================== --- trunk/octave-forge/main/signal/inst/pburg.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/signal/inst/pburg.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -146,4 +146,4 @@ %! pburg(skewed,7,user_freq,Fs,'AKICc','semilogy'); %! input('User-specified frequency values. Press ENTER', 's' ); %! hold off -%! clearplot +%! clf Modified: trunk/octave-forge/main/signal/inst/pyulear.m =================================================================== --- trunk/octave-forge/main/signal/inst/pyulear.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/signal/inst/pyulear.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -117,4 +117,4 @@ %! pyulear(skewed,7,user_freq,Fs,'semilogy'); %! input('User-specified frequency values. Press ENTER', 's' ); %! hold off -%! clearplot +%! clf Modified: trunk/octave-forge/main/statistics/inst/anderson_darling_test.m =================================================================== --- trunk/octave-forge/main/statistics/inst/anderson_darling_test.m 2011-11-03 00:20:56 UTC (rev 8949) +++ trunk/octave-forge/main/statistics/inst/anderson_darling_test.m 2011-11-03 01:27:47 UTC (rev 8950) @@ -86,7 +86,7 @@ qvals = [ 0.1, 0.05, 0.025, 0.01 ]; Acrit = [ 0.637, 0.757, 0.877, 1.038]; ## XXX FIXME XXX how to fit alpha and sigma? - x = weibull_cdf(x,ones(n,1)*alpha,ones(n,1)*sigma); + x = wblcdf (x, ones(n,1)*sigma, ones(n,1)*alpha); case 'exponential', adj = 1 + 0.6/n; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |