changeset 20047:b66ab1af5a3b

remove permutation matrix operators added in cset b646413c3d0e (bug #44316)
author John W. Eaton <jwe@octave.org>
date Wed, 01 Apr 2015 16:14:25 -0400
parents 2535b9ffa2fc
children 08fae2e963fb ab825e51dc68
files libinterp/operators/op-pm-sm.cc
diffstat 1 files changed, 0 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/operators/op-pm-sm.cc	Wed Apr 01 16:00:35 2015 -0400
+++ b/libinterp/operators/op-pm-sm.cc	Wed Apr 01 16:14:25 2015 -0400
@@ -32,49 +32,6 @@
 
 #include "ov-perm.h"
 #include "ov-re-sparse.h"
-#include "ov-bool-sparse.h"
-
-// Unary permutation ops, some cast to sparse
-
-//Avoid casting to a full matrix
-DEFUNOP_OP (uplus, perm_matrix, /* no-op */)
-
-// Not calling standard CAST_UNOP_ARG for these next two because a
-// dynamic_cast would fail.
-DEFUNOP (not, perm_matrix)
-{
-  // Obviously negation of a permutation matrix destroys sparsity
-  return octave_value (! a.bool_array_value ());
-}
-
-DEFUNOP (uminus, perm_matrix)
-{
-  return octave_value (- a.sparse_matrix_value ());
-}
-
-// Most other logical operations cast to SparseBoolMatrix
-DEFBINOP (eq_pm, perm_matrix, perm_matrix)
-{
-  CAST_BINOP_ARGS (const octave_perm_matrix&, const octave_perm_matrix&);
-  return v1.sparse_bool_matrix_value () == v2.sparse_bool_matrix_value ();
-}
-DEFBINOP (ne_pm, perm_matrix, perm_matrix)
-{
-  CAST_BINOP_ARGS (const octave_perm_matrix&, const octave_perm_matrix&);
-  return v1.sparse_bool_matrix_value () != v2.sparse_bool_matrix_value ();
-}
-DEFBINOP (el_and_pm, perm_matrix, perm_matrix)
-{
-  CAST_BINOP_ARGS (const octave_perm_matrix&, const octave_perm_matrix&);
-  return mx_el_and(v1.sparse_bool_matrix_value (),
-                   v2.sparse_bool_matrix_value ());
-}
-DEFBINOP (el_or_pm,  perm_matrix, perm_matrix)
-{
-  CAST_BINOP_ARGS (const octave_perm_matrix&, const octave_perm_matrix&);
-  return mx_el_or(v1.sparse_bool_matrix_value (),
-                  v2.sparse_bool_matrix_value ());
-}
 
 // permutation matrix by sparse matrix ops
 
@@ -129,11 +86,6 @@
 void
 install_pm_sm_ops (void)
 {
-  INSTALL_UNOP (op_not, octave_perm_matrix, not);
-  INSTALL_UNOP (op_uplus, octave_perm_matrix, uplus);
-  INSTALL_UNOP (op_uminus, octave_perm_matrix, uminus);
-
-
   INSTALL_BINOP (op_mul, octave_perm_matrix, octave_sparse_matrix,
                  mul_pm_sm);
   INSTALL_BINOP (op_ldiv, octave_perm_matrix, octave_sparse_matrix,
@@ -142,9 +94,4 @@
                  mul_sm_pm);
   INSTALL_BINOP (op_div, octave_sparse_matrix, octave_perm_matrix,
                  div_sm_pm);
-
-  INSTALL_BINOP (op_eq, octave_perm_matrix, octave_perm_matrix, eq_pm);
-  INSTALL_BINOP (op_ne, octave_perm_matrix, octave_perm_matrix, ne_pm);
-  INSTALL_BINOP (op_el_and, octave_perm_matrix, octave_perm_matrix, el_and_pm);
-  INSTALL_BINOP (op_el_or,  octave_perm_matrix, octave_perm_matrix, el_or_pm);
 }