# HG changeset patch
# User Jaroslav Hajek <address@hidden>
# Date 1260046461 -3600
# Node ID d0d6ff39db54ada48dd2e63745045f4adf075671
# Parent  31d644253380c6254516b005087b76f364f80f03
simplify ismember

diff -r 31d644253380 -r d0d6ff39db54 scripts/ChangeLog
--- a/scripts/ChangeLog	Sat Dec 05 21:45:45 2009 +0100
+++ b/scripts/ChangeLog	Sat Dec 05 21:54:21 2009 +0100
@@ -1,3 +1,7 @@
+2009-12-05  Jaroslav Hajek  <address@hidden>
+
+	* set/ismember.m: Simplify.
+
 2009-12-03  John W. Eaton  <address@hidden>
 
 	* audio/wavwrite.m: Delete generated a.wav file after each test.
diff -r 31d644253380 -r d0d6ff39db54 scripts/set/ismember.m
--- a/scripts/set/ismember.m	Sat Dec 05 21:45:45 2009 +0100
+++ b/scripts/set/ismember.m	Sat Dec 05 21:54:21 2009 +0100
@@ -98,31 +98,19 @@
       [s, is] = sort (s);
     endif
 
-    ## sort out NaNs
+    ## sort out NaNs in table
     if (isreal (s) && ! isempty (s) && isnan (s(end)))
         s = s(1:end - sum (isnan (s)));
     endif
     
-    if (isreal (a))
-      anan = isnan (a);
-      a(anan) = 0;
-    endif
-
     if (nargout > 1)
       a_idx = lookup (s, a, "m");
       tf = logical (a_idx);
       if (! isempty (is))
         a_idx(tf) = is (a_idx(tf));
       endif
-      if (isreal (a))
-        tf(anan) = false;
-        a_idx(anan) = 0;
-      endif
     else
       tf = lookup (s, a, "b");
-      if (isreal (a))
-        tf(anan) = false;
-      endif
     endif
 
   elseif (nargin == 3 && strcmpi (rows_opt, "rows"))
# HG changeset patch
# User address@hidden
# Date 1260059329 18000
# Node ID 1e11616908c163e63aaa9c968075bf0f1c2ffc6b
# Parent  d0d6ff39db54ada48dd2e63745045f4adf075671
Fix printing of classes in cell arrays.

diff -r d0d6ff39db54 -r 1e11616908c1 src/ChangeLog
--- a/src/ChangeLog	Sat Dec 05 21:54:21 2009 +0100
+++ b/src/ChangeLog	Sat Dec 05 19:28:49 2009 -0500
@@ -1,3 +1,8 @@
+2009-12-05  Judd Storrs  <address@hidden>
+
+	* ov-class.cc (octave_class::print_with_name) Add default case for
+	classes that don't define a display method.
+
 2009-12-05  Jaroslav Hajek  <address@hidden>
 
 	* DLD-FUNCTIONS/lookup.cc (Flookup): Document complexity.
diff -r d0d6ff39db54 -r 1e11616908c1 src/ov-class.cc
--- a/src/ov-class.cc	Sat Dec 05 21:54:21 2009 +0100
+++ b/src/ov-class.cc	Sat Dec 05 19:28:49 2009 -0500
@@ -1008,7 +1008,7 @@
 }
 
 void
-octave_class::print_with_name (std::ostream&, const std::string& name, 
+octave_class::print_with_name (std::ostream& os, const std::string& name, 
 			       bool)
 {
   octave_value fcn = symbol_table::find_method ("display", class_name ());
@@ -1028,6 +1028,12 @@
 
       feval (fcn.function_value (), args);
     }
+  else
+    {
+      indent (os);
+      os << name << " = <class " << class_name () << ">";
+      newline (os);
+    }
 }
 
 // Loading a class properly requires an exemplar map entry for success.