# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1256046309 -7200
# Node ID 7bda650b691a21434cddb2452a0fbc77c558a9ca
# Parent  31a22d48f41fac70a7b750513eb7543dbde551fd
add omitted files from 26abff55f6fe

diff -r 31a22d48f41f -r 7bda650b691a liboctave/bsxfun-decl.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liboctave/bsxfun-decl.h	Tue Oct 20 15:45:09 2009 +0200
@@ -0,0 +1,50 @@
+/*
+
+Copyright (C) 2009 Jaroslav Hajek
+Copyright (C) 2009 VZLU Prague
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#if !defined (octave_bsxfun_decl_h)
+#define octave_bsxfun_decl_h 1
+
+#define BSXFUN_OP_DECL(OP, ARRAY, API) \
+extern API ARRAY bsxfun_ ## OP (const ARRAY&, const ARRAY&);
+
+#define BSXFUN_REL_DECL(OP, ARRAY, API) \
+extern API boolNDArray bsxfun_ ## OP (const ARRAY&, const ARRAY&);
+
+#define BSXFUN_STDOP_DECLS(ARRAY, API) \
+  BSXFUN_OP_DECL (add, ARRAY, API) \
+  BSXFUN_OP_DECL (sub, ARRAY, API) \
+  BSXFUN_OP_DECL (mul, ARRAY, API) \
+  BSXFUN_OP_DECL (div, ARRAY, API) \
+  BSXFUN_OP_DECL (pow, ARRAY, API) \
+  BSXFUN_OP_DECL (min, ARRAY, API) \
+  BSXFUN_OP_DECL (max, ARRAY, API)
+
+#define BSXFUN_STDREL_DECLS(ARRAY, API) \
+  BSXFUN_REL_DECL (eq, ARRAY, API) \
+  BSXFUN_REL_DECL (ne, ARRAY, API) \
+  BSXFUN_REL_DECL (lt, ARRAY, API) \
+  BSXFUN_REL_DECL (le, ARRAY, API) \
+  BSXFUN_REL_DECL (gt, ARRAY, API) \
+  BSXFUN_REL_DECL (ge, ARRAY, API) \
+
+#endif
diff -r 31a22d48f41f -r 7bda650b691a liboctave/bsxfun-defs.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liboctave/bsxfun-defs.cc	Tue Oct 20 15:45:09 2009 +0200
@@ -0,0 +1,171 @@
+/*
+
+Copyright (C) 2009 Jaroslav Hajek
+Copyright (C) 2009 VZLU Prague
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#if !defined (octave_bsxfun_defs_h)
+#define octave_bsxfun_defs_h 1
+
+#include <algorithm>
+#include <iostream>
+
+#include "dim-vector.h"
+#include "oct-locbuf.h"
+#include "lo-error.h"
+
+#include "mx-inlines.cc"
+
+template <class RNDA, class XNDA, class YNDA>
+RNDA
+do_bsxfun_op (const XNDA& x, const YNDA& y,
+              void (*op_vv) (size_t, typename RNDA::element_type *,
+                             const typename XNDA::element_type *,
+                             const typename YNDA::element_type *),
+              void (*op_sv) (size_t, typename RNDA::element_type *,
+                             typename XNDA::element_type,
+                             const typename YNDA::element_type *),
+              void (*op_vs) (size_t, typename RNDA::element_type *,
+                             const typename XNDA::element_type *,
+                             typename YNDA::element_type))
+{
+  int nd = std::max (x.ndims (), y.ndims ());
+  dim_vector dvx = x.dims ().redim (nd), dvy = y.dims ().redim (nd);
+
+  // Construct the result dimensions.
+  dim_vector dvr;
+  dvr.resize (nd);
+  for (int i = 0; i < nd; i++)
+    {
+      octave_idx_type xk = dvx(i), yk = dvy(i);
+      if (xk == 1)
+        dvr(i) = yk;
+      else if (yk == 1 || xk == yk)
+        dvr(i) = xk;
+      else
+        {
+          (*current_liboctave_error_handler)
+            ("bsxfun: nonconformant dimensions: %s and %s",
+             x.dims ().str ().c_str (), y.dims ().str ().c_str ());
+          break;
+        }
+    }
+
+  RNDA retval (dvr);
+
+  const typename XNDA::element_type *xvec = x.fortran_vec ();
+  const typename YNDA::element_type *yvec = y.fortran_vec ();
+  typename RNDA::element_type *rvec = retval.fortran_vec ();
+
+  // Fold the common leading dimensions.
+  int start;
+  octave_idx_type ldr = 1;
+  for (start = 0; start < nd; start++)
+    {
+      if (dvx(start) != dvy(start))
+        break;
+      ldr *= dvr(start);
+    }
+
+  if (retval.is_empty ())
+    ; // do nothing
+  else if (start == nd)
+    op_vv (retval.numel (), rvec, xvec, yvec);
+  else
+    {
+      // Determine the type of the low-level loop.
+      bool xsing = false, ysing = false;
+      if (ldr == 1)
+        {
+          xsing = dvx(start) == 1;
+          ysing = dvy(start) == 1;
+          if (xsing || ysing)
+            {
+              ldr *= dvx(start) * dvy(start);
+              start++;
+            }
+        }
+      dim_vector cdvx = dvx.cumulative (), cdvy = dvy.cumulative ();
+      // Nullify singleton dims to achieve a spread effect.
+      for (int i = std::max (start, 1); i < nd; i++)
+        {
+          if (dvx(i) == 1)
+            cdvx(i-1) = 0;
+          if (dvy(i) == 1)
+            cdvy(i-1) = 0;
+        }
+
+      octave_idx_type niter = dvr.numel (start);
+      // The index array.
+      OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, idx, nd, 0);
+      for (octave_idx_type iter = 0; iter < niter; iter++)
+        {
+          // Compute indices. 
+          // FIXME: performance impact noticeable?
+          octave_idx_type xidx = cdvx.cum_compute_index (idx);
+          octave_idx_type yidx = cdvy.cum_compute_index (idx);
+          octave_idx_type ridx = dvr.compute_index (idx);
+
+          // Apply the low-level loop.
+          if (xsing)
+            op_sv (ldr, rvec + ridx, xvec[xidx], yvec + yidx);
+          else if (ysing)
+            op_vs (ldr, rvec + ridx, xvec + xidx, yvec[yidx]);
+          else
+            op_vv (ldr, rvec + ridx, xvec + xidx, yvec + yidx);
+
+          dvr.increment_index (idx + start, start);
+        }
+    }
+
+  return retval;
+}
+
+#define BSXFUN_OP_DEF(OP, ARRAY) \
+ARRAY bsxfun_ ## OP (const ARRAY& x, const ARRAY& y)
+
+#define BSXFUN_REL_DEF(OP, ARRAY) \
+boolNDArray bsxfun_ ## OP (const ARRAY& x, const ARRAY& y)
+
+#define BSXFUN_OP_DEF_MXLOOP(OP, ARRAY, LOOP) \
+  BSXFUN_OP_DEF(OP, ARRAY) \
+  { return do_bsxfun_op<ARRAY, ARRAY, ARRAY> (x, y, LOOP, LOOP, LOOP); }
+
+#define BSXFUN_REL_DEF_MXLOOP(OP, ARRAY, LOOP) \
+  BSXFUN_REL_DEF(OP, ARRAY) \
+  { return do_bsxfun_op<boolNDArray, ARRAY, ARRAY> (x, y, LOOP, LOOP, LOOP); }
+
+#define BSXFUN_STDOP_DEFS_MXLOOP(ARRAY) \
+  BSXFUN_OP_DEF_MXLOOP (add, ARRAY, mx_inline_add) \
+  BSXFUN_OP_DEF_MXLOOP (sub, ARRAY, mx_inline_sub) \
+  BSXFUN_OP_DEF_MXLOOP (mul, ARRAY, mx_inline_mul) \
+  BSXFUN_OP_DEF_MXLOOP (div, ARRAY, mx_inline_div) \
+  BSXFUN_OP_DEF_MXLOOP (min, ARRAY, mx_inline_xmax) \
+  BSXFUN_OP_DEF_MXLOOP (max, ARRAY, mx_inline_xmin) \
+
+#define BSXFUN_STDREL_DEFS_MXLOOP(ARRAY) \
+  BSXFUN_REL_DEF_MXLOOP (eq, ARRAY, mx_inline_eq) \
+  BSXFUN_REL_DEF_MXLOOP (ne, ARRAY, mx_inline_ne) \
+  BSXFUN_REL_DEF_MXLOOP (lt, ARRAY, mx_inline_lt) \
+  BSXFUN_REL_DEF_MXLOOP (le, ARRAY, mx_inline_le) \
+  BSXFUN_REL_DEF_MXLOOP (gt, ARRAY, mx_inline_gt) \
+  BSXFUN_REL_DEF_MXLOOP (ge, ARRAY, mx_inline_ge)
+
+#endif