Mercurial > octave-nkf

diff src/OPERATORS/op-m-sm.cc @ 6221:8e0f1eda266b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-01-03 17:23:33 by jwe]
author jwe
date Wed, 03 Jan 2007 17:23:34 +0000
parents 6b9cec830d72
children 93c65f2a5668
line wrap: on
line diff
--- a/src/OPERATORS/op-m-sm.cc	Sat Dec 30 17:29:35 2006 +0000
+++ b/src/OPERATORS/op-m-sm.cc	Wed Jan 03 17:23:34 2007 +0000
@@ -48,12 +48,25 @@
 DEFBINOP (div, matrix, sparse_matrix)
 {
   CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&);
-  MatrixType typ = v2.matrix_type ();
+
+  if (v2.rows() == 1 && v2.columns() == 1)
+    {
+      double d = v2.scalar_value ();
+
+      if (d == 0.0)
+	gripe_divide_by_zero ();
 
-  Matrix ret = xdiv (v1.matrix_value (), v2.sparse_matrix_value (), typ);
+      return octave_value (v1.array_value () / d);
+    }
+  else
+    {
+      MatrixType typ = v2.matrix_type ();
 
-  v2.matrix_type (typ);
-  return ret;
+      Matrix ret = xdiv (v1.matrix_value (), v2.sparse_matrix_value (), typ);
+
+      v2.matrix_type (typ);
+      return ret;
+    }
 }
 
 DEFBINOPX (pow, matrix, sparse_matrix)