<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/23c1c984f8509945ef4bd54fca7467b93d388cd5">https://github.com/macports/macports-ports/commit/23c1c984f8509945ef4bd54fca7467b93d388cd5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 23c1c98 octave-communications: update to 1.2.2
</span>23c1c98 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 23c1c984f8509945ef4bd54fca7467b93d388cd5
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Jan 5 06:41:54 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> octave-communications: update to 1.2.2
</span>---
math/octave-communications/Portfile | 16 +-
.../files/patch-fixes_for_4.2.diff | 1058 --------------------
.../octave-communications/files/patch-octave5.diff | 350 -------
3 files changed, 5 insertions(+), 1419 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-communications/Portfile b/math/octave-communications/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4def6f6..2338b97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-communications/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-communications/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,9 @@
</span> PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-octave.setup communications 1.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.setup communications 1.2.2
</span> octave.config_h yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,14 +14,8 @@ description Digital Communications, Error Correcting Codes \
</span> Modulation and Galois Fields.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 620b0b9544b28e7abaa46797791b55c3c115c03a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5014dbfa37ae7c8cc2249093c9b03f255ddcc8da68050abe6b2f07ab530e0e91 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 312079
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 54665dffc70d8664c8729833df8e3bd097a6cd1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 93f9ad5e807d502f58c07688dfe2ce40231da1a81fe3da90926337e5e5165ef5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 329282
</span>
depends_lib-append port:octave-signal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fixes_for_4.2.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-communications/files/patch-fixes_for_4.2.diff b/math/octave-communications/files/patch-fixes_for_4.2.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d256d5f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-communications/files/patch-fixes_for_4.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,1058 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/base-lu.cc b/src/base-lu.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..c27d868
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/base-lu.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,191 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 1996-2015 John W. Eaton
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 2009 VZLU Prague
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This file is part of Octave.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is free software; you can redistribute it and/or modify it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+under the terms of the GNU General Public License as published by the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Free Software Foundation; either version 3 of the License, or (at your
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option) any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is distributed in the hope that it will be useful, but WITHOUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+along with Octave; see the file COPYING. If not, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "base-lu.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu<lu_type>::base_lu (const lu_type& l, const lu_type& u,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const PermMatrix& p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : a_fact (u), l_fact (l), ipvt (p.transpose ().col_perm_vec ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (l.columns () != u.rows ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (*current_liboctave_error_handler) ("lu: dimension mismatch");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: packed (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l_fact.dims () == dim_vector ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: unpack (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (packed ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l_fact = L ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ a_fact = U (); // FIXME: sub-optimal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ipvt = getp ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+lu_type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: L (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (packed ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type a_nr = a_fact.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type a_nc = a_fact.cols ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type mn = (a_nr < a_nc ? a_nr : a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lu_type l (a_nr, mn, lu_elt_type (0.0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < a_nr; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i < a_nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l.xelem (i, i) = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type j = 0; j < (i < a_nc ? i : a_nc); j++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l.xelem (i, j) = a_fact.xelem (i, j);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l_fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+lu_type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: U (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (packed ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type a_nr = a_fact.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type a_nc = a_fact.cols ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type mn = (a_nr < a_nc ? a_nr : a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lu_type u (mn, a_nc, lu_elt_type (0.0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < mn; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type j = i; j < a_nc; j++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ u.xelem (i, j) = a_fact.xelem (i, j);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return u;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return a_fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+lu_type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: Y (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! packed ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (*current_liboctave_error_handler)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ("lu: Y () not implemented for unpacked form");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return a_fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Array<octave_idx_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: getp (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (packed ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type a_nr = a_fact.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Array<octave_idx_type> pvt (dim_vector (a_nr, 1));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < a_nr; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pvt.xelem (i) = i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < ipvt.length (); i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type k = ipvt.xelem (i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (k != i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type tmp = pvt.xelem (k);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pvt.xelem (k) = pvt.xelem (i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pvt.xelem (i) = tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return pvt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ipvt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PermMatrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: P (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return PermMatrix (getp (), false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ColumnVector
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu <lu_type> :: P_vec (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type a_nr = a_fact.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ColumnVector p (a_nr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Array<octave_idx_type> pvt = getp ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < a_nr; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p.xelem (i) = static_cast<double> (pvt.xelem (i) + 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu<lu_type>::regular (void) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool retval = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type k = std::min (a_fact.rows (), a_fact.columns ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < k; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (a_fact(i, i) == lu_elt_type ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ retval = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/base-lu.h b/src/base-lu.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..f11f625
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/base-lu.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,87 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 1996-2015 John W. Eaton
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 2009 VZLU Prague
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This file is part of Octave.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is free software; you can redistribute it and/or modify it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+under the terms of the GNU General Public License as published by the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Free Software Foundation; either version 3 of the License, or (at your
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option) any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is distributed in the hope that it will be useful, but WITHOUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+along with Octave; see the file COPYING. If not, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined (octave_base_lu_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define octave_base_lu_h 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "MArray.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "dColVector.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "PermMatrix.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class lu_type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+base_lu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef typename lu_type::element_type lu_elt_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ base_lu (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : a_fact (), l_fact (), ipvt () { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ base_lu (const base_lu& a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : a_fact (a.a_fact), l_fact (a.l_fact), ipvt (a.ipvt) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ base_lu (const lu_type& l, const lu_type& u,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const PermMatrix& p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ base_lu& operator = (const base_lu& a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (this != &a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ a_fact = a.a_fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l_fact = a.l_fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ipvt = a.ipvt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return *this;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual ~base_lu (void) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool packed (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void unpack (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lu_type L (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lu_type U (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lu_type Y (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PermMatrix P (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ColumnVector P_vec (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool regular (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+protected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Array<octave_idx_type> getp (void) const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lu_type a_fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ lu_type l_fact;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Array<octave_idx_type> ipvt;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/galois-ops.h b/src/galois-ops.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e43f111..dc74837 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/galois-ops.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/galois-ops.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,6 +21,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined (galois_octave_ops_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define galois_octave_ops_h 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ! defined (CAST_BINOP_ARGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define CAST_BINOP_ARGS(t1, t2) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ t1 v1 = dynamic_cast<t1> (a1); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ t2 v2 = dynamic_cast<t2> (a2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ! defined (CAST_UNOP_ARG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define CAST_UNOP_ARG(t) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ t v = dynamic_cast<t> (a)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ! defined (BINOPDECL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define BINOPDECL(name, a1, a2) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static octave_value \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CONCAT2(oct_binop_, name) (const octave_base_value& a1, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const octave_base_value& a2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ! defined (CATOPDECL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define CATOPDECL(name, a1, a2) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static octave_value \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CONCAT2(oct_catop_, name) (octave_base_value& a1, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const octave_base_value& a2, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const Array<octave_idx_type>& ra_idx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Override the operator and function definition defines from Octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define DEFBINOP_OP_G(name, t1, t2, op) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/galois.cc b/src/galois.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 43623bf..7573474 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/galois.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/galois.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "galoisfield.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "galois-def.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <octave/base-lu.cc>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "base-lu.cc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- galois_field_list stored_galois_fields;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/galois.h b/src/galois.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ae161b3..21f8a85 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/galois.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/galois.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,10 +22,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define octave_galois_int_h 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <octave/base-lu.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/mx-base.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "galoisfield.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "base-lu.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef void (*solve_singularity_handler) (double rcond);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/ls-oct-ascii.cc b/src/ls-oct-ascii.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..985d53a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/ls-oct-ascii.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,432 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 1996-2015 John W. Eaton
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This file is part of Octave.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is free software; you can redistribute it and/or modify it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+under the terms of the GNU General Public License as published by the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Free Software Foundation; either version 3 of the License, or (at your
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option) any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is distributed in the hope that it will be useful, but WITHOUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+along with Octave; see the file COPYING. If not, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Author: John W. Eaton.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_CONFIG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cctype>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <fstream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <iomanip>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sstream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "byte-swap.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "data-conv.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "file-ops.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "glob-match.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "lo-mappers.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "mach-info.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "oct-env.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "oct-time.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "quit.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "str-vec.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "Cell.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "defun.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "error.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "load-save.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "ls-ascii-helper.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "ls-oct-ascii.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "oct-obj.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "oct-map.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "ov-cell.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pager.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "pt-exp.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "unwind-prot.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "utils.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "variables.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "version.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "dMatrix.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// The number of decimal digits to use when writing ascii data.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int Vsave_precision = 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Functions for reading ascii data.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Extract a KEYWORD and its value from stream IS, returning the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// associated value in a new string.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Input should look something like:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// [%#][ \t]*keyword[ \t]*:[ \t]*string-value[ \t]*\n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+std::string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extract_keyword (std::istream& is, const char *keyword, const bool next_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int ch = is.peek ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (next_only && ch != '%' && ch != '#')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c == '%' || c == '#')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::ostringstream buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && (c == ' ' || c == '\t' || c == '%' || c == '#'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ; // Skip whitespace and comment characters.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (isalpha (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf << c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && isalpha (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf << c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string tmp = buf.str ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool match = (tmp.compare (0, strlen (keyword), keyword) == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (match)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::ostringstream value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && (c == ' ' || c == '\t' || c == ':'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ; // Skip whitespace and the colon.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is.putback (c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ retval = read_until_newline (is, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (next_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ skip_until_newline (is, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int len = retval.length ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (len > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ c = retval[len-1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c == ' ' || c == '\t')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len--;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ retval.resize (len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Extract one value (scalar, matrix, string, etc.) from stream IS and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// place it in TC, returning the name of the variable. If the value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// is tagged as global in the file, return TRUE in GLOBAL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Each type supplies its own function to load the data, and so this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// function is extensible.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// FILENAME is used for error messages.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// The data is expected to be in the following format:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// The input file must have a header followed by some data.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// All lines in the header must begin with a '#' character.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// The header must contain a list of keyword and value pairs with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// keyword and value separated by a colon.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Keywords must appear in the following order:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # name: <name>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # type: <type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # <info>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Where, for the built in types are:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// <name> : a valid identifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// <type> : <typename>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | global <typename>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// <typename> : scalar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | complex scalar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | complex matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | bool matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | range
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// <info> : <matrix info>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// | <string info>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// <matrix info> : # rows: <integer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// : # columns: <integer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// <string info> : # elements: <integer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// : # length: <integer> (once before each string)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// For backward compatibility the type "string array" is treated as a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// "string" type. Also "string" can have a single element with no elements
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// line such that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// <string info> : # length: <integer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Formatted ASCII data follows the header.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Example:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # name: foo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # type: matrix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # rows: 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # columns: 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// 2 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// 1 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Example:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # name: foo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # type: string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # elements: 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # length: 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # length: 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # length: 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # length: 6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// # length: 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// array
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// FIXME: this format is fairly rigid, and doesn't allow for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// arbitrary comments. Someone should fix that. It does allow arbitrary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// types however.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Ugh. The signature of the compare method is not standard in older
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// versions of the GNU libstdc++. Do this instead:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SUBSTRING_COMPARE_EQ(s, pos, n, t) (s.substr (pos, n) == t)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+std::string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+read_ascii_data (std::istream& is, const std::string& filename, bool& global,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_value& tc, octave_idx_type count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Read name for this entry or break on EOF.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string name = extract_keyword (is, "name");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (name.empty ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (count == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error ("load: empty name keyword or no data found in file '%s'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ filename.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::string ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! (name == ".nargin." || name == ".nargout."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ || name == CELL_ELT_TAG || valid_identifier (name)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error ("load: bogus identifier '%s' found in file '%s'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ name.c_str (), filename.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::string ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Look for type keyword.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string tag = extract_keyword (is, "type");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! tag.empty ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string typ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t pos = tag.rfind (' ');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pos != std::string::npos)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ global = SUBSTRING_COMPARE_EQ (tag, 0, 6, "global");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typ = global ? tag.substr (7) : tag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typ = tag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Special case for backward compatiablity. A small bit of cruft
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (SUBSTRING_COMPARE_EQ (typ, 0, 12, "string array"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tc = charMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tc = octave_value_typeinfo::lookup_type (typ);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! tc.load_ascii (is))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error ("load: trouble reading ascii file '%s'", filename.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error ("load: failed to extract keyword specifying value type");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (error_state)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ error ("load: reading file %s", filename.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::string ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Save the data from TC along with the corresponding NAME, and global
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// flag MARK_AS_GLOBAL on stream OS in the plain text format described
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// above for load_ascii_data. If NAME is empty, the name: line is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// generated. PRECISION specifies the number of decimal digits to print.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Assumes ranges and strings cannot contain Inf or NaN values.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Returns 1 for success and 0 for failure.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// FIXME: should probably write the help string here too.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+save_ascii_data (std::ostream& os, const octave_value& val_arg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const std::string& name, bool mark_as_global,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int precision)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool success = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! name.empty ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << "# name: " << name << "\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_value val = val_arg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (mark_as_global)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << "# type: global " << val.type_name () << "\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << "# type: " << val.type_name () << "\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! precision)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ precision = Vsave_precision;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long old_precision = os.precision ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.precision (precision);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ success = val.save_ascii (os);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Insert an extra pair of newline characters after the data so that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // multiple data elements may be handled separately by gnuplot (see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // the description of the index qualifier for the plot command in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // gnuplot documentation).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << "\n\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.precision (old_precision);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (os && success);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+save_ascii_data_for_plotting (std::ostream& os, const octave_value& t,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const std::string& name)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return save_ascii_data (os, t, name, false, 6);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Maybe this should be a static function in tree-plot.cc?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// If TC is matrix, save it on stream OS in a format useful for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// making a 3-dimensional plot with gnuplot. If PARAMETRIC is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// TRUE, assume a parametric 3-dimensional plot will be generated.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+save_three_d (std::ostream& os, const octave_value& tc, bool parametric)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool fail = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type nr = tc.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type nc = tc.columns ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (tc.is_real_matrix ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << "# 3-D data...\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "# type: matrix\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "# total rows: " << nr << "\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "# total columns: " << nc << "\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long old_precision = os.precision ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.precision (6);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (parametric)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type extras = nc % 3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (extras)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ warning ("ignoring last %d columns", extras);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Matrix tmp = tc.matrix_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nr = tmp.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < nc-extras; i += 3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << tmp.extract (0, i, nr-1, i+2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i+3 < nc-extras)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << "\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Matrix tmp = tc.matrix_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nr = tmp.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type i = 0; i < nc; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << tmp.extract (0, i, nr-1, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i+1 < nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os << "\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.precision (old_precision);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ::error ("for now, I can only save real matrices in 3-D format");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fail = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (os && ! fail);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEFUN (save_precision, args, nargout,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "-*- texinfo -*-\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@deftypefn {Built-in Function} {@var{val} =} save_precision ()\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@deftypefnx {Built-in Function} {@var{old_val} =} save_precision (@var{new_val})\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@deftypefnx {Built-in Function} {} save_precision (@var{new_val}, \"local\")\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Query or set the internal variable that specifies the number of digits to\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+keep when saving data in text format.\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+When called from inside a function with the @qcode{\"local\"} option, the\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+variable is changed locally for the function and any subroutines it calls.\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+The original variable value is restored when exiting the function.\n\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@end deftypefn")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return SET_INTERNAL_VARIABLE_WITH_LIMITS (save_precision, -1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::numeric_limits<int>::max ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/ls-oct-ascii.h b/src/ls-oct-ascii.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new file mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0000000..1d6b6bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/ls-oct-ascii.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,189 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Copyright (C) 2003-2015 John W. Eaton
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+This file is part of Octave.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is free software; you can redistribute it and/or modify it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+under the terms of the GNU General Public License as published by the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Free Software Foundation; either version 3 of the License, or (at your
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option) any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Octave is distributed in the hope that it will be useful, but WITHOUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+along with Octave; see the file COPYING. If not, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+<http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined (octave_ls_oct_ascii_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define octave_ls_oct_ascii_h 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cfloat>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sstream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "str-vec.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "ls-ascii-helper.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Flag for cell elements
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define CELL_ELT_TAG "<cell-element>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Used when converting Inf to something that gnuplot can read.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef OCT_RBV
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define OCT_RBV (std::numeric_limits<double>::max () / 100.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern OCTINTERP_API std::string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extract_keyword (std::istream& is, const char *keyword,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const bool next_only = false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern OCTINTERP_API std::string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+read_ascii_data (std::istream& is, const std::string& filename, bool& global,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_value& tc, octave_idx_type count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern OCTINTERP_API bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+save_ascii_data (std::ostream& os, const octave_value& val_arg,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const std::string& name, bool mark_as_global, int precision);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern OCTINTERP_API bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+save_ascii_data_for_plotting (std::ostream& os, const octave_value& t,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const std::string& name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern OCTINTERP_API bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+save_three_d (std::ostream& os, const octave_value& t,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool parametric = false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Match KEYWORD on stream IS, placing the associated value in VALUE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// returning TRUE if successful and FALSE otherwise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Input should look something like:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// [%#][ \t]*keyword[ \t]*int-value.*\n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extract_keyword (std::istream& is, const char *keyword, T& value,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const bool next_only = false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool status = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value = T ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c == '%' || c == '#')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::ostringstream buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && (c == ' ' || c == '\t' || c == '%' || c == '#'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ; // Skip whitespace and comment characters.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (isalpha (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf << c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && isalpha (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf << c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string tmp = buf.str ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool match = (tmp.compare (0, strlen (keyword), keyword) == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (match)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && (c == ' ' || c == '\t' || c == ':'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ; // Skip whitespace and the colon.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is.putback (c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c != '\n' && c != '\r')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is >> value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ status = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ skip_until_newline (is, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (next_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extract_keyword (std::istream& is, const std::string& kw, T& value,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const bool next_only = false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return extract_keyword (is, kw.c_str (), value, next_only);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Match one of the elements in KEYWORDS on stream IS, placing the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// matched keyword in KW and the associated value in VALUE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// returning TRUE if successful and FALSE otherwise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Input should look something like:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+//
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// [%#][ \t]*keyword[ \t]*int-value.*\n
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extract_keyword (std::istream& is, const string_vector& keywords,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string& kw, T& value, const bool next_only = false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool status = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ kw = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ char c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c == '%' || c == '#')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::ostringstream buf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && (c == ' ' || c == '\t' || c == '%' || c == '#'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ; // Skip whitespace and comment characters.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (isalpha (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf << c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && isalpha (c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ buf << c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string tmp = buf.str ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 0; i < keywords.length (); i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int match = (tmp == keywords[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (match)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ kw = keywords[i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (is.get (c) && (c == ' ' || c == '\t' || c == ':'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ; // Skip whitespace and the colon.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is.putback (c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c != '\n' && c != '\r')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is >> value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ status = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ skip_until_newline (is, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (next_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/ov-galois.cc b/src/ov-galois.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 010d48c..64fbf24 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/ov-galois.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/ov-galois.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,17 +24,32 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/byte-swap.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/lo-ieee.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <octave/oct-hdf5.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/oct-locbuf.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/oct-obj.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/ov.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/pr-output.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <octave/ls-oct-ascii.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "ls-oct-ascii.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "galois.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ov-galois.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (HAVE_HDF5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined (HAVE_HDF5_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <hdf5.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include "oct-hdf5-types.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined (OCTAVE_ENABLE_64)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define H5T_NATIVE_IDX H5T_NATIVE_INT64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define H5T_NATIVE_IDX H5T_NATIVE_INT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ! defined (X_CAST)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define X_CAST(T, E) (T) (E)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (DEFINE_OCTAVE_ALLOCATOR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFINE_OCTAVE_ALLOCATOR (octave_galois);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/ov-galois.h b/src/ov-galois.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e55f7d8..d16ef29 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/ov-galois.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/ov-galois.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,6 +44,10 @@ typedef int octave_hdf5_id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if ! defined (OV_REP_TYPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define OV_REP_TYPE octave_base_value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class octave_value_list;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class tree_walker;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/syndtable.cc b/src/syndtable.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 296d4c0..0ee8675 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/syndtable.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/syndtable.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,8 +20,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/oct.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define COL_MAJ(N) (N / (SIZEOF_INT << 3))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define COL_MIN(N) (N % (SIZEOF_INT << 3))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define COL_MAJ(N) (N / (sizeof (int) << 3))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define COL_MIN(N) (N % (sizeof (int) << 3))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Array<int>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_errs (const int& nmin, const int& nmax, const int &nerrs)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-communications/files/patch-octave5.diff b/math/octave-communications/files/patch-octave5.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5bec468..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-communications/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,350 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/genqamdemod.cc.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/genqamdemod.cc 2019-03-09 03:46:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nr1 (args(0).rows ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nc1 (args(0).columns ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int arg_is_empty1 = empty_arg ("genqamdemod", nr1, nc1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int arg_is_empty1 = args(0).isempty();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Matrix y (nr1,nc1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nr2 (args(1).rows ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/gf.cc.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/gf.cc 2019-03-09 04:20:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -971,7 +971,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nr = arg.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int nc = arg.columns ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int arg_is_empty = empty_arg ("glu", nr, nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (arg_is_empty < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1055,7 +1055,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int arg_is_empty = empty_arg ("ginverse", nr, nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (arg_is_empty < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1152,7 +1152,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int arg_is_empty = empty_arg ("gdet", nr, nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (arg_is_empty < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1212,7 +1212,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int arg_is_empty = empty_arg ("grank", nr, nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (arg_is_empty > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retval = 0.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/galois-def.h.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/galois-def.h 2019-03-09 04:09:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +137,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r(i, j) = (int)m1(i, j) ^ (int)m2(0, 0); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant (#OP, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant (#OP, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,7 +221,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m1_nr > 0 && m1_nc > 0) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,7 +289,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r(i, j) = C1 (m1(i, j)) OP C2 (m2(0, 0)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return r; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,7 +350,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OP (m2(0, 0) != ZERO); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return r; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/galois.cc.orig 2019-03-09 03:59:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/galois.cc 2019-03-09 04:04:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/error.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/mx-op-defs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "galois.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -216,7 +216,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nr != a_nr || nc != a_nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return *this;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nr != a_nr || nc != a_nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return *this;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -518,7 +518,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (a_nr != b_nr || a_nc != b_nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant ("operator .^", a_nr, a_nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant ("operator .^", a_nr, a_nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return galois ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -549,7 +549,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (a_nr != b_nr || a_nc != b_nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant ("operator .^", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant ("operator .^", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return galois ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -758,7 +758,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return product (a, b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (a_nc != b_nr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return galois ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1420,7 +1420,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int a_nr = a.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int b_nr = b.rows ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return galois ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1464,7 +1464,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int a_nc = a.cols ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int b_nc = b.cols ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::err_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return galois ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/gf.cc.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/gf.cc 2019-03-09 04:16:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/defun-dld.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/oct-locbuf.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/ov.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/utils.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((!galois_type_loaded) || (a.type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- galois m = ((const octave_galois&) a.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,7 +196,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,7 +302,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((!galois_type_loaded) || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("greshape", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("greshape", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- galois a = ((const octave_galois&) args(0).get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,7 +372,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg (#FCN, arg); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg (#FCN, arg); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -469,7 +469,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("gsqrt", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("gsqrt", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -508,7 +508,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("glog", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("glog", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -547,7 +547,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("gexp", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("gexp", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -962,7 +962,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("glu", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("glu", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1049,7 +1049,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("ginverse", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("ginverse", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1066,7 +1066,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nr != nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_square_matrix_required ("ginverse");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_square_matrix_required ("ginverse", "A");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1143,7 +1143,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("gdet", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("gdet", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1164,7 +1164,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (nr != nc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_square_matrix_required ("det");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_square_matrix_required ("det", "A");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1203,7 +1203,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("grank", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("grank", arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1333,7 +1333,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("rsenc", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("rsenc", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1874,7 +1874,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_wrong_type_arg ("rsdec", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_wrong_type_arg ("rsdec", args(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/ov-galois.cc.orig 2019-03-09 04:33:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/ov-galois.cc 2019-03-09 04:37:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/byte-swap.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/lo-ieee.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/oct-locbuf.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/oct-obj.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -328,13 +328,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rows () > 0 && columns () > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ warn_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "real matrix", "real scalar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retval = (double) gval (0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_invalid_conversion ("galois", "real scalar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_invalid_conversion ("galois", "real scalar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,13 +348,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (rows () > 0 && columns () > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ warn_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "real matrix", "real scalar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- retval = (double) gval (0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gripe_invalid_conversion ("galois", "complex scalar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err_invalid_conversion ("galois", "complex scalar");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>