Hello community,
here is the log from the commit of package octave-forge-nan for
openSUSE:Factory checked in at 2016-09-21 18:48:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave-forge-nan (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-nan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-nan"
Changes:
--------
--- /work/SRC/openSUSE:Factory/octave-forge-nan/octave-forge-nan.changes
2016-06-14 23:07:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.octave-forge-nan.new/octave-forge-nan.changes
2016-09-21 18:48:43.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Sep 17 18:45:29 UTC 2016 - dmitr...@opensuse.org
+
+- Update to version 3.0.3
+ * Bug fixes
+- Fix build with GCC 4.8
+ * nan-cpp11.patch
+
+-------------------------------------------------------------------
Old:
----
nan-3.0.1.tar.gz
New:
----
nan-3.0.3.tar.gz
nan-cpp11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-nan.spec ++++++
--- /var/tmp/diff_new_pack.d0vGzW/_old 2016-09-21 18:48:45.000000000 +0200
+++ /var/tmp/diff_new_pack.d0vGzW/_new 2016-09-21 18:48:45.000000000 +0200
@@ -18,7 +18,7 @@
%define octpkg nan
Name: octave-forge-%{octpkg}
-Version: 3.0.1
+Version: 3.0.3
Release: 0
Summary: A statistics and machine learning toolbox
License: GPL-3.0+
@@ -26,6 +26,8 @@
Url: http://octave.sourceforge.net
Source0:
http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
Patch1: nan_xpt2d_add_return_for_BE.patch
+# PATCH-FIX-OPENSUSE nan-cpp11.patch -- Fix build with GCC 4.8
+Patch2: nan-cpp11.patch
BuildRequires: blas-devel
BuildRequires: gcc-c++
BuildRequires: octave-devel
@@ -37,7 +39,10 @@
%prep
%setup -q -c %{name}-%{version}
-%patch1 -p1
+%patch1 -p0
+%if 0%{?suse_version} <= 1320
+%patch2 -p0
+%endif
%octave_pkg_src
%build
++++++ nan-3.0.1.tar.gz -> nan-3.0.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/DESCRIPTION new/nan-3.0.3/DESCRIPTION
--- old/NaN/DESCRIPTION 2016-02-26 16:09:14.000000000 +0100
+++ new/nan-3.0.3/DESCRIPTION 2016-08-10 00:16:09.000000000 +0200
@@ -1,6 +1,6 @@
Name: NaN
-Version: 3.0.1
-Date: 2016-02-26
+Version: 3.0.3
+Date: 2016-08-10
Author: Alois Schloegl <alois.schlo...@gmail.com>
Maintainer: Alois Schloegl
Title: The NaN-toolbox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/INDEX new/nan-3.0.3/INDEX
--- old/NaN/INDEX 2016-02-26 16:09:14.000000000 +0100
+++ new/nan-3.0.3/INDEX 2016-08-10 00:16:09.000000000 +0200
@@ -9,5 +9,5 @@
var mean sem spearman trimean tpdf tcdf tinv zscore
flag_implicit_significance xcovf train_sc test_sc
xval classify train_lda_sparse decovm gscatter mahal
- cdfplot hist2res fss cat2bin ttest ttest2.m
+ cdfplot hist2res fss cat2bin ttest ttest2 xptopen.m
bland_altman cumsumskipnan range
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/NEWS new/nan-3.0.3/NEWS
--- old/NaN/NEWS 2016-02-26 16:07:46.000000000 +0100
+++ new/nan-3.0.3/NEWS 2016-08-10 00:16:09.000000000 +0200
@@ -1,3 +1,15 @@
+
+2016-08-10: Release of NaN-tb v3.0.3
+- tcdf: fix bug #48731 (thanks to Nir Krakauer)
+- coercoef: add comment on Matlab compatibiliy in help
+- test_fss, load_fisheriris:
+ fix support on mingw platform (Windows)
+
+2016-07-30: Release of NaN-tb v3.0.2
+- Octave/Windows: setenv CC=gcc (fixes bug 47559)
+- no OpenMP for Octave/Windows and MacOSX
+
+
2015-02-26: Release of NaN-tb v3.0.1
- fixes version number
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/VERSION new/nan-3.0.3/VERSION
--- old/NaN/VERSION 2016-02-26 16:09:14.000000000 +0100
+++ new/nan-3.0.3/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-# NaN-toolbox http://pub.ist.ac.at/~schloegl/matlab/NaN
-# Version: 3.0.1
-# Date: 2016-02-26
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/doc/INSTALL new/nan-3.0.3/doc/INSTALL
--- old/NaN/doc/INSTALL 2014-01-10 14:34:15.000000000 +0100
+++ new/nan-3.0.3/doc/INSTALL 2016-08-10 00:16:09.000000000 +0200
@@ -48,7 +48,7 @@
-----------------------
- $Id: INSTALL 12492 2014-01-10 13:34:15Z schloegl $
+ $Id$
Copyright (c) 2000-2003,2005,2006,2009,2010,2011,2014 by Alois Schloegl
<alois.schlo...@gmail.com>
This is part of the NaN-toolbox
http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/doc/README.TXT new/nan-3.0.3/doc/README.TXT
--- old/NaN/doc/README.TXT 2014-01-10 14:34:15.000000000 +0100
+++ new/nan-3.0.3/doc/README.TXT 2016-08-10 00:16:09.000000000 +0200
@@ -278,7 +278,7 @@
Run NANINSTTEST again to check the stability of the compiled SUMSKIPNAN.
- $Id: README.TXT 12492 2014-01-10 13:34:15Z schloegl $
+ $Id$
Copyright (C) 2000-2005,2009,2010,2011,2014 by Alois Schloegl
<alois.schlo...@gmail.com>
http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/cat2bin.m new/nan-3.0.3/inst/cat2bin.m
--- old/NaN/inst/cat2bin.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/cat2bin.m 2016-08-10 00:16:09.000000000 +0200
@@ -23,7 +23,7 @@
% 1 0 0
% 0 0 1
-% $Id: cat2bin.m 9033 2011-11-08 20:58:07Z schloegl $
+% $Id$
% Copyright (C) 2009 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/cdfplot.m new/nan-3.0.3/inst/cdfplot.m
--- old/NaN/inst/cdfplot.m 2011-06-24 19:35:07.000000000 +0200
+++ new/nan-3.0.3/inst/cdfplot.m 2016-08-10 00:16:09.000000000 +0200
@@ -20,7 +20,7 @@
%
% References:
-% $Id: cdfplot.m 8351 2011-06-24 17:35:07Z carandraug $
+% $Id$
% Copyright (C) 2009,2010 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/center.m new/nan-3.0.3/inst/center.m
--- old/NaN/inst/center.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/center.m 2016-08-10 00:16:09.000000000 +0200
@@ -36,7 +36,7 @@
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: center.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2005,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/coefficient_of_variation.m
new/nan-3.0.3/inst/coefficient_of_variation.m
--- old/NaN/inst/coefficient_of_variation.m 2011-04-20 11:16:06.000000000
+0200
+++ new/nan-3.0.3/inst/coefficient_of_variation.m 2016-08-10
00:16:09.000000000 +0200
@@ -9,7 +9,7 @@
% REFERENCE(S):
% http://mathworld.wolfram.com/VariationCoefficient.html
-% $Id: coefficient_of_variation.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 1997-2003 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/cor.m new/nan-3.0.3/inst/cor.m
--- old/NaN/inst/cor.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/cor.m 2016-08-10 00:16:09.000000000 +0200
@@ -27,7 +27,7 @@
% http://mathworld.wolfram.com/CorrelationCoefficient.html
-% $Id: cor.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2004,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/corrcoef.m new/nan-3.0.3/inst/corrcoef.m
--- old/NaN/inst/corrcoef.m 2011-12-15 11:42:14.000000000 +0100
+++ new/nan-3.0.3/inst/corrcoef.m 2016-08-10 00:16:09.000000000 +0200
@@ -12,6 +12,8 @@
% calculates the (auto-)correlation matrix of X
% [...] = CORRCOEF(X,Y);
% calculates the crosscorrelation between X and Y
+% NOTE: matlab's CORRCOEF(X,Y) returns the result of CORRCOEF([X,Y])
+% use CORRCOEF([X,Y]) if your software should be compatible with
both.
%
% [...] = CORRCOEF(..., Mode);
% Mode='Pearson' or 'parametric' [default]
@@ -89,10 +91,9 @@
% [20] http://www.tufts.edu/~gdallal/corr.htm
% [21] Fisher transformation http://en.wikipedia.org/wiki/Fisher_transformation
-% $Id: corrcoef.m 9387 2011-12-15 10:42:14Z schloegl $
-% Copyright (C) 2000-2004,2008,2009,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
-% This function is part of the NaN-toolbox
-% http://pub.ist.ac.at/~schloegl/matlab/NaN/
+% Copyright (C) 2000-2004,2008,2009,2011,2016 by Alois Schloegl
<alois.schlo...@gmail.com>
+% This function is part of the NaN-toolbox
+% http://pub.ist.ac.at/~schloegl/matlab/NaN/
% 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/cov.m new/nan-3.0.3/inst/cov.m
--- old/NaN/inst/cov.m 2012-03-09 21:03:49.000000000 +0100
+++ new/nan-3.0.3/inst/cov.m 2016-08-10 00:16:09.000000000 +0200
@@ -33,7 +33,7 @@
% REFERENCES:
% http://mathworld.wolfram.com/Covariance.html
-% $Id: cov.m 9803 2012-03-09 20:03:49Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2005,2009,2011,2012 by Alois Schloegl
<alois.schlo...@ist.ac.at>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/covm.m new/nan-3.0.3/inst/covm.m
--- old/NaN/inst/covm.m 2015-06-18 17:09:49.000000000 +0200
+++ new/nan-3.0.3/inst/covm.m 2016-08-10 00:16:09.000000000 +0200
@@ -33,7 +33,7 @@
%
% see also: DECOVM, XCOVF
-% $Id: covm.m 12826 2015-06-18 15:09:49Z schloegl $
+% $Id$
% Copyright (C) 2000-2005,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/detrend.m new/nan-3.0.3/inst/detrend.m
--- old/NaN/inst/detrend.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/detrend.m 2016-08-10 00:16:09.000000000 +0200
@@ -46,7 +46,7 @@
% Copyright (C) 1995, 1996 Kurt Hornik <kurt.hor...@ci.tuwien.ac.at>
-% $Id: detrend.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2001,2007 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/ecdf.m new/nan-3.0.3/inst/ecdf.m
--- old/NaN/inst/ecdf.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/ecdf.m 2016-08-10 00:16:09.000000000 +0200
@@ -14,7 +14,7 @@
% see also: HISTO2, HISTO3, PERCENTILE, QUANTILE
-% $Id: ecdf.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2009,2010 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/flag_implicit_significance.m
new/nan-3.0.3/inst/flag_implicit_significance.m
--- old/NaN/inst/flag_implicit_significance.m 2011-04-20 11:16:06.000000000
+0200
+++ new/nan-3.0.3/inst/flag_implicit_significance.m 2016-08-10
00:16:09.000000000 +0200
@@ -28,7 +28,7 @@
%
% see also: CORRCOEF, PARTCORRCOEF
-% $Id: flag_implicit_significance.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2002,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/flag_implicit_skip_nan.m
new/nan-3.0.3/inst/flag_implicit_skip_nan.m
--- old/NaN/inst/flag_implicit_skip_nan.m 2011-06-24 19:35:07.000000000
+0200
+++ new/nan-3.0.3/inst/flag_implicit_skip_nan.m 2016-08-10 00:16:09.000000000
+0200
@@ -40,7 +40,7 @@
% along with this program; if not, write to the Free Software
% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
-% $Id: flag_implicit_skip_nan.m 8351 2011-06-24 17:35:07Z carandraug $
+% $Id$
% Copyright (C) 2001-2003,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/fss.m new/nan-3.0.3/inst/fss.m
--- old/NaN/inst/fss.m 2011-11-15 16:14:10.000000000 +0100
+++ new/nan-3.0.3/inst/fss.m 2016-08-10 00:16:09.000000000 +0200
@@ -38,7 +38,7 @@
% Volume 86, Issue 1, 15 March 2007, Pages 68-81
% http://dx.doi.org/10.1016/j.chemolab.2006.08.007
-% $Id: fss.m 9104 2011-11-15 15:14:10Z carandraug $
+% $Id$
% Copyright (C) 2009,2010 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/geomean.m new/nan-3.0.3/inst/geomean.m
--- old/NaN/inst/geomean.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/geomean.m 2016-08-10 00:16:09.000000000 +0200
@@ -34,7 +34,7 @@
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: geomean.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2002,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/harmmean.m new/nan-3.0.3/inst/harmmean.m
--- old/NaN/inst/harmmean.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/harmmean.m 2016-08-10 00:16:09.000000000 +0200
@@ -36,7 +36,7 @@
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: harmmean.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2002,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/hist2res.m new/nan-3.0.3/inst/hist2res.m
--- old/NaN/inst/hist2res.m 2011-12-15 11:42:14.000000000 +0100
+++ new/nan-3.0.3/inst/hist2res.m 2016-08-10 00:16:09.000000000 +0200
@@ -39,7 +39,7 @@
% along with this program; if not, write to the Free Software
% Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
USA.
-% $Id: hist2res.m 9387 2011-12-15 10:42:14Z schloegl $
+% $Id$
% Copyright (c) 1996-2002,2006 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/kappa.m new/nan-3.0.3/inst/kappa.m
--- old/NaN/inst/kappa.m 2012-02-10 10:56:25.000000000 +0100
+++ new/nan-3.0.3/inst/kappa.m 2016-08-10 00:16:09.000000000 +0200
@@ -37,7 +37,7 @@
% [5] http://ourworld.compuserve.com/homepages/jsuebersax/kappa.htm
% [6] http://en.wikipedia.org/wiki/Receiver_operating_characteristic
-% $Id: kappa.m 9608 2012-02-10 09:56:25Z schloegl $
+% $Id$
% Copyright (c) 1997-2006,2008,2009,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/kurtosis.m new/nan-3.0.3/inst/kurtosis.m
--- old/NaN/inst/kurtosis.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/kurtosis.m 2016-08-10 00:16:09.000000000 +0200
@@ -33,7 +33,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: kurtosis.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox for Octave and Matlab
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/load_fisheriris.m
new/nan-3.0.3/inst/load_fisheriris.m
--- old/NaN/inst/load_fisheriris.m 2011-06-24 19:35:07.000000000 +0200
+++ new/nan-3.0.3/inst/load_fisheriris.m 2016-08-10 00:16:09.000000000
+0200
@@ -7,10 +7,9 @@
% [2] Duda,R.O., & Hart,P.E. (1973) Pattern Classification and Scene Analysis.
% (Q327.D83) John Wiley & Sons. ISBN 0-471-22361-1. See page 218.
-% $Id$
-% Copyright (C) 2009,2010 by Alois Schloegl <alois.schlo...@gmail.com>
-% This function is part of the NaN-toolbox
-% http://pub.ist.ac.at/~schloegl/matlab/NaN/
+% Copyright (C) 2009,2010,2016 by Alois Schloegl <alois.schlo...@gmail.com>
+% This function is part of the NaN-toolbox
+% http://pub.ist.ac.at/~schloegl/matlab/NaN/
% This program is free software; you can redistribute it and/or
% modify it under the terms of the GNU General Public License
@@ -32,7 +31,7 @@
if strncmp(computer,'PCWIN',5)
fprintf(1,'Download
http://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data and
save in local directory %s\nPress any key to continue ...\n',pwd);
else
- unix('wget
http://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data');
+ system('wget
http://archive.ics.uci.edu/ml/machine-learning-databases/iris/iris.data');
end;
end;
tmp = fopen('iris.data'); species=fread(tmp,[1,inf],'uint8=>char');
fclose(tmp);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/mad.m new/nan-3.0.3/inst/mad.m
--- old/NaN/inst/mad.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/mad.m 2016-08-10 00:16:09.000000000 +0200
@@ -25,7 +25,7 @@
% [3] http://mathworld.wolfram.com/MeanAbsoluteDeviation.html
% [4] Kenney, J. F. and Keeping, E. S. "Mean Absolute Deviation." �6.4 in
Mathematics of Statistics, Pt. 1, 3rd ed. Princeton, NJ: Van Nostrand, pp.
76-77 1962.
-% $Id: mad.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2002,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/mean.m new/nan-3.0.3/inst/mean.m
--- old/NaN/inst/mean.m 2014-09-12 19:46:13.000000000 +0200
+++ new/nan-3.0.3/inst/mean.m 2016-08-10 00:16:09.000000000 +0200
@@ -36,7 +36,7 @@
% see also: SUMSKIPNAN, MEAN, GEOMEAN, HARMMEAN
%
-% $Id: mean.m 12706 2014-09-12 17:46:13Z schloegl $
+% $Id$
% Copyright (C) 2000-2004,2008,2009,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/meandev.m new/nan-3.0.3/inst/meandev.m
--- old/NaN/inst/meandev.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/meandev.m 2016-08-10 00:16:09.000000000 +0200
@@ -37,7 +37,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: meandev.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2002,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox for Octave and Matlab
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/meansq.m new/nan-3.0.3/inst/meansq.m
--- old/NaN/inst/meansq.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/meansq.m 2016-08-10 00:16:09.000000000 +0200
@@ -34,7 +34,7 @@
% along with this program; If not, see <http://www.gnu.org/licenses/>.
% Copyright (C) 2000-2003,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
-% $Id: meansq.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% This function is part of the NaN-toolbox for Octave and Matlab
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/medAbsDev.m new/nan-3.0.3/inst/medAbsDev.m
--- old/NaN/inst/medAbsDev.m 2011-01-27 18:10:36.000000000 +0100
+++ new/nan-3.0.3/inst/medAbsDev.m 2016-08-10 00:16:09.000000000 +0200
@@ -11,7 +11,7 @@
% Copyright (C) 2003 Patrick Houweling
% Copyright (C) 2009 Alois Schloegl
-% $Id: medAbsDev.m 8075 2011-01-27 17:10:36Z schloegl $
+% $Id$
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/median.m new/nan-3.0.3/inst/median.m
--- old/NaN/inst/median.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/median.m 2016-08-10 00:16:09.000000000 +0200
@@ -28,7 +28,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: median.m 9033 2011-11-08 20:58:07Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/moment.m new/nan-3.0.3/inst/moment.m
--- old/NaN/inst/moment.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/moment.m 2016-08-10 00:16:09.000000000 +0200
@@ -24,7 +24,7 @@
% REFERENCE(S):
% http://mathworld.wolfram.com/Moment.html
-% $Id: moment.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2002,2010 by Alois Schloegl <alois.schlo...@gmail.com>
% This functions is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/naninsttest.m
new/nan-3.0.3/inst/naninsttest.m
--- old/NaN/inst/naninsttest.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/naninsttest.m 2016-08-10 00:16:09.000000000 +0200
@@ -3,7 +3,7 @@
%
% see also: NANTEST
-% $Id: naninsttest.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003 by Alois Schloegl <alois.schlo...@gmail.com>
% This script is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/nanmean.m new/nan-3.0.3/inst/nanmean.m
--- old/NaN/inst/nanmean.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/nanmean.m 2016-08-10 00:16:09.000000000 +0200
@@ -14,7 +14,7 @@
%
% see also: MEAN, SUMSKIPNAN, NANSUM
-% $Id: nanmean.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2009 by Alois Schloegl <alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/nanstd.m new/nan-3.0.3/inst/nanstd.m
--- old/NaN/inst/nanstd.m 2015-03-27 13:12:34.000000000 +0100
+++ new/nan-3.0.3/inst/nanstd.m 2016-08-10 00:16:09.000000000 +0200
@@ -17,7 +17,7 @@
%
% see also: SUM, SUMSKIPNAN, NANSUM, STD
-% $Id: nanstd.m 12757 2015-03-27 12:12:34Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2006,2008,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/nansum.m new/nan-3.0.3/inst/nansum.m
--- old/NaN/inst/nansum.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/nansum.m 2016-08-10 00:16:09.000000000 +0200
@@ -14,7 +14,7 @@
%
% see also: SUM, SUMSKIPNAN, NANSUM
-% $Id: nansum.m 9033 2011-11-08 20:58:07Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2008 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/nantest.m new/nan-3.0.3/inst/nantest.m
--- old/NaN/inst/nantest.m 2015-07-02 23:04:17.000000000 +0200
+++ new/nan-3.0.3/inst/nantest.m 2016-08-10 00:16:09.000000000 +0200
@@ -24,7 +24,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: nantest.m 12844 2015-07-02 21:04:17Z schloegl $
+% $Id$
% Copyright (C) 2000-2004,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This script is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/normcdf.m new/nan-3.0.3/inst/normcdf.m
--- old/NaN/inst/normcdf.m 2015-06-01 08:10:55.000000000 +0200
+++ new/nan-3.0.3/inst/normcdf.m 2016-08-10 00:16:09.000000000 +0200
@@ -12,7 +12,7 @@
% Reference(s):
-% $Id: normcdf.m 12812 2015-06-01 06:10:55Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2010,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/norminv.m new/nan-3.0.3/inst/norminv.m
--- old/NaN/inst/norminv.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/norminv.m 2016-08-10 00:16:09.000000000 +0200
@@ -12,7 +12,7 @@
% Reference(s):
-% $Id: norminv.m 9033 2011-11-08 20:58:07Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2010,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/normpdf.m new/nan-3.0.3/inst/normpdf.m
--- old/NaN/inst/normpdf.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/normpdf.m 2016-08-10 00:16:09.000000000 +0200
@@ -12,7 +12,7 @@
% Reference(s):
-% $Id: normpdf.m 9033 2011-11-08 20:58:07Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2010,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/partcorrcoef.m
new/nan-3.0.3/inst/partcorrcoef.m
--- old/NaN/inst/partcorrcoef.m 2011-06-24 19:35:07.000000000 +0200
+++ new/nan-3.0.3/inst/partcorrcoef.m 2016-08-10 00:16:09.000000000 +0200
@@ -49,7 +49,7 @@
% [1] http://www.tufts.edu/~gdallal/partial.htm
% [2] http://www.nag.co.uk/numeric/fl/manual/pdf/G02/g02byf.pdf
-% $Id: partcorrcoef.m 8351 2011-06-24 17:35:07Z carandraug $
+% $Id$
% Copyright (C) 2000-2002,2009 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/percentile.m new/nan-3.0.3/inst/percentile.m
--- old/NaN/inst/percentile.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/percentile.m 2016-08-10 00:16:09.000000000 +0200
@@ -13,7 +13,7 @@
%
% see also: HISTO2, HISTO3, QUANTILE
-% $Id: percentile.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 1996-2003,2005,2006,2007 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/quantile.m new/nan-3.0.3/inst/quantile.m
--- old/NaN/inst/quantile.m 2012-02-09 15:14:36.000000000 +0100
+++ new/nan-3.0.3/inst/quantile.m 2016-08-10 00:16:09.000000000 +0200
@@ -14,7 +14,7 @@
% see also: HISTO2, HISTO3, PERCENTILE
-% $Id: quantile.m 9601 2012-02-09 14:14:36Z schloegl $
+% $Id$
% Copyright (C) 1996-2003,2005,2006,2007,2009,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/rankcorr.m new/nan-3.0.3/inst/rankcorr.m
--- old/NaN/inst/rankcorr.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/rankcorr.m 2016-08-10 00:16:09.000000000 +0200
@@ -17,7 +17,7 @@
% [1] http://mathworld.wolfram.com/SpearmanRankCorrelationCoefficient.html
% [2] http://mathworld.wolfram.com/CorrelationCoefficient.html
-% $Id: rankcorr.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/ranks.m new/nan-3.0.3/inst/ranks.m
--- old/NaN/inst/ranks.m 2013-11-11 23:03:45.000000000 +0100
+++ new/nan-3.0.3/inst/ranks.m 2016-08-10 00:16:09.000000000 +0200
@@ -28,7 +28,7 @@
% --
-% $Id: ranks.m 12338 2013-11-11 22:03:45Z schloegl $
+% $Id$
% Copyright (C) 2000-2002,2005,2010,2013 by Alois Schloegl
<alois.schlo...@gmail.com>
% This script is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/rms.m new/nan-3.0.3/inst/rms.m
--- old/NaN/inst/rms.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/rms.m 2016-08-10 00:16:09.000000000 +0200
@@ -38,7 +38,7 @@
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: rms.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2008,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/sem.m new/nan-3.0.3/inst/sem.m
--- old/NaN/inst/sem.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/sem.m 2016-08-10 00:16:09.000000000 +0200
@@ -38,7 +38,7 @@
% along with this program; If not, see <http://www.gnu.org/licenses/>.
% Copyright (C) 2000-2003,2008,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
-% $Id: sem.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/skewness.m new/nan-3.0.3/inst/skewness.m
--- old/NaN/inst/skewness.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/skewness.m 2016-08-10 00:16:09.000000000 +0200
@@ -19,7 +19,7 @@
% REFERENCE(S):
% http://mathworld.wolfram.com/
-% $Id: skewness.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2010 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/spearman.m new/nan-3.0.3/inst/spearman.m
--- old/NaN/inst/spearman.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/spearman.m 2016-08-10 00:16:09.000000000 +0200
@@ -17,7 +17,7 @@
% [1] http://mathworld.wolfram.com/SpearmanRankCorrelationCoefficient.html
% [2] http://mathworld.wolfram.com/CorrelationCoefficient.html
-% $Id: spearman.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2002 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/statistic.m new/nan-3.0.3/inst/statistic.m
--- old/NaN/inst/statistic.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/statistic.m 2016-08-10 00:16:09.000000000 +0200
@@ -39,7 +39,7 @@
% [1] http://www.itl.nist.gov/
% [2] http://mathworld.wolfram.com/
-% $Id: statistic.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/std.m new/nan-3.0.3/inst/std.m
--- old/NaN/inst/std.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/std.m 2016-08-10 00:16:09.000000000 +0200
@@ -47,7 +47,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: std.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2006,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox for Octave and Matlab
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/sumskipnan.m new/nan-3.0.3/inst/sumskipnan.m
--- old/NaN/inst/sumskipnan.m 2015-06-18 17:09:49.000000000 +0200
+++ new/nan-3.0.3/inst/sumskipnan.m 2016-08-10 00:16:09.000000000 +0200
@@ -47,7 +47,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: sumskipnan.m 12826 2015-06-18 15:09:49Z schloegl $
+% $Id$
% Copyright (C) 2000-2005,2009,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/tcdf.m new/nan-3.0.3/inst/tcdf.m
--- old/NaN/inst/tcdf.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/tcdf.m 2016-08-10 00:16:09.000000000 +0200
@@ -11,7 +11,6 @@
% Reference(s):
-% $Id: tcdf.m 9033 2011-11-08 20:58:07Z schloegl $
% Copyright (C) 2000-2003,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox. For more details see
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
@@ -31,7 +30,11 @@
% check size of arguments
-if all(size(x)==1)
+if nargin~=2
+ error('invalid number of input arguments')
+elseif ~isreal(x) || ~isreal(n)
+ error('input arguments must be real')
+elseif all(size(x)==1)
x = repmat(x,size(n));
elseif all(size(n)==1)
n = repmat(n,size(x));
@@ -52,10 +55,11 @@
ix = (x > -Inf) & (x < Inf) & (n > 0);
p(ix) = betainc (n(ix) ./ (n(ix) + x(ix).^2), n(ix)/2, 1/2) / 2;
-ix = find(x>0);
+ix = ix & (x>0);
p(ix) = 1 - p(ix);
% shape output
p = reshape(p,size(x));
%!assert(tcdf(NaN,4),NaN)
+%!assert(tcdf(inf,3),1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/test_sc.m new/nan-3.0.3/inst/test_sc.m
--- old/NaN/inst/test_sc.m 2012-02-09 15:14:36.000000000 +0100
+++ new/nan-3.0.3/inst/test_sc.m 2016-08-10 00:16:09.000000000 +0200
@@ -30,7 +30,7 @@
% [1] R. Duda, P. Hart, and D. Stork, Pattern Classification, second ed.
% John Wiley & Sons, 2001.
-% $Id: test_sc.m 9601 2012-02-09 14:14:36Z schloegl $
+% $Id$
% Copyright (C) 2005,2006,2008,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/tiedrank.m new/nan-3.0.3/inst/tiedrank.m
--- old/NaN/inst/tiedrank.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/tiedrank.m 2016-08-10 00:16:09.000000000 +0200
@@ -9,7 +9,7 @@
% see also: RANKS
-% $Id: tiedrank.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2009,2010 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/tinv.m new/nan-3.0.3/inst/tinv.m
--- old/NaN/inst/tinv.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/tinv.m 2016-08-10 00:16:09.000000000 +0200
@@ -11,7 +11,7 @@
% Reference(s):
-% $Id: tinv.m 9033 2011-11-08 20:58:07Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2009 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/tpdf.m new/nan-3.0.3/inst/tpdf.m
--- old/NaN/inst/tpdf.m 2011-11-08 21:58:07.000000000 +0100
+++ new/nan-3.0.3/inst/tpdf.m 2016-08-10 00:16:09.000000000 +0200
@@ -11,7 +11,7 @@
% Reference(s):
-% $Id: tpdf.m 9033 2011-11-08 20:58:07Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2008,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/train_sc.m new/nan-3.0.3/inst/train_sc.m
--- old/NaN/inst/train_sc.m 2012-02-09 15:14:36.000000000 +0100
+++ new/nan-3.0.3/inst/train_sc.m 2016-08-10 00:16:09.000000000 +0200
@@ -142,7 +142,7 @@
% Machine Learning 285-318(2)
% http://en.wikipedia.org/wiki/Winnow_(algorithm)
-% $Id: train_sc.m 9601 2012-02-09 14:14:36Z schloegl $
+% $Id$
% Copyright (C) 2005,2006,2007,2008,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/trimean.m new/nan-3.0.3/inst/trimean.m
--- old/NaN/inst/trimean.m 2012-02-09 15:14:36.000000000 +0100
+++ new/nan-3.0.3/inst/trimean.m 2016-08-10 00:16:09.000000000 +0200
@@ -24,7 +24,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: trimean.m 9601 2012-02-09 14:14:36Z schloegl $
+% $Id$
% Copyright (C) 1996-2003,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/var.m new/nan-3.0.3/inst/var.m
--- old/NaN/inst/var.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/inst/var.m 2016-08-10 00:16:09.000000000 +0200
@@ -44,7 +44,7 @@
% You should have received a copy of the GNU General Public License
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: var.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2006,2009,2010 by Alois Schloegl
<alois.schlo...@gmail.com>
% This is part of the NaN-toolbox for Octave and Matlab
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/xcovf.m new/nan-3.0.3/inst/xcovf.m
--- old/NaN/inst/xcovf.m 2012-02-10 10:56:25.000000000 +0100
+++ new/nan-3.0.3/inst/xcovf.m 2016-08-10 00:16:09.000000000 +0200
@@ -24,7 +24,7 @@
%
% see also: COVM, XCORR
-% $Id: xcovf.m 9608 2012-02-10 09:56:25Z schloegl $
+% $Id$
% Copyright (C) 2005,2010,2011 by Alois Schloegl
<alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/zScoreMedian.m
new/nan-3.0.3/inst/zScoreMedian.m
--- old/NaN/inst/zScoreMedian.m 2011-01-27 18:10:36.000000000 +0100
+++ new/nan-3.0.3/inst/zScoreMedian.m 2016-08-10 00:16:09.000000000 +0200
@@ -9,7 +9,7 @@
% Copyright (C) 2003 Patrick Houweling
% Copyright (C) 2009 Alois Schloegl
-% $Id: zScoreMedian.m 8075 2011-01-27 17:10:36Z schloegl $
+% $Id$
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/inst/zscore.m new/nan-3.0.3/inst/zscore.m
--- old/NaN/inst/zscore.m 2014-09-12 22:02:20.000000000 +0200
+++ new/nan-3.0.3/inst/zscore.m 2016-08-10 00:16:09.000000000 +0200
@@ -35,7 +35,7 @@
% along with this program; If not, see <http://www.gnu.org/licenses/>.
-% $Id: zscore.m 12708 2014-09-12 20:02:20Z schloegl $
+% $Id$
% Copyright (C) 2000-2003,2009,2014 by Alois Schloegl
<alois.schlo...@ist.ac.at>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/Makefile new/nan-3.0.3/src/Makefile
--- old/NaN/src/Makefile 2016-02-26 16:09:14.000000000 +0100
+++ new/nan-3.0.3/src/Makefile 2016-08-10 00:16:09.000000000 +0200
@@ -33,24 +33,27 @@
MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
CC ?= gcc
CXX ?= g++
-CFLAGS += -fopenmp -Wall -Wextra -Wconversion -O2
-OCTMEX = $(MKOCTFILE) --mex -lgomp
+CFLAGS += -Wall -Wextra -Wconversion -O2
+OCTMEX = $(MKOCTFILE) --mex
RM = rm
# Support Debian Hardening flags
#
https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
CFLAGS += $(CPPFLAGS)
-ifneq ($(OS),Windows_NT)
-CFLAGS += -fPIC
+ifeq ($(OS),Windows_NT)
+ # CC need to be defined on Windows, see also
http://savannah.gnu.org/bugs/?47559
+ CC = gcc
+else ifeq (Darwin,$(shell uname))
+ # no OpenMP on MacOSX, neither for Matlab nor Octave
+else
+ # enable OpenMP support
+ CFLAGS += -fPIC -fopenmp
+ OCTMEX += -lgomp
+ MEX_OPTION += -lgomp
+ MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) "
CXXFLAGS\#"$(CFLAGS) "
endif
-ifneq (Darwin,$(shell uname))
-CFLAGS += -fopenmp
-MEX_OPTION += -lgomp
-MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) "
CXXFLAGS\#"$(CFLAGS) "
-endif
-
MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex
str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/covm_mex.cpp new/nan-3.0.3/src/covm_mex.cpp
--- old/NaN/src/covm_mex.cpp 2015-12-22 11:28:53.000000000 +0100
+++ new/nan-3.0.3/src/covm_mex.cpp 2016-08-10 00:16:09.000000000 +0200
@@ -32,7 +32,7 @@
// - NN = real(~ISNAN(X)')*sparse(diag(W))*real(~ISNAN(Y)) count of valid
(non-NaN) elements
// computed more efficiently
//
-// $Id: covm_mex.cpp 12888 2015-12-22 10:28:53Z schloegl $
+// $Id$
// Copyright (C) 2009,2010,2011 Alois Schloegl <alois.schlo...@gmail.com>
// This function is part of the NaN-toolbox
// http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/histo_mex.cpp new/nan-3.0.3/src/histo_mex.cpp
--- old/NaN/src/histo_mex.cpp 2015-09-12 16:59:20.000000000 +0200
+++ new/nan-3.0.3/src/histo_mex.cpp 2016-08-10 00:16:09.000000000 +0200
@@ -27,7 +27,7 @@
// HIS.X
// HIS.H
//
-// $Id: histo_mex.cpp 12878 2015-09-12 14:59:20Z schloegl $
+// $Id$
// Copyright (C) 2009,2010,2011 Alois Schloegl <alois.schlo...@gmail.com>
// This function is part of the NaN-toolbox
// http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/linear_model_matlab.c
new/nan-3.0.3/src/linear_model_matlab.c
--- old/NaN/src/linear_model_matlab.c 2016-01-05 10:53:40.000000000 +0100
+++ new/nan-3.0.3/src/linear_model_matlab.c 2016-08-10 00:16:09.000000000
+0200
@@ -1,6 +1,6 @@
/*
-$Id: linear_model_matlab.c 12890 2016-01-05 09:53:40Z schloegl $
+$Id$
Copyright (c) 2007-2009 The LIBLINEAR Project.
Copyright (c) 2010 Alois Schloegl <alois.schlo...@gmail.com>
This function is part of the NaN-toolbox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/make.m new/nan-3.0.3/src/make.m
--- old/NaN/src/make.m 2011-04-20 11:16:06.000000000 +0200
+++ new/nan-3.0.3/src/make.m 2016-08-10 00:16:09.000000000 +0200
@@ -1,7 +1,7 @@
function make(arg1)
% This make.m is used for Matlab under Windows
-% $Id: make.m 8223 2011-04-20 09:16:06Z schloegl $
+% $Id$
% Copyright (C) 2010,2011 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/predict.c new/nan-3.0.3/src/predict.c
--- old/NaN/src/predict.c 2015-04-12 22:26:42.000000000 +0200
+++ new/nan-3.0.3/src/predict.c 2016-08-10 00:16:09.000000000 +0200
@@ -1,6 +1,6 @@
/*
-$Id: predict.c 12779 2015-04-12 20:26:42Z schloegl $
+$Id$
Copyright (c) 2007-2009 The LIBLINEAR Project.
Copyright (c) 2010 Alois Schloegl <alois.schlo...@gmail.com>
This function is part of the NaN-toolbox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/sumskipnan_mex.cpp
new/nan-3.0.3/src/sumskipnan_mex.cpp
--- old/NaN/src/sumskipnan_mex.cpp 2015-12-22 11:28:53.000000000 +0100
+++ new/nan-3.0.3/src/sumskipnan_mex.cpp 2016-08-10 00:16:09.000000000
+0200
@@ -38,7 +38,7 @@
// - sums of squares
//
//
-// $Id: sumskipnan_mex.cpp 12888 2015-12-22 10:28:53Z schloegl $
+// $Id$
// Copyright (C) 2009,2010,2011 Alois Schloegl <alois.schlo...@gmail.com>
// This function is part of the NaN-toolbox
// http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/svm_model_matlab.c
new/nan-3.0.3/src/svm_model_matlab.c
--- old/NaN/src/svm_model_matlab.c 2015-04-12 17:18:03.000000000 +0200
+++ new/nan-3.0.3/src/svm_model_matlab.c 2016-08-10 00:16:09.000000000
+0200
@@ -1,6 +1,6 @@
/*
-$Id: svm_model_matlab.c 12776 2015-04-12 15:18:03Z schloegl $
+$Id$
Copyright (c) 2000-2009 Chih-Chung Chang and Chih-Jen Lin
Copyright (c) 2010 Alois Schloegl <alois.schlo...@gmail.com>
This function is part of the NaN-toolbox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/svmpredict_mex.cpp
new/nan-3.0.3/src/svmpredict_mex.cpp
--- old/NaN/src/svmpredict_mex.cpp 2015-04-23 13:53:51.000000000 +0200
+++ new/nan-3.0.3/src/svmpredict_mex.cpp 2016-08-10 00:16:09.000000000
+0200
@@ -1,6 +1,6 @@
/*
-$Id: svmpredict_mex.cpp 12791 2015-04-23 11:53:51Z schloegl $
+$Id$
Copyright (c) 2000-2012 Chih-Chung Chang and Chih-Jen Lin
Copyright (c) 2010,2011,2015 Alois Schloegl <alois.schlo...@ist.ac.at>
This function is part of the NaN-toolbox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/svmtrain_mex.cpp
new/nan-3.0.3/src/svmtrain_mex.cpp
--- old/NaN/src/svmtrain_mex.cpp 2015-04-12 16:37:46.000000000 +0200
+++ new/nan-3.0.3/src/svmtrain_mex.cpp 2016-08-10 00:16:09.000000000 +0200
@@ -1,6 +1,6 @@
/*
-$Id: svmtrain_mex.cpp 12775 2015-04-12 14:37:46Z schloegl $
+$Id$
Copyright (c) 2000-2012 Chih-Chung Chang and Chih-Jen Lin
Copyright (c) 2010,2015 Alois Schloegl <alois.schlo...@ist.ac.at>
This function is part of the NaN-toolbox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/train.c new/nan-3.0.3/src/train.c
--- old/NaN/src/train.c 2015-04-12 22:26:42.000000000 +0200
+++ new/nan-3.0.3/src/train.c 2016-08-10 00:16:09.000000000 +0200
@@ -1,6 +1,6 @@
/*
-$Id: train.c 12779 2015-04-12 20:26:42Z schloegl $
+$Id$
Copyright (c) 2007-2009 The LIBLINEAR Project.
Copyright (c) 2010 Alois Schloegl <alois.schlo...@gmail.com>
This function is part of the NaN-toolbox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/src/xptopen.cpp new/nan-3.0.3/src/xptopen.cpp
--- old/NaN/src/xptopen.cpp 2015-12-22 11:28:53.000000000 +0100
+++ new/nan-3.0.3/src/xptopen.cpp 2016-08-10 00:16:09.000000000 +0200
@@ -29,7 +29,7 @@
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//
-// $Id: xptopen.cpp 12888 2015-12-22 10:28:53Z schloegl $
+// $Id$
// Copyright (C) 2010,2011,2012,2013 Alois Schloegl
<alois.schlo...@ist.ac.at>
// This function is part of the NaN-toolbox
// http://pub.ist.ac.at/~schloegl/matlab/NaN/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/test/test_fss.m new/nan-3.0.3/test/test_fss.m
--- old/NaN/test/test_fss.m 2015-04-03 15:17:25.000000000 +0200
+++ new/nan-3.0.3/test/test_fss.m 2016-08-10 00:16:09.000000000 +0200
@@ -1,9 +1,8 @@
% TEST_FSS test of fss.m
-% $Id$
-% Copyright (C) 2009,2010 by Alois Schloegl <alois.schlo...@gmail.com>
-% This function is part of the NaN-toolbox
-% http://pub.ist.ac.at/~schloegl/matlab/NaN/
+% Copyright (C) 2009,2010,2016 by Alois Schloegl <alois.schlo...@gmail.com>
+% This function is part of the NaN-toolbox
+% http://pub.ist.ac.at/~schloegl/matlab/NaN/
% This program is free software; you can redistribute it and/or
% modify it under the terms of the GNU General Public License
@@ -23,10 +22,10 @@
clear
if ~exist('ue6.mat','file')
if strncmp(computer,'PCWIN',5)
- fprintf(1,'Download
http://pub.ist.ac.at/~schloegl//LV/SMBS/UE6/ue6.mat and save in local directory
%s\nPress any key to continue ...\n',pwd);
+ fprintf(1,'Download
http://pub.ist.ac.at/~schloegl/LV/SMBS/UE6/ue6.mat and save in local directory
%s\nPress any key to continue ...\n',pwd);
pause;
else
- unix('wget
http://pub.ist.ac.at/~schloegl//LV/SMBS/UE6/ue6.mat');
+ system('wget
http://pub.ist.ac.at/~schloegl/LV/SMBS/UE6/ue6.mat');
end;
end
load ue6;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/NaN/test/test_xptopen.m
new/nan-3.0.3/test/test_xptopen.m
--- old/NaN/test/test_xptopen.m 2015-04-03 21:24:06.000000000 +0200
+++ new/nan-3.0.3/test/test_xptopen.m 2016-08-10 00:16:09.000000000 +0200
@@ -1,6 +1,6 @@
% TEST_XPTOPEN tests XPTOPEN
-% $Id: test_xptopen.m 12769 2015-04-03 19:24:06Z schloegl $
+% $Id$
% Copyright (C) 2010 by Alois Schloegl <alois.schlo...@gmail.com>
% This function is part of the NaN-toolbox
% http://biosig-consulting.com/matlab/NaN/
++++++ nan-cpp11.patch ++++++
Index: nan-3.0.3/src/Makefile
===================================================================
--- nan-3.0.3.orig/src/Makefile
+++ nan-3.0.3/src/Makefile
@@ -49,8 +49,8 @@ else ifeq (Darwin,$(shell uname))
else
# enable OpenMP support
CFLAGS += -fPIC -fopenmp
- OCTMEX += -lgomp
- MEX_OPTION += -lgomp
+ OCTMEX += -lgomp -std=gnu++11
+ MEX_OPTION += -lgomp -std=gnu++11
MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) "
CXXFLAGS\#"$(CFLAGS) "
endif
++++++ nan_xpt2d_add_return_for_BE.patch ++++++
--- /var/tmp/diff_new_pack.d0vGzW/_old 2016-09-21 18:48:45.000000000 +0200
+++ /var/tmp/diff_new_pack.d0vGzW/_new 2016-09-21 18:48:45.000000000 +0200
@@ -1,34 +1,15 @@
-From: Michel Normand <norm...@linux.vnet.ibm.com>
-Subject: nan xpt2d add return for BE
-Date: Tue, 12 Apr 2016 12:02:48 +0200
-
-for xpt2d and d2xpt add return for BE, to avoid compilation warning
-treated as error by OBS build process:
-===
-I: Program returns random data in a function
-E: octave-forge-nan no-return-in-nonvoid-function xptopen.cpp:1062, 1112
-
-I: Program returns random data in a function
-E: octave-forge-nan no-return-in-nonvoid-function xptopen.cpp:1062, 1112
-===
-
-Signed-off-by: Michel Normand <norm...@linux.vnet.ibm.com>
----
- NaN/src/xptopen.cpp | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-Index: octave-forge-nan-2.8.1/NaN/src/xptopen.cpp
+Index: nan-3.0.3/src/xptopen.cpp
===================================================================
---- octave-forge-nan-2.8.1.orig/NaN/src/xptopen.cpp
-+++ octave-forge-nan-2.8.1/NaN/src/xptopen.cpp
-@@ -1027,15 +1027,16 @@ if present.
+--- nan-3.0.3.orig/src/xptopen.cpp
++++ nan-3.0.3/src/xptopen.cpp
+@@ -1031,15 +1031,16 @@ if present.
double xpt2d(uint64_t x) {
// x is little-endian 64bit IBM floating point format
- char c = *((char*)&x+7) & 0x7f;
- uint64_t u = x;
- *((char*)&u+7)=0;
--
+
#if __BYTE_ORDER == __BIG_ENDIAN
mexErrMsgTxt("IEEE-to-IBM conversion on big-endian platform not
supported, yet");
@@ -38,27 +19,25 @@
+ char c = *((char*)&x+7) & 0x7f;
+ uint64_t u = x;
+ *((char*)&u+7)=0;
-+
#if DEBUG
mexPrintf("xpt2d(%016Lx): [0x%x]\n",x,c);
-@@ -1067,15 +1068,15 @@ double xpt2d(uint64_t x) {
+@@ -1071,15 +1072,16 @@ double xpt2d(uint64_t x) {
*/
uint64_t d2xpt(double x) {
- uint64_t s,m;
- int e;
--
+
#if __BYTE_ORDER == __BIG_ENDIAN
mexErrMsgTxt("IEEE-to-IBM conversion on big-endian platform not
supported, yet");
--
+ return(0x2eLL << 56); // NaN - not a number
+
#elif __BYTE_ORDER==__LITTLE_ENDIAN
+ uint64_t s,m;
+ int e;
-+
if (x != x) return(0x2eLL << 56); // NaN - not a number
