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

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

Revision: 9887
          http://octave.svn.sourceforge.net/octave/?rev=9887&view=rev
Author:   carandraug
Date:     2012-03-14 22:29:00 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
normalise_distribution: workaround due to octave bug #34765 was made for releases 3.4.X only. However, regression in octave is not yet fixed as of 3.6.1. Expanding workaround for all releases after 3.4.0 until fixed in core.

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

Modified: trunk/octave-forge/main/statistics/NEWS
===================================================================
--- trunk/octave-forge/main/statistics/NEWS	2012-03-14 22:17:16 UTC (rev 9886)
+++ trunk/octave-forge/main/statistics/NEWS	2012-03-14 22:29:00 UTC (rev 9887)
@@ -7,6 +7,7 @@
 
  ** Bug fixes on the function:
 
+      normalise_distribution
       repanova
 
  ** The following functions were removed since equivalents are now

Modified: trunk/octave-forge/main/statistics/inst/normalise_distribution.m
===================================================================
--- trunk/octave-forge/main/statistics/inst/normalise_distribution.m	2012-03-14 22:17:16 UTC (rev 9886)
+++ trunk/octave-forge/main/statistics/inst/normalise_distribution.m	2012-03-14 22:29:00 UTC (rev 9887)
@@ -1,23 +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 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 Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
+## Copyright (C) 2011 Alexander Klein <ale...@ma...>
 ##
-## Author: Alexander Klein <ale...@ma...>
-## Created: 2011-09-13
+## 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.
 ##
-## TODO: 
+## 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{NORMALISED} =} normalise_distribution (@var{DATA})
@@ -198,7 +192,11 @@
       ## differently depending on octave version. This applies the fix for all
       ## 3.4 releases but it probably only appeared on 3.4.3 (can someone check?)
       ## See https://savannah.gnu.org/bugs/index.php?34765
-      if (compare_versions (OCTAVE_VERSION, "3.4", "<") || compare_versions (OCTAVE_VERSION, "3.6", ">"))
+      ## Turns out that the bug was not completely fixed the first time and is
+      ## still present in 3.6.1
+      ## FIXME Once package dependency increases beyond an octave version that
+      ## has this fixed, remove this
+      if (compare_versions (OCTAVE_VERSION, "3.4", "<"))
         ## this is how it should work
         f_remap = @( k ) ( normal ( k ) );
         normalised ( :, k ) = arrayfun ( f_remap, target_indices );

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