Mercurial > octave

changeset 11126:304b0ed4ca56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__isequal__.m: style fixes
author John W. Eaton <jwe@octave.org>
date Thu, 21 Oct 2010 00:44:32 -0400
parents 8a8eb099502e
children 64728cd28d7a
files scripts/ChangeLog scripts/general/private/__isequal__.m
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Wed Oct 20 21:13:58 2010 -0700
+++ b/scripts/ChangeLog	Thu Oct 21 00:44:32 2010 -0400
@@ -1,3 +1,7 @@
+2010-10-21  John W. Eaton  <jwe@octave.org>
+
+	* general/private/__isequal__.m: Style fixes.
+
 2010-10-20  Iain Murray <murray@cs.toronto.edu>
 
 	* general/private/__isequal__.m: Fix bug #31239 where 
--- a/scripts/general/private/__isequal__.m	Wed Oct 20 21:13:58 2010 -0700
+++ b/scripts/general/private/__isequal__.m	Thu Oct 21 00:44:32 2010 -0400
@@ -61,7 +61,8 @@
   t = (all (strcmp (class(x),
                    cellfun (@class, varargin, "UniformOutput", false)))
        || ((isnumeric (x) || islogical (x))
-           && all ((cellfun (@isnumeric, varargin) | cellfun (@islogical, varargin)))));
+           && all (cellfun (@isnumeric, varargin)
+                   | cellfun (@islogical, varargin))));
 
   if (t)
     ## Test that everything has the same number of dimensions.
@@ -78,7 +79,7 @@
     idx = 0;
     while (t && idx < l_x)
       idx++;
-      t = all (s_x(idx) == s_v(idx, :));
+      t = all (s_x(idx) == s_v(idx,:));
     endwhile
   endif
 
@@ -159,12 +160,12 @@
         m = (x == y);
         t = all (m);
 
-        if (!t) && (nans_compare_equal)
-            t = isnan (x(!m)) && isnan (y(!m));
+        if (!t && nans_compare_equal)
+          t = isnan (x(!m)) && isnan (y(!m));
         endif
 
         if (!t)
-            return;
+          return;
         endif
       endfor