Mercurial > octave

changeset 23371:a5280a05b188

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: Change example old-style class code to overload disp rather than display. * examples/code/@polynomial/disp.m: New function to print out a polynomial. * examples/code/@polynomial/display.m: Deleted function. * examples/module.mk: Update build system. * examples/code/@FIRfilter/display.m: Call disp function on polynomial. * doc/interpreter/oop.txi: Include examples/code/@polynomial/disp.m in documentation.
author Rik <rik@octave.org>
date Fri, 07 Apr 2017 15:31:37 -0700
parents e284cf4239bf
children 8a23ed65ef21
files doc/interpreter/oop.txi examples/code/@FIRfilter/display.m examples/code/@polynomial/disp.m examples/code/@polynomial/display.m examples/module.mk
diffstat 5 files changed, 37 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/oop.txi	Fri Apr 07 15:03:29 2017 -0700
+++ b/doc/interpreter/oop.txi	Fri Apr 07 15:31:37 2017 -0700
@@ -175,7 +175,7 @@
 An example of a display method for the polynomial class might be
 
 @example
-@EXAMPLEFILE(@polynomial/display.m)
+@EXAMPLEFILE(@polynomial/disp.m)
 @end example
 
 @noindent
--- a/examples/code/@FIRfilter/display.m	Fri Apr 07 15:03:29 2017 -0700
+++ b/examples/code/@FIRfilter/display.m	Fri Apr 07 15:31:37 2017 -0700
@@ -1,4 +1,4 @@
 function display (f)
   printf ("%s.polynomial", inputname (1));
-  display (f.polynomial);
+  disp (f.polynomial);
 endfunction
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/code/@polynomial/disp.m	Fri Apr 07 15:31:37 2017 -0700
@@ -0,0 +1,34 @@
+function disp (p)
+
+  a = p.poly;
+  first = true;
+  for i = 1 : length (a);
+    if (a(i) != 0)
+      if (first)
+        first = false;
+      elseif (a(i) > 0 || isnan (a(i)))
+        printf (" +");
+      endif
+      if (a(i) < 0)
+        printf (" -");
+      endif
+      if (i == 1)
+        printf (" %.5g", abs (a(i)));
+      elseif (abs (a(i)) != 1)
+        printf (" %.5g *", abs (a(i)));
+      endif
+      if (i > 1)
+        printf (" X");
+      endif
+      if (i > 2)
+        printf (" ^ %d", i - 1);
+      endif
+    endif
+  endfor
+
+  if (first)
+    printf (" 0");
+  endif
+  printf ("\n");
+
+endfunction
--- a/examples/code/@polynomial/display.m	Fri Apr 07 15:03:29 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-function display (p)
-
-  printf ("%s =", inputname (1));
-
-  a = p.poly;
-  first = true;
-  for i = 1 : length (a);
-    if (a(i) != 0)
-      if (first)
-        first = false;
-      elseif (a(i) > 0 || isnan (a(i)))
-        printf (" +");
-      endif
-      if (a(i) < 0)
-        printf (" -");
-      endif
-      if (i == 1)
-        printf (" %.5g", abs (a(i)));
-      elseif (abs (a(i)) != 1)
-        printf (" %.5g *", abs (a(i)));
-      endif
-      if (i > 1)
-        printf (" X");
-      endif
-      if (i > 2)
-        printf (" ^ %d", i - 1);
-      endif
-    endif
-  endfor
-
-  if (first)
-    printf (" 0");
-  endif
-  printf ("\n");
-
-endfunction
--- a/examples/module.mk	Fri Apr 07 15:03:29 2017 -0700
+++ b/examples/module.mk	Fri Apr 07 15:31:37 2017 -0700
@@ -16,7 +16,7 @@
   examples/code/@FIRfilter/display.m \
   examples/code/@FIRfilter/subsasgn.m \
   examples/code/@FIRfilter/subsref.m \
-  examples/code/@polynomial/display.m \
+  examples/code/@polynomial/disp.m \
   examples/code/@polynomial/double.m \
   examples/code/@polynomial/end.m \
   examples/code/@polynomial/get.m \