octave: libinterp/corefcn/pr-output.cc annotate

annotate libinterp/corefcn/pr-output.cc @ 24782:0eb41237424e

more templates for pr-output.cc functions * pr-output.h, pr-output.cc (pr_max_internal, pr_min_internal, make_complex_format, make_format, make_format_internal, make_real_format): Define with templates where possible. (pr_plus_format): New template function. Use to eliminate some duplicate code. (octave_print_internal): Define versions for float and FloatComplex.

author	John W. Eaton <jwe@octave.org>
date	Sun, 18 Feb 2018 14:32:36 -0600
parents	e6f380f9b2a4
children	4d945f2e5914

rev	line source
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1 /*
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 1993-2017 John W. Eaton
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	4
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	11
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	16
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23829 diff changeset	19 <https://www.gnu.org/licenses/>.
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	20
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	21 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	22
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21662 diff changeset	23 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21200 diff changeset	24 # include "config.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	25 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	26
23662 bd77ab816e43 eliminate obsolete file lo-math.h John W. Eaton <jwe@octave.org> parents: 23619 diff changeset	27 #include <cmath>
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	28
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3373 diff changeset	29 #include <iomanip>
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3373 diff changeset	30 #include <iostream>
23455 73ff72d3d603 maint: Eliminate <cfloat.h> header from libinterp files Rik <rik@octave.org> parents: 23450 diff changeset	31 #include <limits>
73ff72d3d603 maint: Eliminate <cfloat.h> header from libinterp files Rik <rik@octave.org> parents: 23450 diff changeset	32 #include <list>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5759 diff changeset	33 #include <sstream>
1728 42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1716 diff changeset	34 #include <string>
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe] jwe parents: 1716 diff changeset	35
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	36 #include "Array-util.h"
453 393e95f46b51 [project @ 1994-06-06 00:05:20 by jwe] jwe parents: 296 diff changeset	37 #include "CMatrix.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	38 #include "Range.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2915 diff changeset	39 #include "cmd-edit.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1346 diff changeset	40 #include "dMatrix.h"
2891 1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe] jwe parents: 2847 diff changeset	41 #include "lo-mappers.h"
2317 8c09c04f7747 [project @ 1996-07-14 22:30:15 by jwe] jwe parents: 2305 diff changeset	42 #include "mach-info.h"
1651 e846e361a265 [project @ 1995-12-20 06:59:12 by jwe] jwe parents: 1588 diff changeset	43 #include "oct-cmplx.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4051 diff changeset	44 #include "quit.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	45
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	46 #include "Cell.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1346 diff changeset	47 #include "defun.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1346 diff changeset	48 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21066 diff changeset	49 #include "errwarn.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	50 #include "ovl.h"
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	51 #include "oct-stream.h"
20925 667861ffffab Extracted header class octave-preserve-stream-state from utils.{cc/h}. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 20915 diff changeset	52 #include "octave-preserve-stream-state.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1346 diff changeset	53 #include "pager.h"
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	54 #include "parse.h"
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	55 #include "pr-flt-fmt.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1346 diff changeset	56 #include "pr-output.h"
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	57 #include "sysdep.h"
6803 fe19c6cb5bc6 [project @ 2007-07-26 18:04:05 by jwe] jwe parents: 6788 diff changeset	58 #include "unwind-prot.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	59 #include "utils.h"
1352 19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe] jwe parents: 1346 diff changeset	60 #include "variables.h"
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	61
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	62 // TRUE means use a scaled fixed point format for 'format long' and
d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	63 // 'format short'.
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	64 static bool Vfixed_point_format = false;
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	65
5360 33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5331 diff changeset	66 // TRUE means that the dimensions of empty objects should be printed
2165 83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	67 // like this: x = [](2x0).
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	68 bool Vprint_empty_dimensions = true;
2165 83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	69
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	70 // TRUE means that the rows of big matrices should be split into
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	71 // smaller slices that fit on the screen.
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	72 static bool Vsplit_long_rows = true;
2165 83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	73
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	74 // TRUE means don't do any fancy formatting.
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	75 static bool free_format = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	76
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	77 // TRUE means print plus sign for nonzero, blank for zero.
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	78 static bool plus_format = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	79
4632 0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe] jwe parents: 4574 diff changeset	80 // First char for > 0, second for < 0, third for == 0.
19232 97eea1e2d9ff pr-output.cc: fix default chars for "format +" for Matlab compatibility Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	81 static std::string plus_format_chars = "+- ";
4632 0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe] jwe parents: 4574 diff changeset	82
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	83 // TRUE means always print in a rational approximation
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	84 static bool rat_format = false;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	85
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	86 // Used to force the length of the rational approximation string for Frats
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	87 static int rat_string_len = -1;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	88
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	89 // TRUE means always print like dollars and cents.
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	90 static bool bank_format = false;
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	91
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	92 // TRUE means print data in hexadecimal format.
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	93 static int hex_format = 0;
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	94
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	95 // TRUE means print data in binary-bit-pattern format.
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	96 static int bit_format = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	97
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	98 // TRUE means don't put newlines around the column number headers.
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	99 bool Vcompact_format = false;
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	100
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	101 // TRUE means use an e format.
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	102 static bool print_e = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	103
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	104 // TRUE means use a g format.
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	105 static bool print_g = false;
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	106
3018 5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe] jwe parents: 3014 diff changeset	107 // TRUE means print E instead of e for exponent field.
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	108 static bool print_big_e = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	109
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	110 // TRUE means use an engineering format.
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	111 static bool print_eng = false;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	112
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	113 static int
10771 82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	114 calc_scale_exp (const int& x)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	115 {
10771 82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	116 if (! print_eng)
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	117 return x;
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	118 else
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	119 return x - 3*static_cast<int> (x/3);
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	120
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	121 // The expression above is equivalent to x - (x % 3).
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	122
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	123 // According to the ISO specification for C++ the modulo operator is
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	124 // compiler dependent if any of the arguments are negative. Since
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	125 // this function will need to work on negative arguments, and we want
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	126 // to avoid portability issues, we re-implement the modulo function to
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	127 // the desired behavior (truncation). There may be a gnulib
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	128 // replacement.
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	129
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	130 // ISO/IEC 14882:2003 : Programming languages -- C++. 5.6.4: ISO,
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	131 // IEC. 2003 . "the binary % operator yields the remainder from the
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	132 // division of the first expression by the second. .... If both
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	133 // operands are nonnegative then the remainder is nonnegative; if not,
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	134 // the sign of the remainder is implementation-defined".
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	135 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	136
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	137 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	138 static inline int
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	139 engineering_exponent (T x)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	140 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	141 int ex = 0;
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	142
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	143 if (x != 0)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	144 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	145 T absval = (x < 0 ? -x : x);
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21782 diff changeset	146 int logabsval = static_cast<int> (std::floor (log10 (absval)));
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	147
20946 6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	148 // Avoid using modulo function with negative arguments for
6eff66fb8a02 style fixes for comments John W. Eaton <jwe@octave.org> parents: 20941 diff changeset	149 // portability. See extended comment at calc_scale_exp
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	150
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	151 if (logabsval < 0)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	152 ex = logabsval - 2 + ((-logabsval + 2) % 3);
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	153 else
10771 82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	154 ex = logabsval - (logabsval % 3);
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	155 }
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	156
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	157 return ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	158 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	159
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	160 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	161 static inline int
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	162 num_digits (T x)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	163 {
11450 5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script John W. Eaton <jwe@octave.org> parents: 10987 diff changeset	164 return 1 + (print_eng
5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script John W. Eaton <jwe@octave.org> parents: 10987 diff changeset	165 ? engineering_exponent (x)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21782 diff changeset	166 : static_cast<int> (std::floor (log10 (x))));
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	167 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	168
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	169 template <typename T>
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	170 int
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	171 pr_engineering_float<T>::exponent (void) const
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	172 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	173 return engineering_exponent (m_val);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	174 }
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	175
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	176 template <typename T>
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	177 T
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	178 pr_engineering_float<T>::mantissa (void) const
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	179 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	180 return m_val / std::pow (static_cast<T> (10), exponent ());
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	181 }
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	182
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	183 template <typename T>
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	184 std::ostream&
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	185 operator << (std::ostream& os, const pr_engineering_float<T>& pef)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	186 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	187 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	188
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	189 float_format real_fmt = pef.m_ff;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	190
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	191 if (real_fmt.fw >= 0)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	192 os << std::setw (real_fmt.fw - real_fmt.ex);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	193
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	194 if (real_fmt.prec >= 0)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	195 os << std::setprecision (real_fmt.prec);
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	196
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	197 os.flags (static_cast<std::ios::fmtflags>
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	198 (real_fmt.fmt \| real_fmt.up \| real_fmt.sp));
10771 82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	199
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	200 os << pef.mantissa ();
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	201
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands Rik <octave@nomad.inbox5.com> parents: 10741 diff changeset	202 int ex = pef.exponent ();
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	203 if (ex < 0)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	204 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	205 os << std::setw (0) << "e-";
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	206 ex = -ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	207 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	208 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	209 os << std::setw (0) << "e+";
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	210
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	211 os << std::setw (real_fmt.ex - 2) << std::setfill ('0') << ex;
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	212
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	213 return os;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	214 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	215
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	216 template <typename T>
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	217 std::ostream&
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	218 operator << (std::ostream& os, const pr_formatted_float<T>& pff)
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	219 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	220 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	221
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	222 float_format real_fmt = pff.m_ff;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	223
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	224 if (real_fmt.fw >= 0)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	225 os << std::setw (real_fmt.fw);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	226
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	227 if (real_fmt.prec >= 0)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	228 os << std::setprecision (real_fmt.prec);
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	229
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	230 os.flags (static_cast<std::ios::fmtflags>
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	231 (real_fmt.fmt \| real_fmt.up \| real_fmt.sp));
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	232
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	233 os << pff.m_val;
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	234
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	235 return os;
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	236 }
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	237
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	238 template <typename T>
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	239 static inline std::string
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	240 rational_approx (T val, int len)
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	241 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	242 std::string s;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	243
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	244 if (len <= 0)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	245 len = 10;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	246
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	247 if (octave::math::isinf (val))
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	248 s = "1/0";
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	249 else if (octave::math::isnan (val))
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	250 s = "0/0";
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15213 diff changeset	251 else if (val < std::numeric_limits<int>::min ()
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15213 diff changeset	252 \|\| val > std::numeric_limits<int>::max ()
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	253 \|\| octave::math::x_nint (val) == val)
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	254 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	255 std::ostringstream buf;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	256 buf.flags (std::ios::fixed);
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	257 buf << std::setprecision (0) << octave::math::round (val);
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	258 s = buf.str ();
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	259 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	260 else
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	261 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	262 T lastn = 1;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	263 T lastd = 0;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	264 T n = octave::math::round (val);
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	265 T d = 1;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	266 T frac = val - n;
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	267 int m = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	268
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	269 std::ostringstream buf2;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	270 buf2.flags (std::ios::fixed);
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	271 buf2 << std::setprecision (0) << static_cast<int> (n);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14429 diff changeset	272 s = buf2.str ();
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	273
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	274 while (true)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	275 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	276 T flip = 1 / frac;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	277 T step = octave::math::round (flip);
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	278 T nextn = n;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	279 T nextd = d;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	280
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	281 // Have we converged to 1/intmax ?
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	282 if (std::abs (flip) > static_cast<T> (std::numeric_limits<int>::max ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	283 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	284 lastn = n;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	285 lastd = d;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	286 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	287 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	288
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	289 frac = flip - step;
20230 e914b5399c67 Use in-place operators in C++ code where possible. Rik <rik@octave.org> parents: 20228 diff changeset	290 n = step * n + lastn;
e914b5399c67 Use in-place operators in C++ code where possible. Rik <rik@octave.org> parents: 20228 diff changeset	291 d = step * d + lastd;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	292 lastn = nextn;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	293 lastd = nextd;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	294
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	295 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	296 buf.flags (std::ios::fixed);
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	297 buf << std::setprecision (0) << static_cast<int> (n)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	298 << '/' << static_cast<int> (d);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	299 m++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	300
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	301 if (n < 0 && d < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	302 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	303 // Double negative, string can be two characters longer..
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	304 if (buf.str ().length () > static_cast<unsigned int> (len + 2))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	305 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	306 }
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	307 else if (buf.str ().length () > static_cast<unsigned int> (len))
19363 c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	308 break;
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	309
21747 61f3575250e4 rats: Fix round-off corner case for 32-bit systems (bug #47964) Mike Miller <mtmiller@octave.org> parents: 21743 diff changeset	310 if (std::abs (n) > std::numeric_limits<int>::max ()
61f3575250e4 rats: Fix round-off corner case for 32-bit systems (bug #47964) Mike Miller <mtmiller@octave.org> parents: 21743 diff changeset	311 \|\| std::abs (d) > std::numeric_limits<int>::max ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	312 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	313
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14429 diff changeset	314 s = buf.str ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	315 }
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	316
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	317 if (lastd < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	318 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	319 // Move sign to the top
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	320 lastd = - lastd;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	321 lastn = - lastn;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	322 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	323 buf.flags (std::ios::fixed);
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	324 buf << std::setprecision (0) << static_cast<int> (lastn)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	325 << '/' << static_cast<int> (lastd);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14429 diff changeset	326 s = buf.str ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	327 }
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	328 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	329
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	330 return s;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	331 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	332
19363 c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	333 /*
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	334 %!assert (rats (2.0005, 9), "4001/2000")
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	335 %!assert (rats (-2.0005, 10), "-4001/2000")
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	336 %!assert (strtrim (rats (2.0005, 30)), "4001/2000")
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	337 %!assert (pi - str2num (rats (pi, 30)), 0, 4 * eps)
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	338 %!assert (e - str2num (rats (e, 30)), 0, 4 * eps)
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	339 %!assert (rats (123, 2), " *")
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	340
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	341 %!test
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	342 %! v = 1 / double (intmax);
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	343 %! err = v - str2num (rats(v, 12));
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	344 %! assert (err, 0, 4 * eps);
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	345 */
c490eac28bbb pr-output.cc: Fix overflow in rational_approx (bug #43367..43369) Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	346
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	347 template <typename T>
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	348 std::ostream&
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	349 operator << (std::ostream& os, const pr_rational_float<T>& prf)
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	350 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	351 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	352
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	353 float_format real_fmt = prf.m_ff;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	354
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	355 int fw = (rat_string_len > 0 ? rat_string_len : real_fmt.fw);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	356 std::string s = rational_approx (prf.m_val, fw);
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	357
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	358 if (fw >= 0)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	359 os << std::setw (fw);
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	360
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	361 os.flags (static_cast<std::ios::fmtflags>
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	362 (real_fmt.fmt \| real_fmt.up \| real_fmt.sp));
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	363
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	364 if (fw > 0 && s.length () > static_cast<unsigned int> (fw))
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	365 os << '*';
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	366 else
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	367 os << s;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	368
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	369 return os;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	370 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	371
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	372 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	373 static inline T
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	374 pr_max_internal (const MArray<T>& m)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	375 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	376 // We expect a 2-d array.
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	377 assert (m.ndims () == 2);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	378
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	379 octave_idx_type nr = m.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	380 octave_idx_type nc = m.columns ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	381
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	382 T result = std::numeric_limits<T>::lowest ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	383
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	384 bool all_inf_or_nan = true;
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	385
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	386 for (octave_idx_type j = 0; j < nc; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	387 for (octave_idx_type i = 0; i < nr; i++)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	388 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	389 T val = m(i,j);
23564 7049da1648c0 Deprecate octave::math::finite in favor of octave::math::isfinite. Rik <rik@octave.org> parents: 23534 diff changeset	390 if (! octave::math::isfinite (val))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	391 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	392
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	393 all_inf_or_nan = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	394
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	395 if (val > result)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	396 result = val;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	397 }
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	398
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	399 if (all_inf_or_nan)
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	400 result = 0;
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	401
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	402 return result;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	403 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	404
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	405 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	406 static inline T
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	407 pr_min_internal (const MArray<T>& m)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	408 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	409 octave_idx_type nr = m.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	410 octave_idx_type nc = m.columns ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	411
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	412 T result = std::numeric_limits<T>::max ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	413
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	414 bool all_inf_or_nan = true;
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	415
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	416 for (octave_idx_type j = 0; j < nc; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	417 for (octave_idx_type i = 0; i < nr; i++)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	418 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	419 T val = m(i,j);
23564 7049da1648c0 Deprecate octave::math::finite in favor of octave::math::isfinite. Rik <rik@octave.org> parents: 23534 diff changeset	420 if (! octave::math::isfinite (val))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	421 continue;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	422
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	423 all_inf_or_nan = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	424
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	425 if (val < result)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	426 result = val;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	427 }
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	428
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	429 if (all_inf_or_nan)
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	430 result = 0;
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	431
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	432 return result;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	433 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	434
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	435 // FIXME: it would be nice to share more code among these functions,..
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	436
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	437 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	438 static inline float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	439 make_real_format (int digits, bool inf_or_nan,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	440 bool int_only, int& fw)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	441 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	442 float_format fmt;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	443
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	444 int prec = output_precision ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	445
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	446 int ld, rd;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	447
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	448 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	449 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	450 fw = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	451 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	452 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	453 else if (bank_format)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	454 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	455 fw = (digits < 0 ? 5 : digits + 4);
17847 3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	456 if (inf_or_nan && fw < 5)
3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	457 fw = 5;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	458 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	459 }
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	460 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	461 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	462 fw = 2 * sizeof (T);
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	463 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	464 }
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	465 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	466 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	467 fw = 8 * sizeof (T);
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	468 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	469 }
3611 b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	470 else if (inf_or_nan \|\| int_only)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	471 {
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	472 fw = 1 + digits;
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	473 if (inf_or_nan && fw < 4)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	474 fw = 4;
3682 19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe] jwe parents: 3611 diff changeset	475 rd = fw;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	476 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	477 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	478 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	479 if (digits > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	480 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	481 ld = digits;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	482 rd = (prec > digits ? prec - digits : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	483 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	484 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	485 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	486 ld = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	487 rd = (prec > digits ? prec - digits : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	488 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	489
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	490 fw = 1 + ld + 1 + rd;
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	491 if (inf_or_nan && fw < 4)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	492 fw = 4;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	493 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	494
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	495 if (! (rat_format \|\| bank_format \|\| hex_format \|\| bit_format)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	496 && (fw > output_max_field_width () \|\| print_e \|\| print_g \|\| print_eng))
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	497 {
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	498 if (print_g)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	499 fmt = float_format ();
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	500 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	501 {
16339 0c340bf413d7 allow exponent in output to always have 3 digits John W. Eaton <jwe@octave.org> parents: 16169 diff changeset	502 // e+ddd
0c340bf413d7 allow exponent in output to always have 3 digits John W. Eaton <jwe@octave.org> parents: 16169 diff changeset	503 int ex = 5;
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	504
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	505 if (print_eng)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	506 {
16339 0c340bf413d7 allow exponent in output to always have 3 digits John W. Eaton <jwe@octave.org> parents: 16169 diff changeset	507 // -ddd.
0c340bf413d7 allow exponent in output to always have 3 digits John W. Eaton <jwe@octave.org> parents: 16169 diff changeset	508 fw = 5 + prec + ex;
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	509 if (inf_or_nan && fw < 6)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	510 fw = 6;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	511 fmt = float_format (fw, ex, prec - 1, std::ios::fixed);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	512 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	513 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	514 {
16339 0c340bf413d7 allow exponent in output to always have 3 digits John W. Eaton <jwe@octave.org> parents: 16169 diff changeset	515 // -d.
0c340bf413d7 allow exponent in output to always have 3 digits John W. Eaton <jwe@octave.org> parents: 16169 diff changeset	516 fw = 3 + prec + ex;
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	517 if (inf_or_nan && fw < 4)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	518 fw = 4;
16339 0c340bf413d7 allow exponent in output to always have 3 digits John W. Eaton <jwe@octave.org> parents: 16169 diff changeset	519 fmt = float_format (fw, ex, prec - 1, std::ios::scientific);
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	520 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	521 }
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	522
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	523 if (print_big_e)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	524 fmt.uppercase ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	525 }
5086 55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe] jwe parents: 5030 diff changeset	526 else if (! bank_format && (inf_or_nan \|\| int_only))
3611 b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	527 fmt = float_format (fw, rd);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	528 else
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	529 fmt = float_format (fw, rd, std::ios::fixed);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	530
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	531 return float_display_format (fmt);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	532 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	533
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	534 template <typename T>
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	535 float_display_format
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	536 make_format (T val, int& fw)
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	537 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	538 if (free_format)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	539 return float_display_format ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	540
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	541 bool inf_or_nan = (octave::math::isinf (val) \|\| octave::math::isnan (val));
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	542
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	543 bool int_only = (! inf_or_nan && octave::math::x_nint (val) == val);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	544
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	545 T val_abs = (val < 0 ? -val : val);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	546
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	547 int digits = (inf_or_nan \|\| val_abs == 0) ? 0 : num_digits (val_abs);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	548
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	549 return make_real_format<T> (digits, inf_or_nan, int_only, fw);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	550 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	551
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	552 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	553 static inline float_display_format
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	554 make_real_matrix_format (int x_max, int x_min, bool inf_or_nan,
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	555 int int_or_inf_or_nan, int& fw)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	556 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	557 float_format fmt;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	558
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	559 int prec = output_precision ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	560
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	561 int ld, rd;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	562
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	563 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	564 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	565 fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	566 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	567 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	568 else if (bank_format)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	569 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	570 int digits = (x_max > x_min ? x_max : x_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	571 fw = (digits <= 0 ? 5 : digits + 4);
17847 3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	572 if (inf_or_nan && fw < 5)
3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	573 fw = 5;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	574 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	575 }
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	576 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	577 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	578 fw = 2 * sizeof (T);
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	579 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	580 }
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	581 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	582 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	583 fw = 8 * sizeof (T);
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	584 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	585 }
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	586 else if (Vfixed_point_format && ! print_g)
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3258 diff changeset	587 {
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3258 diff changeset	588 rd = prec;
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	589 fw = rd + 3;
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	590 if (inf_or_nan && fw < 4)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	591 fw = 4;
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3258 diff changeset	592 }
1715 6f4631c7118c [project @ 1996-01-08 07:57:04 by jwe] jwe parents: 1658 diff changeset	593 else if (int_or_inf_or_nan)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	594 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	595 int digits = (x_max > x_min ? x_max : x_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	596 fw = (digits <= 0 ? 2 : digits + 1);
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	597 if (inf_or_nan && fw < 4)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	598 fw = 4;
3682 19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe] jwe parents: 3611 diff changeset	599 rd = fw;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	600 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	601 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	602 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	603 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	604 if (x_max > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	605 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	606 ld_max = x_max;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	607 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	608 x_max++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	609 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	610 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	611 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	612 ld_max = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	613 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	614 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	615 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	616
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	617 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	618 if (x_min > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	619 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	620 ld_min = x_min;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	621 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	622 x_min++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	623 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	624 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	625 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	626 ld_min = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	627 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	628 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	629 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	630
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	631 ld = (ld_max > ld_min ? ld_max : ld_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	632 rd = (rd_max > rd_min ? rd_max : rd_min);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	633
5832 5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe] jwe parents: 5823 diff changeset	634 fw = 1 + ld + 1 + rd;
5748 8510034588a7 [project @ 2006-04-07 07:51:59 by jwe] jwe parents: 5642 diff changeset	635 if (inf_or_nan && fw < 4)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	636 fw = 4;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	637 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	638
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	639 if (! (rat_format \|\| bank_format \|\| hex_format \|\| bit_format)
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	640 && (print_e
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	641 \|\| print_eng \|\| print_g
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	642 \|\| (! Vfixed_point_format && fw > output_max_field_width ())))
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	643 {
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	644 if (print_g)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	645 fmt = float_format ();
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	646 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	647 {
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	648 int ex = 4;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	649 if (x_max > 100 \|\| x_min > 100)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	650 ex++;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	651
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	652 if (print_eng)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	653 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	654 fw = 4 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	655 if (inf_or_nan && fw < 6)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	656 fw = 6;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	657 fmt = float_format (fw, ex, prec - 1, std::ios::fixed);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	658 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	659 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	660 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	661 fw = 2 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	662 if (inf_or_nan && fw < 4)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	663 fw = 4;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	664 fmt = float_format (fw, prec - 1, std::ios::scientific);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	665 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	666 }
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	667
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	668 if (print_big_e)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	669 fmt.uppercase ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	670 }
5086 55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe] jwe parents: 5030 diff changeset	671 else if (! bank_format && int_or_inf_or_nan)
3611 b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	672 fmt = float_format (fw, rd);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	673 else
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	674 fmt = float_format (fw, rd, std::ios::fixed);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	675
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	676 return float_display_format (fmt);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	677 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	678
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	679 template <typename MT, typename ELT_T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	680 static inline float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	681 make_format_internal (const MT& m, int& fw, ELT_T& scale)
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	682 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	683 assert (m.ndims () == 2);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	684
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	685 if (free_format)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	686 return float_display_format ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	687
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	688 bool inf_or_nan = m.any_element_is_inf_or_nan ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	689
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	690 bool int_or_inf_or_nan = m.all_elements_are_int_or_inf_or_nan ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	691
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	692 MT m_abs = m.abs ();
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	693 ELT_T max_abs = pr_max_internal (m_abs);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	694 ELT_T min_abs = pr_min_internal (m_abs);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	695
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	696 int x_max = (max_abs == 0 ? 0 : num_digits (max_abs));
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	697
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	698 int x_min = (min_abs == 0 ? 0 : num_digits (min_abs));
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	699
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	700 scale = ((x_max == 0 \|\| int_or_inf_or_nan)
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	701 ? 1 : std::pow (10.0, calc_scale_exp (x_max - 1)));
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	702
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	703 return make_real_matrix_format<ELT_T> (x_max, x_min, inf_or_nan,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	704 int_or_inf_or_nan, fw);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	705 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	706
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	707 float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	708 make_format (const Matrix& m, int& fw, double& scale)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	709 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	710 return make_format_internal<Matrix, double> (m, fw, scale);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	711 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	712
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	713 float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	714 make_format (const FloatMatrix& m, int& fw, float& scale)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	715 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	716 return make_format_internal<FloatMatrix, float> (m, fw, scale);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	717 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	718
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	719 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	720 static inline float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	721 make_complex_format (int x_max, int x_min, int r_x,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	722 bool inf_or_nan, int int_only, int& r_fw, int& i_fw)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	723 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	724 float_format r_fmt;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	725 float_format i_fmt;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	726
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	727 int prec = output_precision ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	728
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	729 int ld, rd;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	730
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	731 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	732 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	733 i_fw = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	734 r_fw = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	735 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	736 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	737 else if (bank_format)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	738 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	739 int digits = r_x;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	740 i_fw = 0;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	741 r_fw = (digits <= 0 ? 5 : digits + 4);
17847 3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	742 if (inf_or_nan && r_fw < 5)
3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	743 r_fw = 5;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	744 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	745 }
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	746 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	747 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	748 r_fw = 2 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	749 i_fw = 2 * sizeof (T);
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	750 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	751 }
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	752 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	753 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	754 r_fw = 8 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	755 i_fw = 8 * sizeof (T);
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	756 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	757 }
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	758 else if (inf_or_nan \|\| int_only)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	759 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	760 int digits = (x_max > x_min ? x_max : x_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	761 i_fw = (digits <= 0 ? 1 : digits);
5945 76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	762 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	763 if (inf_or_nan && i_fw < 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	764 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	765 i_fw = 3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	766 r_fw = 4;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	767 }
3682 19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe] jwe parents: 3611 diff changeset	768 rd = r_fw;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	769 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	770 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	771 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	772 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	773 if (x_max > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	774 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	775 ld_max = x_max;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	776 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	777 x_max++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	778 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	779 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	780 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	781 ld_max = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	782 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	783 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	784 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	785
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	786 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	787 if (x_min > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	788 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	789 ld_min = x_min;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	790 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	791 x_min++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	792 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	793 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	794 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	795 ld_min = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	796 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	797 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	798 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	799
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	800 ld = (ld_max > ld_min ? ld_max : ld_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	801 rd = (rd_max > rd_min ? rd_max : rd_min);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	802
5945 76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	803 i_fw = ld + 1 + rd;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	804 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	805 if (inf_or_nan && i_fw < 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	806 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	807 i_fw = 3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	808 r_fw = 4;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	809 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	810 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	811
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	812 if (! (rat_format \|\| bank_format \|\| hex_format \|\| bit_format)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	813 && (r_fw > output_max_field_width () \|\| print_e \|\| print_eng \|\| print_g))
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	814 {
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	815 if (print_g)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	816 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	817 r_fmt = float_format ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	818 i_fmt = float_format ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	819 }
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	820 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	821 {
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	822 int ex = 4;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	823 if (x_max > 100 \|\| x_min > 100)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	824 ex++;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	825
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	826 if (print_eng)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	827 {
21568 3d60ed163b70 maint: Eliminate bad spacing around '='. Rik <rik@octave.org> parents: 21547 diff changeset	828 i_fw = 3 + prec + ex;
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	829 r_fw = i_fw + 1;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	830 if (inf_or_nan && i_fw < 5)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	831 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	832 i_fw = 5;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	833 r_fw = 6;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	834 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	835 r_fmt = float_format (r_fw, ex, prec - 1, std::ios::fixed);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	836 i_fmt = float_format (i_fw, ex, prec - 1, std::ios::fixed);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	837 }
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	838 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	839 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	840 i_fw = 1 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	841 r_fw = i_fw + 1;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	842 if (inf_or_nan && i_fw < 3)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	843 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	844 i_fw = 3;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	845 r_fw = 4;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	846 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	847 r_fmt = float_format (r_fw, prec - 1, std::ios::scientific);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	848 i_fmt = float_format (i_fw, prec - 1, std::ios::scientific);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	849 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	850 }
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	851
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	852 if (print_big_e)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	853 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	854 r_fmt.uppercase ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	855 i_fmt.uppercase ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	856 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	857 }
5086 55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe] jwe parents: 5030 diff changeset	858 else if (! bank_format && (inf_or_nan \|\| int_only))
3611 b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	859 {
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	860 r_fmt = float_format (r_fw, rd);
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	861 i_fmt = float_format (i_fw, rd);
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	862 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	863 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	864 {
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	865 r_fmt = float_format (r_fw, rd, std::ios::fixed);
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	866 i_fmt = float_format (i_fw, rd, std::ios::fixed);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	867 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	868
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	869 return float_display_format (r_fmt, i_fmt);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	870 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	871
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	872 template <typename T>
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	873 float_display_format
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	874 make_format (const std::complex<T>& c, int& r_fw, int& i_fw)
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	875 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	876 if (free_format)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	877 return float_display_format ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	878
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	879 T rp = c.real ();
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	880 T ip = c.imag ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	881
21782 2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	882 bool inf_or_nan = (octave::math::isinf (c) \|\| octave::math::isnan (c));
2aef506f3fec use namespace for lo-mappers.h functions John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	883
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	884 bool int_only = (octave::math::x_nint (rp) == rp
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	885 && octave::math::x_nint (ip) == ip);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	886
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	887 T r_abs = (rp < 0 ? -rp : rp);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	888 T i_abs = (ip < 0 ? -ip : ip);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	889
23564 7049da1648c0 Deprecate octave::math::finite in favor of octave::math::isfinite. Rik <rik@octave.org> parents: 23534 diff changeset	890 int r_x = (! octave::math::isfinite (rp)
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	891 \|\| r_abs == 0) ? 0 : num_digits (r_abs);
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	892
23564 7049da1648c0 Deprecate octave::math::finite in favor of octave::math::isfinite. Rik <rik@octave.org> parents: 23534 diff changeset	893 int i_x = (! octave::math::isfinite (ip)
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	894 \|\| i_abs == 0) ? 0 : num_digits (i_abs);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	895
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	896 int x_max, x_min;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	897
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	898 if (r_x > i_x)
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	899 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	900 x_max = r_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	901 x_min = i_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	902 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	903 else
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	904 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	905 x_max = i_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	906 x_min = r_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	907 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	908
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	909 return make_complex_format<T> (x_max, x_min, r_x, inf_or_nan, int_only,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	910 r_fw, i_fw);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	911 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	912
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	913 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	914 static inline float_display_format
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	915 make_complex_matrix_format (int x_max, int x_min, int r_x_max,
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	916 int r_x_min, bool inf_or_nan,
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	917 int int_or_inf_or_nan, int& r_fw, int& i_fw)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	918 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	919 float_format r_fmt;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	920 float_format i_fmt;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	921
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	922 int prec = output_precision ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	923
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	924 int ld, rd;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	925
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	926 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	927 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	928 i_fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	929 r_fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	930 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	931 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	932 else if (bank_format)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	933 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	934 int digits = (r_x_max > r_x_min ? r_x_max : r_x_min);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	935 i_fw = 0;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	936 r_fw = (digits <= 0 ? 5 : digits + 4);
17847 3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	937 if (inf_or_nan && r_fw < 5)
3a0075793fcd allow format bank to work for mixed +/- values John W. Eaton <jwe@octave.org> parents: 17818 diff changeset	938 r_fw = 5;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	939 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	940 }
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	941 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	942 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	943 r_fw = 2 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	944 i_fw = 2 * sizeof (T);
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	945 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	946 }
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	947 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	948 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	949 r_fw = 8 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	950 i_fw = 8 * sizeof (T);
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	951 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	952 }
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	953 else if (Vfixed_point_format && ! print_g)
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3258 diff changeset	954 {
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3258 diff changeset	955 rd = prec;
5945 76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	956 i_fw = rd + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	957 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	958 if (inf_or_nan && i_fw < 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	959 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	960 i_fw = 3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	961 r_fw = 4;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	962 }
3268 fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe] jwe parents: 3258 diff changeset	963 }
1715 6f4631c7118c [project @ 1996-01-08 07:57:04 by jwe] jwe parents: 1658 diff changeset	964 else if (int_or_inf_or_nan)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	965 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	966 int digits = (x_max > x_min ? x_max : x_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	967 i_fw = (digits <= 0 ? 1 : digits);
5945 76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	968 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	969 if (inf_or_nan && i_fw < 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	970 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	971 i_fw = 3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	972 r_fw = 4;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	973 }
3682 19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe] jwe parents: 3611 diff changeset	974 rd = r_fw;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	975 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	976 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	977 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	978 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	979 if (x_max > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	980 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	981 ld_max = x_max;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	982 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	983 x_max++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	984 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	985 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	986 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	987 ld_max = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	988 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	989 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	990 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	991
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	992 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	993 if (x_min > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	994 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	995 ld_min = x_min;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	996 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	997 x_min++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	998 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	999 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1000 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1001 ld_min = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1002 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1003 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1004 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1005
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1006 ld = (ld_max > ld_min ? ld_max : ld_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1007 rd = (rd_max > rd_min ? rd_max : rd_min);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1008
5945 76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	1009 i_fw = ld + 1 + rd;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	1010 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe] jwe parents: 5832 diff changeset	1011 if (inf_or_nan && i_fw < 3)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1012 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1013 i_fw = 3;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1014 r_fw = 4;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1015 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1016 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1017
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1018 if (! (rat_format \|\| bank_format \|\| hex_format \|\| bit_format)
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1019 && (print_e
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1020 \|\| print_eng \|\| print_g
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1021 \|\| (! Vfixed_point_format && r_fw > output_max_field_width ())))
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1022 {
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	1023 if (print_g)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1024 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1025 r_fmt = float_format ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1026 i_fmt = float_format ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1027 }
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	1028 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1029 {
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1030 int ex = 4;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1031 if (x_max > 100 \|\| x_min > 100)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1032 ex++;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1033
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1034 if (print_eng)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1035 {
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1036 i_fw = 3 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1037 r_fw = i_fw + 1;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1038 if (inf_or_nan && i_fw < 5)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1039 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1040 i_fw = 5;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1041 r_fw = 6;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1042 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1043 r_fmt = float_format (r_fw, ex, prec - 1, std::ios::fixed);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1044 i_fmt = float_format (i_fw, ex, prec - 1, std::ios::fixed);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1045 }
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1046 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1047 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1048 i_fw = 1 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1049 r_fw = i_fw + 1;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1050 if (inf_or_nan && i_fw < 3)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1051 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1052 i_fw = 3;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1053 r_fw = 4;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1054 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1055 r_fmt = float_format (r_fw, prec - 1, std::ios::scientific);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1056 i_fmt = float_format (i_fw, prec - 1, std::ios::scientific);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1057 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1058 }
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1059
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1060 if (print_big_e)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1061 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1062 r_fmt.uppercase ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1063 i_fmt.uppercase ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1064 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1065 }
5086 55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe] jwe parents: 5030 diff changeset	1066 else if (! bank_format && int_or_inf_or_nan)
3611 b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	1067 {
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	1068 r_fmt = float_format (r_fw, rd);
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	1069 i_fmt = float_format (i_fw, rd);
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	1070 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1071 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1072 {
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1073 r_fmt = float_format (r_fw, rd, std::ios::fixed);
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1074 i_fmt = float_format (i_fw, rd, std::ios::fixed);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1075 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1076
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1077 return float_display_format (r_fmt, i_fmt);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1078 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1079
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1080 template <typename CMT, typename RMT, typename ELT_T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1081 static inline float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1082 make_format_internal (const CMT& cm, int& r_fw, int& i_fw, ELT_T& scale)
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1083 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1084 if (free_format)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1085 return float_display_format ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1086
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1087 RMT rp = real (cm);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1088 RMT ip = imag (cm);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1089
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	1090 bool inf_or_nan = cm.any_element_is_inf_or_nan ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1091
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	1092 bool int_or_inf_or_nan = (rp.all_elements_are_int_or_inf_or_nan ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1093 && ip.all_elements_are_int_or_inf_or_nan ());
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1094
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1095 RMT r_m_abs = rp.abs ();
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1096 ELT_T r_max_abs = pr_max_internal (r_m_abs);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1097 ELT_T r_min_abs = pr_min_internal (r_m_abs);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1098
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1099 RMT i_m_abs = ip.abs ();
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1100 ELT_T i_max_abs = pr_max_internal (i_m_abs);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1101 ELT_T i_min_abs = pr_min_internal (i_m_abs);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1102
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1103 int r_x_max = (r_max_abs == 0 ? 0 : num_digits (r_max_abs));
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1104
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1105 int r_x_min = (r_min_abs == 0 ? 0 : num_digits (r_min_abs));
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1106
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1107 int i_x_max = (i_max_abs == 0 ? 0 : num_digits (i_max_abs));
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1108
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1109 int i_x_min = (i_min_abs == 0 ? 0 : num_digits (i_min_abs));
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1110
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1111 int x_max = (r_x_max > i_x_max ? r_x_max : i_x_max);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1112 int x_min = (r_x_min > i_x_min ? r_x_min : i_x_min);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1113
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1114 scale = ((x_max == 0 \|\| int_or_inf_or_nan)
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1115 ? 1 : std::pow (10.0, calc_scale_exp (x_max - 1)));
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1116
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1117 return make_complex_matrix_format<ELT_T> (x_max, x_min, r_x_max, r_x_min,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1118 inf_or_nan, int_or_inf_or_nan,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1119 r_fw, i_fw);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1120 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1121
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1122 float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1123 make_format (const ComplexMatrix& cm, int& r_fw, int& i_fw, double& scale)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1124 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1125 return make_format_internal<ComplexMatrix, Matrix, double> (cm, r_fw, i_fw, scale);
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1126 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1127
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1128 float_display_format
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1129 make_format (const FloatComplexMatrix& cm, int& r_fw, int& i_fw, float& scale)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1130 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1131 return make_format_internal<FloatComplexMatrix, FloatMatrix, float> (cm, r_fw, i_fw, scale);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1132 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1133
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1134 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1135 static inline float_display_format
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1136 make_range_format (int x_max, int x_min, int all_ints, int& fw)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1137 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1138 float_format fmt;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1139
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1140 int prec = output_precision ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1141
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1142 int ld, rd;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1143
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1144 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1145 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1146 fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1147 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1148 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1149 else if (bank_format)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1150 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1151 int digits = (x_max > x_min ? x_max : x_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1152 fw = (digits < 0 ? 5 : digits + 4);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1153 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1154 }
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1155 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1156 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1157 fw = 2 * sizeof (T);
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1158 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1159 }
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1160 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1161 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1162 fw = 8 * sizeof (T);
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1163 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1164 }
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1165 else if (all_ints)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1166 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1167 int digits = (x_max > x_min ? x_max : x_min);
7465 8d6ab12f8fda format Range output more like N-d arrays John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	1168 fw = digits + 1;
3682 19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe] jwe parents: 3611 diff changeset	1169 rd = fw;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1170 }
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	1171 else if (Vfixed_point_format && ! print_g)
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1172 {
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1173 rd = prec;
7465 8d6ab12f8fda format Range output more like N-d arrays John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	1174 fw = rd + 3;
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1175 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1176 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1177 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1178 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1179 if (x_max > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1180 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1181 ld_max = x_max;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1182 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1183 x_max++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1184 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1185 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1186 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1187 ld_max = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1188 rd_max = (prec > x_max ? prec - x_max : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1189 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1190 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1191
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1192 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1193 if (x_min > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1194 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1195 ld_min = x_min;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1196 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1197 x_min++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1198 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1199 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1200 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1201 ld_min = 1;
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1202 rd_min = (prec > x_min ? prec - x_min : prec);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1203 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1204 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1205
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1206 ld = (ld_max > ld_min ? ld_max : ld_min);
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1207 rd = (rd_max > rd_min ? rd_max : rd_min);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1208
7465 8d6ab12f8fda format Range output more like N-d arrays John W. Eaton <jwe@octave.org> parents: 7231 diff changeset	1209 fw = ld + rd + 3;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1210 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1211
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	1212 if (! (rat_format \|\| bank_format \|\| hex_format \|\| bit_format)
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1213 && (print_e
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1214 \|\| print_eng \|\| print_g
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1215 \|\| (! Vfixed_point_format && fw > output_max_field_width ())))
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1216 {
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	1217 if (print_g)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1218 fmt = float_format ();
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	1219 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1220 {
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1221 int ex = 4;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1222 if (x_max > 100 \|\| x_min > 100)
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1223 ex++;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1224
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1225 if (print_eng)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1226 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1227 fw = 5 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1228 fmt = float_format (fw, ex, prec - 1, std::ios::fixed);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1229 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1230 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1231 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1232 fw = 3 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1233 fmt = float_format (fw, prec - 1, std::ios::scientific);
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	1234 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1235 }
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1236
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1237 if (print_big_e)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1238 fmt.uppercase ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1239 }
5086 55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe] jwe parents: 5030 diff changeset	1240 else if (! bank_format && all_ints)
3611 b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe] jwe parents: 3608 diff changeset	1241 fmt = float_format (fw, rd);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1242 else
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1243 fmt = float_format (fw, rd, std::ios::fixed);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1244
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1245 return float_display_format (fmt);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1246 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1247
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1248 float_display_format
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1249 make_format (const Range& r, int& fw, double& scale)
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1250 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1251 if (free_format)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1252 return float_display_format ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1253
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1254 double r_min = r.base ();
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1255 double r_max = r.limit ();
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1256
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1257 if (r_max < r_min)
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1258 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1259 double tmp = r_max;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1260 r_max = r_min;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1261 r_min = tmp;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1262 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1263
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	1264 bool all_ints = r.all_elements_are_ints ();
1658 0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe] jwe parents: 1651 diff changeset	1265
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1266 double max_abs = (r_max < 0 ? -r_max : r_max);
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1267 double min_abs = (r_min < 0 ? -r_min : r_min);
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1268
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1269 int x_max = (max_abs == 0 ? 0 : num_digits (max_abs));
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1270
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1271 int x_min = (min_abs == 0 ? 0 : num_digits (min_abs));
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1272
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1273 scale = ((x_max == 0 \|\| all_ints)
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1274 ? 1 : std::pow (10.0, calc_scale_exp (x_max - 1)));
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1275
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1276 return make_range_format<double> (x_max, x_min, all_ints, fw);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1277 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1278
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1279 template <typename T>
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1280 union equiv
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1281 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1282 T val;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1283 unsigned char i[sizeof (T)];
1282 dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1284 };
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe] jwe parents: 1192 diff changeset	1285
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1286 #define PRINT_CHAR_BITS(os, c) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1287 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1288 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1289 unsigned char ctmp = c; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1290 char stmp[9]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1291 stmp[0] = (ctmp & 0x80) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1292 stmp[1] = (ctmp & 0x40) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1293 stmp[2] = (ctmp & 0x20) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1294 stmp[3] = (ctmp & 0x10) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1295 stmp[4] = (ctmp & 0x08) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1296 stmp[5] = (ctmp & 0x04) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1297 stmp[6] = (ctmp & 0x02) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1298 stmp[7] = (ctmp & 0x01) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1299 stmp[8] = '\0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1300 os << stmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1301 } \
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1302 while (0)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1303
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1304 #define PRINT_CHAR_BITS_SWAPPED(os, c) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1305 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1306 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1307 unsigned char ctmp = c; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1308 char stmp[9]; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1309 stmp[0] = (ctmp & 0x01) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1310 stmp[1] = (ctmp & 0x02) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1311 stmp[2] = (ctmp & 0x04) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1312 stmp[3] = (ctmp & 0x08) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1313 stmp[4] = (ctmp & 0x10) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1314 stmp[5] = (ctmp & 0x20) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1315 stmp[6] = (ctmp & 0x40) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1316 stmp[7] = (ctmp & 0x80) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1317 stmp[8] = '\0'; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1318 os << stmp; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	1319 } \
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1320 while (0)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	1321
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1322 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1323 static inline void
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1324 pr_any_float (std::ostream& os, const float_format& fmt, T val, int fw = 0)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1325 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1326 // Unless explicitly asked for, always print in big-endian format
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1327 // for hex and bit formats.
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1328 //
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1329 // {bit,hex}_format == 1: print big-endian
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1330 // {bit,hex}_format == 2: print native
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1331
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1332 if (hex_format)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1333 {
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1334 octave::preserve_stream_state stream_state (os);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1335
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1336 equiv<T> tmp;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1337 tmp.val = val;
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1338
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1339 // Unless explicitly asked for, always print in big-endian format.
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1340
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1341 // FIXME: will bad things happen if we are
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1342 // interrupted before resetting the format flags and fill
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1343 // character?
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1344
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1345 octave::mach_info::float_format flt_fmt =
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1346 octave::mach_info::native_float_format ();
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1347
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1348 os.fill ('0');
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1349 os.flags (std::ios::right \| std::ios::hex);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1350
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1351 if (hex_format > 1
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1352 \|\| flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1353 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1354 for (size_t i = 0; i < sizeof (T); i++)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1355 os << std::setw (2) << static_cast<int> (tmp.i[i]);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1356 }
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1357 else
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1358 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1359 for (int i = sizeof (T) - 1; i >= 0; i--)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1360 os << std::setw (2) << static_cast<int> (tmp.i[i]);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1361 }
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1362 }
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1363 else if (bit_format)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1364 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1365 equiv<T> tmp;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1366 tmp.val = val;
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1367
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1368 octave::mach_info::float_format flt_fmt =
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1369 octave::mach_info::native_float_format ();
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1370
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1371 if (flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1372 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1373 for (size_t i = 0; i < sizeof (T); i++)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1374 PRINT_CHAR_BITS (os, tmp.i[i]);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1375 }
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1376 else
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1377 {
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1378 if (bit_format > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1379 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1380 for (size_t i = 0; i < sizeof (T); i++)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1381 PRINT_CHAR_BITS_SWAPPED (os, tmp.i[i]);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1382 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1383 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1384 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1385 for (int i = sizeof (T) - 1; i >= 0; i--)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1386 PRINT_CHAR_BITS (os, tmp.i[i]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1387 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1388 }
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1389 }
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1390 else if (octave::math::isna (val))
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1391 {
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1392 octave::preserve_stream_state stream_state (os);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1393
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1394 if (fw > 0)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1395 os << std::setw (fw) << "NA";
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1396 else
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1397 os << "NA";
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1398 }
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1399 else if (rat_format)
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1400 os << pr_rational_float<T> (fmt, val);
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1401 else if (octave::math::isinf (val))
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1402 {
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1403 octave::preserve_stream_state stream_state (os);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1404
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1405 const char *s;
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1406 if (val < 0)
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1407 s = "-Inf";
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1408 else
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1409 s = "Inf";
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1410
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1411 if (fw > 0)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1412 os << std::setw (fw) << s;
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1413 else
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1414 os << s;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1415 }
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1416 else if (octave::math::isnan (val))
24667 56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1417 {
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1418 octave::preserve_stream_state stream_state (os);
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1419
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1420 if (fw > 0)
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1421 os << std::setw (fw) << "NaN";
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1422 else
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1423 os << "NaN";
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1424 }
56f889d66b7c move float_format container to setparate file John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1425 else if (print_eng)
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1426 os << pr_engineering_float<T> (fmt, val);
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 453 diff changeset	1427 else
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1428 os << pr_formatted_float<T> (fmt, val);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1429 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1430
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1431 template <typename T>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1432 static inline void
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1433 pr_float (std::ostream& os, const float_display_format& fmt, T val,
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1434 int fw = 0, T scale = 1)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1435 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1436 if (Vfixed_point_format && ! print_g && scale != 1)
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1437 val /= scale;
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1438
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1439 pr_any_float (os, fmt.real_format (), val, fw);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1440 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1441
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1442 template <typename T>
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1443 static inline void
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1444 pr_imag_float (std::ostream& os, const float_display_format& fmt,
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1445 T val, int fw = 0)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1446 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1447 pr_any_float (os, fmt.imag_format (), val, fw);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1448 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1449
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1450 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1451 static inline void
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1452 pr_complex (std::ostream& os, const float_display_format& fmt,
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1453 const std::complex<T>& cval, int r_fw = 0, int i_fw = 0,
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1454 T scale = 1)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1455 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1456 std::complex<T> tmp
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1457 = ((Vfixed_point_format && ! print_g && scale != 1)
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1458 ? cval / scale : cval);
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1459
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1460 T r = tmp.real ();
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1461
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1462 pr_float (os, fmt, r, r_fw);
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1463
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1464 if (! bank_format)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1465 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1466 T i = tmp.imag ();
4349 a6c22c2c9b09 [project @ 2003-02-21 18:59:07 by jwe] jwe parents: 4270 diff changeset	1467 if (! (hex_format \|\| bit_format) && lo_ieee_signbit (i))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1468 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1469 os << " - ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1470 i = -i;
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1471 pr_imag_float (os, fmt, i, i_fw);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1472 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1473 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1474 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1475 if (hex_format \|\| bit_format)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1476 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1477 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1478 os << " + ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1479
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1480 pr_imag_float (os, fmt, i, i_fw);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1481 }
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1482 os << 'i';
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1483 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1484 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1485
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1486 static inline void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1487 print_empty_matrix (std::ostream& os, octave_idx_type nr, octave_idx_type nc,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1488 bool pr_as_read_syntax)
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1489 {
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1490 assert (nr == 0 \|\| nc == 0);
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1491
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1492 if (pr_as_read_syntax)
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1493 {
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1494 if (nr == 0 && nc == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1495 os << "[]";
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1496 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1497 os << "zeros (" << nr << ", " << nc << ')';
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1498 }
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1499 else
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1500 {
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1501 os << "[]";
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1502
2165 83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	1503 if (Vprint_empty_dimensions)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1504 os << '(' << nr << 'x' << nc << ')';
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1505 }
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1506 }
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1507
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1508 static inline void
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1509 print_empty_nd_array (std::ostream& os, const dim_vector& dims,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1510 bool pr_as_read_syntax)
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1511 {
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1512 assert (dims.any_zero ());
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1513
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1514 if (pr_as_read_syntax)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1515 os << "zeros (" << dims.str (',') << ')';
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1516 else
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1517 {
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1518 os << "[]";
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1519
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1520 if (Vprint_empty_dimensions)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	1521 os << '(' << dims.str () << ')';
4559 802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1522 }
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1523 }
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe] jwe parents: 4532 diff changeset	1524
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1525 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1526 static inline void
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1527 pr_scale_header (std::ostream& os, T scale)
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1528 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1529 if (Vfixed_point_format && ! print_g && scale != 1)
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1530 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	1531 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	1532
3568 58549b931ad5 [project @ 2000-02-03 10:21:54 by jwe] jwe parents: 3548 diff changeset	1533 os << " "
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1534 << std::setw (8) << std::setprecision (1)
21662 5b9868c2e212 maint: Octave coding convention cleanups. Rik <rik@octave.org> parents: 21583 diff changeset	1535 << std::setiosflags (std::ios::scientific \| std::ios::left)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1536 << scale
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	1537 << "*\n";
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1538
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	1539 if (! Vcompact_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1540 os << "\n";
3105 f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1541 }
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1542 }
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe] jwe parents: 3018 diff changeset	1543
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1544 static inline void
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	1545 pr_col_num_header (std::ostream& os, octave_idx_type total_width, int max_width,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1546 octave_idx_type lim, octave_idx_type col, int extra_indent)
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1547 {
2165 83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	1548 if (total_width > max_width && Vsplit_long_rows)
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1549 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	1550 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	1551
4833 399e8681b774 [project @ 2004-03-10 20:49:48 by jwe] jwe parents: 4791 diff changeset	1552 if (col != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1553 {
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	1554 if (Vcompact_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1555 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1556 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1557 os << "\n\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1558 }
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1559
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	1560 octave_idx_type num_cols = lim - col;
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1561
3548 ab7fa5a8f23f [project @ 2000-02-03 01:17:15 by jwe] jwe parents: 3538 diff changeset	1562 os << std::setw (extra_indent) << "";
1972 58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe] jwe parents: 1968 diff changeset	1563
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1564 if (num_cols == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1565 os << " Column " << col + 1 << ":\n";
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1566 else if (num_cols == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1567 os << " Columns " << col + 1 << " and " << lim << ":\n";
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1568 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1569 os << " Columns " << col + 1 << " through " << lim << ":\n";
2915 649549662cf6 [project @ 1997-04-30 20:51:40 by jwe] jwe parents: 2907 diff changeset	1570
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	1571 if (! Vcompact_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1572 os << "\n";
1186 d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1573 }
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1574 }
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe] jwe parents: 1086 diff changeset	1575
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21100 diff changeset	1576 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1577 static inline void
5030 160365410ad4 [project @ 2004-09-24 03:22:23 by jwe] jwe parents: 4949 diff changeset	1578 pr_plus_format (std::ostream& os, const T& val)
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	1579 {
5030 160365410ad4 [project @ 2004-09-24 03:22:23 by jwe] jwe parents: 4949 diff changeset	1580 if (val > T (0))
4632 0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe] jwe parents: 4574 diff changeset	1581 os << plus_format_chars[0];
5030 160365410ad4 [project @ 2004-09-24 03:22:23 by jwe] jwe parents: 4949 diff changeset	1582 else if (val < T (0))
4632 0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe] jwe parents: 4574 diff changeset	1583 os << plus_format_chars[1];
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	1584 else
4632 0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe] jwe parents: 4574 diff changeset	1585 os << plus_format_chars[2];
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	1586 }
68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	1587
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1588 template <>
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1589 float_display_format
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1590 make_format (const Range& rng)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1591 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1592 int fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1593 double scale = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1594 return make_format (rng, fw, scale);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1595 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1596
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1597 template <>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1598 float_display_format
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1599 make_format (const NDArray& nda)
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1600 {
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1601 int fw = 0;
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1602 double scale = 0;
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1603 return make_format (Matrix (nda), fw, scale);
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1604 }
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1605
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1606 template <>
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1607 float_display_format
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1608 make_format (const FloatNDArray& nda)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1609 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1610 int fw = 0;
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1611 float scale = 0;
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1612 return make_format (FloatMatrix (nda), fw, scale);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1613 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1614
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1615 template <>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1616 float_display_format
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1617 make_format (const ComplexNDArray& nda)
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1618 {
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1619 int r_fw = 0;
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1620 int i_fw = 0;
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1621 double scale = 0;
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1622 return make_format (ComplexMatrix (nda), r_fw, i_fw, scale);
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1623 }
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1624
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1625 template <>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1626 float_display_format
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1627 make_format (const FloatComplexNDArray& nda)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1628 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1629 int r_fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1630 int i_fw = 0;
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1631 float scale = 0;
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1632 return make_format (FloatComplexMatrix (nda), r_fw, i_fw, scale);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1633 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1634
24760 b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1635 template <>
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1636 float_display_format
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1637 make_format (const boolNDArray&)
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1638 {
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1639 return float_display_format (float_format (1, 1));
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1640 }
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1641
24747 6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1642 // FIXME: all this mess with abs is an attempt to avoid seeing
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1643 //
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1644 // warning: comparison of unsigned expression < 0 is always false
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1645 //
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1646 // from GCC. Isn't there a better way?
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1647
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1648 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1649 static inline T
24747 6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1650 abs (T x)
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1651 {
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1652 return x < 0 ? -x : x;
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1653 }
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1654
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1655 #define INSTANTIATE_ABS(T) \
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1656 template T abs (T)
24747 6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1657
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1658 INSTANTIATE_ABS(signed char);
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1659 INSTANTIATE_ABS(short);
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1660 INSTANTIATE_ABS(int);
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1661 INSTANTIATE_ABS(long);
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1662 INSTANTIATE_ABS(long long);
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1663
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1664 #define SPECIALIZE_UABS(T) \
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1665 template <> \
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1666 inline unsigned T \
24747 6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1667 abs (unsigned T x) \
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1668 { \
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1669 return x; \
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1670 }
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1671
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1672 SPECIALIZE_UABS(char)
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1673 SPECIALIZE_UABS(short)
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1674 SPECIALIZE_UABS(int)
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1675 SPECIALIZE_UABS(long)
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1676 SPECIALIZE_UABS(long long)
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114) John W. Eaton <jwe@octave.org> parents: 24745 diff changeset	1677
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1678 #define MAKE_INT_MATRIX_FORMAT(TYPE) \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1679 template <> \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1680 float_display_format \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1681 make_format (const intNDArray<TYPE>& nda) \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1682 { \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1683 bool isneg = false; \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1684 int digits = 0; \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1685 \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1686 for (octave_idx_type i = 0; i < nda.numel (); i++) \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1687 { \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1688 int new_digits \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1689 = static_cast<int> \
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1690 (std::floor (log10 (double (abs (nda(i).value ()))) + 1)); \
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1691 \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1692 if (new_digits > digits) \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1693 digits = new_digits; \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1694 \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1695 if (! isneg) \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1696 isneg = (abs (nda(i).value ()) != nda(i).value ()); \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1697 } \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1698 \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1699 return float_display_format (float_format (digits + isneg, 0, 0)); \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1700 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1701
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1702 MAKE_INT_MATRIX_FORMAT (octave_int8)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1703 MAKE_INT_MATRIX_FORMAT (octave_uint8)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1704 MAKE_INT_MATRIX_FORMAT (octave_int16)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1705 MAKE_INT_MATRIX_FORMAT (octave_uint16)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1706 MAKE_INT_MATRIX_FORMAT (octave_int32)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1707 MAKE_INT_MATRIX_FORMAT (octave_uint32)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1708 MAKE_INT_MATRIX_FORMAT (octave_int64)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1709 MAKE_INT_MATRIX_FORMAT (octave_uint64)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1710
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1711 template <>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1712 float_display_format
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1713 make_format (const double& d)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1714 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1715 int fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1716 return make_format (d, fw);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1717 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1718
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1719 template <>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1720 float_display_format
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1721 make_format (const float& f)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1722 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1723 int fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1724 return make_format (f, fw);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1725 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1726
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1727 template <>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1728 float_display_format
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1729 make_format (const Complex& c)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1730 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1731 int r_fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1732 int i_fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1733 return make_format (c, r_fw, i_fw);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1734 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1735
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1736 template <>
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1737 float_display_format
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1738 make_format (const FloatComplex& c)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1739 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1740 int r_fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1741 int i_fw = 0;
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1742 return make_format (c, r_fw, i_fw);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1743 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1744
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1745 #define MAKE_INT_SCALAR_FORMAT(TYPE) \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1746 template <> \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1747 float_display_format \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1748 make_format (const octave_int<TYPE>& val) \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1749 { \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1750 bool isneg = false; \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1751 int digits \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1752 = static_cast<int> \
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1753 (std::floor (log10 (double (abs (val.value ()))) + 1)); \
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1754 \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1755 isneg = (abs (val.value ()) != val.value ()); \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1756 \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1757 return float_display_format (float_format (digits + isneg, 0, 0)); \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1758 }
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1759
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1760 MAKE_INT_SCALAR_FORMAT (int8_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1761 MAKE_INT_SCALAR_FORMAT (uint8_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1762 MAKE_INT_SCALAR_FORMAT (int16_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1763 MAKE_INT_SCALAR_FORMAT (uint16_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1764 MAKE_INT_SCALAR_FORMAT (int32_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1765 MAKE_INT_SCALAR_FORMAT (uint32_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1766 MAKE_INT_SCALAR_FORMAT (int64_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1767 MAKE_INT_SCALAR_FORMAT (uint64_t)
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	1768
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1769 void
24760 b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1770 octave_print_internal (std::ostream& os, const float_display_format& fmt,
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1771 bool d, bool pr_as_read_syntax)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1772 {
24760 b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1773 octave_print_internal (os, fmt, octave_uint8 (d), pr_as_read_syntax);
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1774 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1775
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1776 void
24760 b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1777 octave_print_internal (std::ostream& os, bool d, bool pr_as_read_syntax)
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1778 {
24760 b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1779 octave_print_internal (os, octave_uint8 (d), pr_as_read_syntax);
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1780 }
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1781
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1782 void
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1783 octave_print_internal (std::ostream&, const float_display_format&,
b784d68f7c44 fix printing of logical values (bug #53160) John W. Eaton <jwe@octave.org> parents: 24747 diff changeset	1784 char, bool)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1785 {
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1786 panic_impossible ();
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1787 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1788
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1789 void
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1790 octave_print_internal (std::ostream& os, const float_display_format& fmt,
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1791 double d, bool pr_as_read_syntax)
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1792 {
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1793 if (pr_as_read_syntax)
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1794 os << d;
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1795 else if (plus_format)
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	1796 pr_plus_format (os, d);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1797 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1798 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1799 if (free_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1800 os << d;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1801 else
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	1802 pr_float (os, fmt, d);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1803 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1804 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1805
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1806 void
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1807 octave_print_internal (std::ostream& os, const float_display_format& fmt,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1808 float d, bool pr_as_read_syntax)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1809 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1810 if (pr_as_read_syntax)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1811 os << d;
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1812 else if (plus_format)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1813 pr_plus_format (os, d);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1814 else
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1815 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1816 if (free_format)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1817 os << d;
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1818 else
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1819 pr_float (os, fmt, d);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1820 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1821 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1822
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1823 template <typename MT>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	1824 static inline void
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1825 octave_print_free (std::ostream& os, const MT& m, bool pr_as_read_syntax)
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1826 {
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1827 octave_idx_type nr = m.rows ();
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1828 octave_idx_type nc = m.columns ();
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1829
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1830 if (pr_as_read_syntax)
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1831 os << "[\n";
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1832
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1833 for (octave_idx_type i = 0; i < nr; i++)
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1834 {
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1835 for (octave_idx_type j = 0; j < nc; j++)
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1836 os << ' ' << m.elem(i,j);
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1837
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1838 if (i < nr - 1)
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1839 os << "\n";
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1840 }
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1841
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1842 if (pr_as_read_syntax)
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1843 os << ']';
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1844 }
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1845
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1846 template <typename MT>
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1847 static inline void
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1848 pr_plus_format_matrix (std::ostream& os, const MT& m)
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1849 {
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1850 octave_idx_type nr = m.rows ();
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1851 octave_idx_type nc = m.columns ();
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1852
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1853 for (octave_idx_type i = 0; i < nr; i++)
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1854 {
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1855 for (octave_idx_type j = 0; j < nc; j++)
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1856 {
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1857 octave_quit ();
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1858
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1859 pr_plus_format (os, m(i,j));
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1860 }
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1861
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1862 if (i < nr - 1)
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1863 os << "\n";
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1864 }
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1865 }
e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1866
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1867 void
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	1868 octave_print_internal (std::ostream& os, const Matrix& m,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1869 bool pr_as_read_syntax, int extra_indent)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1870 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	1871 octave_idx_type nr = m.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	1872 octave_idx_type nc = m.columns ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1873
2408 e22aae3ccfad [project @ 1996-10-15 16:37:52 by jwe] jwe parents: 2387 diff changeset	1874 if (nr == 0 \|\| nc == 0)
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1875 print_empty_matrix (os, nr, nc, pr_as_read_syntax);
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1876 else if (plus_format && ! pr_as_read_syntax)
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1877 pr_plus_format_matrix (os, m);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1878 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1879 {
23797 755b4c622972 Fix "variable may be used uninitialized" warning reported by gcc. Rik <rik@octave.org> parents: 23795 diff changeset	1880 int fw = 0;
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1881 double scale = 1;
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	1882 float_display_format fmt = make_format (m, fw, scale);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1883 int column_width = fw + 2;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	1884 octave_idx_type total_width = nc * column_width;
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21747 diff changeset	1885 octave_idx_type max_width = octave::command_editor::terminal_cols ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1886
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1887 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1888 max_width -= 4;
1972 58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe] jwe parents: 1968 diff changeset	1889 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1890 max_width -= extra_indent;
1972 58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe] jwe parents: 1968 diff changeset	1891
58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe] jwe parents: 1968 diff changeset	1892 if (max_width < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1893 max_width = 0;
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1894
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1895 if (free_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1896 {
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	1897 octave_print_free (os, m, pr_as_read_syntax);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1898 return;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1899 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1900
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	1901 octave_idx_type inc = nc;
2165 83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	1902 if (total_width > max_width && Vsplit_long_rows)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1903 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1904 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1905 if (inc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1906 inc++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1907 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1908
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1909 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1910 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1911 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1912 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1913 octave_idx_type col = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1914 while (col < nc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1915 {
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	1916 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1917
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1918 for (octave_idx_type j = col; j < lim; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1919 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1920 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1921
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1922 if (i == 0 && j == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1923 os << "[ ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1924 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1925 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1926 if (j > col && j < lim)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1927 os << ", ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1928 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1929 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1930 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1931
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	1932 pr_float (os, fmt, m(i,j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1933 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1934
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1935 col += inc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1936
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1937 if (col >= nc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1938 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1939 if (i == nr - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1940 os << " ]";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1941 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1942 os << ";\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1943 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1944 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1945 os << " ...\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1946 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1947 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1948 }
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	1949 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1950 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	1951 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	1952
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1953 pr_scale_header (os, scale);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1954
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1955 for (octave_idx_type col = 0; col < nc; col += inc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1956 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	1957 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1958
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1959 pr_col_num_header (os, total_width, max_width, lim, col,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1960 extra_indent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1961
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1962 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1963 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1964 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1965
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1966 for (octave_idx_type j = col; j < lim; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1967 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1968 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1969
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1970 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1971
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	1972 pr_float (os, fmt, m(i,j), fw, scale);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1973 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1974
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1975 if (i < nr - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1976 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1977 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1978 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1979 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1980 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1981 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	1982
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1983 void
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1984 octave_print_internal (std::ostream& os, const DiagMatrix& m,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1985 bool pr_as_read_syntax, int extra_indent)
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1986 {
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1987 octave_idx_type nr = m.rows ();
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1988 octave_idx_type nc = m.columns ();
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1989
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1990 if (nr == 0 \|\| nc == 0)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1991 print_empty_matrix (os, nr, nc, pr_as_read_syntax);
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1992 else if (plus_format && ! pr_as_read_syntax)
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	1993 pr_plus_format_matrix (os, m);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1994 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1995 {
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1996 int fw;
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	1997 double scale = 1;
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	1998 float_display_format fmt = make_format (Matrix (m.diag ()), fw, scale);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	1999 int column_width = fw + 2;
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2000 octave_idx_type total_width = nc * column_width;
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21747 diff changeset	2001 octave_idx_type max_width = octave::command_editor::terminal_cols ();
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2002
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2003 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2004 max_width -= 4;
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2005 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2006 max_width -= extra_indent;
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2007
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2008 if (max_width < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2009 max_width = 0;
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2010
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2011 if (free_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2012 {
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	2013 octave_print_free (os, m, pr_as_read_syntax);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2014 return;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2015 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2016
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2017 octave_idx_type inc = nc;
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2018 if (total_width > max_width && Vsplit_long_rows)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2019 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2020 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2021 if (inc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2022 inc++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2023 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2024
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2025 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2026 {
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2027 os << "diag (";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2028
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2029 octave_idx_type col = 0;
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2030 while (col < nc)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2031 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2032 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2033
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2034 for (octave_idx_type j = col; j < lim; j++)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2035 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	2036 octave_quit ();
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2037
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2038 if (j == 0)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2039 os << "[ ";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2040 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2041 {
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2042 if (j > col && j < lim)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2043 os << ", ";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2044 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2045 os << " ";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2046 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2047
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2048 pr_float (os, fmt, m(j,j));
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2049 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2050
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2051 col += inc;
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2052
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2053 if (col >= nc)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2054 os << " ]";
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2055 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2056 os << " ...\n";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2057 }
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2058 os << ')';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2059 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2060 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2061 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	2062 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	2063
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2064 os << "Diagonal Matrix\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2065 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2066 os << "\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2067
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2068 pr_scale_header (os, scale);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2069
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21748 diff changeset	2070 // kluge. Get the true width of a number.
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2071 int zero_fw;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2072 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2073 std::ostringstream tmp_oss;
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2074 pr_float (tmp_oss, fmt, 0.0, fw, scale);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2075 zero_fw = tmp_oss.str ().length ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2076 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2077
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2078 for (octave_idx_type col = 0; col < nc; col += inc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2079 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2080 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2081
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2082 pr_col_num_header (os, total_width, max_width, lim, col,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2083 extra_indent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2084
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2085 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2086 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2087 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2088
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2089 for (octave_idx_type j = col; j < lim; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2090 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2091 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2092
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2093 os << " ";
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2094
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2095 if (i == j)
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2096 pr_float (os, fmt, m(i,j), fw, scale);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2097 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2098 os << std::setw (zero_fw) << '0';
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2099
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2100 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2101
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2102 if (i < nr - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2103 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2104 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2105 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2106 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2107 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2108 }
13102 801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2109
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2110 template <typename NDA_T, typename ELT_T, typename MAT_T>
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2111 void print_nd_array (std::ostream& os, const NDA_T& nda,
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2112 bool pr_as_read_syntax)
13102 801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2113 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2114
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23565 diff changeset	2115 if (nda.isempty ())
13102 801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2116 print_empty_nd_array (os, nda.dims (), pr_as_read_syntax);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2117 else
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2118 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2119
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2120 int ndims = nda.ndims ();
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2121
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2122 dim_vector dims = nda.dims ();
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2123
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2124 Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2125
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2126 octave_idx_type m = 1;
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2127
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2128 for (int i = 2; i < ndims; i++)
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2129 m *= dims(i);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2130
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2131 octave_idx_type nr = dims(0);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2132 octave_idx_type nc = dims(1);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2133
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2134 for (octave_idx_type i = 0; i < m; i++)
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2135 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2136 octave_quit ();
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2137
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2138 std::string nm = "ans";
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2139
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2140 if (m > 1)
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2141 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2142 nm += "(:,:,";
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2143
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2144 std::ostringstream buf;
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2145
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2146 for (int k = 2; k < ndims; k++)
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2147 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2148 buf << ra_idx(k) + 1;
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2149
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2150 if (k < ndims - 1)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2151 buf << ',';
13102 801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2152 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2153 buf << ')';
13102 801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2154 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2155
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2156 nm += buf.str ();
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2157 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2158
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2159 Array<idx_vector> idx (dim_vector (ndims, 1));
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2160
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2161 idx(0) = idx_vector (':');
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2162 idx(1) = idx_vector (':');
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2163
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2164 for (int k = 2; k < ndims; k++)
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2165 idx(k) = idx_vector (ra_idx(k));
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2166
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2167 octave_value page
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2168 = MAT_T (Array<ELT_T> (nda.index (idx), dim_vector (nr, nc)));
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2169
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2170 if (i != m - 1)
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2171 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2172 page.print_with_name (os, nm);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2173 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2174 else
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2175 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2176 page.print_name_tag (os, nm);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2177 page.print_raw (os);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2178 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2179
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2180 if (i < m)
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2181 NDA_T::increment_index (ra_idx, dims, 2);
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2182 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2183 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2184 }
4532 01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe] jwe parents: 4513 diff changeset	2185
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2186 void
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2187 octave_print_internal (std::ostream& os, const NDArray& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2188 bool pr_as_read_syntax, int extra_indent)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2189 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2190 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2191 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2192 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2193 case 2:
19320 d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray. Carnë Draug <carandraug@octave.org> parents: 19318 diff changeset	2194 octave_print_internal (os, Matrix (nda),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2195 pr_as_read_syntax, extra_indent);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2196 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2197
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2198 default:
13102 801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2199 print_nd_array <NDArray, double, Matrix> (os, nda, pr_as_read_syntax);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2200 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2201 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2202 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2203
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2204 template <typename T>
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2205 static inline void
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2206 pr_plus_format (std::ostream& os, const std::complex<T>& c)
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2207 {
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2208 T rp = c.real ();
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2209 T ip = c.imag ();
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2210
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2211 if (rp == 0)
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2212 {
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2213 if (ip == 0)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2214 os << ' ';
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2215 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2216 os << 'i';
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2217 }
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2218 else if (ip == 0)
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	2219 pr_plus_format (os, rp);
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2220 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2221 os << 'c';
3248 68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2222 }
68259f410026 [project @ 1999-07-13 03:34:54 by jwe] jwe parents: 3215 diff changeset	2223
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	2224 extern void
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	2225 octave_print_internal (std::ostream& os, const float_display_format& fmt,
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	2226 const Complex& c, bool pr_as_read_syntax)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2227 {
17867 49d573a1deda avoid initial spaces for scalars in GUI workspace viewer (bug #40500) John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	2228 if (pr_as_read_syntax)
49d573a1deda avoid initial spaces for scalars in GUI workspace viewer (bug #40500) John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	2229 os << c;
49d573a1deda avoid initial spaces for scalars in GUI workspace viewer (bug #40500) John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	2230 else if (plus_format)
49d573a1deda avoid initial spaces for scalars in GUI workspace viewer (bug #40500) John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	2231 pr_plus_format (os, c);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2232 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2233 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2234 if (free_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2235 os << c;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2236 else
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24667 diff changeset	2237 pr_complex (os, fmt, c);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2238 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2239 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2240
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2241 void
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2242 octave_print_internal (std::ostream& os, const float_display_format& fmt,
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2243 const FloatComplex& c, bool pr_as_read_syntax)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2244 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2245 if (pr_as_read_syntax)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2246 os << c;
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2247 else if (plus_format)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2248 pr_plus_format (os, c);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2249 else
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2250 {
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2251 if (free_format)
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2252 os << c;
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2253 else
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2254 pr_complex (os, fmt, c);
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2255 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2256 }
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2257
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	2258 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	2259 octave_print_internal (std::ostream& os, const ComplexMatrix& cm,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2260 bool pr_as_read_syntax, int extra_indent)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2261 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2262 octave_idx_type nr = cm.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2263 octave_idx_type nc = cm.columns ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2264
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2265 if (nr == 0 \|\| nc == 0)
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2266 print_empty_matrix (os, nr, nc, pr_as_read_syntax);
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2267 else if (plus_format && ! pr_as_read_syntax)
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	2268 pr_plus_format_matrix (os, cm);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2269 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2270 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2271 int r_fw, i_fw;
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2272 double scale = 1;
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2273 float_display_format fmt = make_format (cm, r_fw, i_fw, scale);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2274 int column_width = i_fw + r_fw;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2275 column_width += (rat_format \|\| bank_format \|\| hex_format
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2276 \|\| bit_format) ? 2 : 7;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2277 octave_idx_type total_width = nc * column_width;
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21747 diff changeset	2278 octave_idx_type max_width = octave::command_editor::terminal_cols ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2279
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2280 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2281 max_width -= 4;
1972 58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe] jwe parents: 1968 diff changeset	2282 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2283 max_width -= extra_indent;
1972 58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe] jwe parents: 1968 diff changeset	2284
58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe] jwe parents: 1968 diff changeset	2285 if (max_width < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2286 max_width = 0;
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2287
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2288 if (free_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2289 {
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	2290 octave_print_free (os, cm, pr_as_read_syntax);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2291 return;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2292 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2293
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2294 octave_idx_type inc = nc;
2165 83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe] jwe parents: 2086 diff changeset	2295 if (total_width > max_width && Vsplit_long_rows)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2296 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2297 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2298 if (inc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2299 inc++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2300 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2301
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2302 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2303 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2304 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2305 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2306 octave_idx_type col = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2307 while (col < nc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2308 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2309 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2310
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2311 for (octave_idx_type j = col; j < lim; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2312 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2313 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2314
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2315 if (i == 0 && j == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2316 os << "[ ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2317 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2318 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2319 if (j > col && j < lim)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2320 os << ", ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2321 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2322 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2323 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2324
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2325 pr_complex (os, fmt, cm(i,j));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2326 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2327
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2328 col += inc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2329
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2330 if (col >= nc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2331 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2332 if (i == nr - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2333 os << " ]";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2334 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2335 os << ";\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2336 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2337 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2338 os << " ...\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2339 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2340 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2341 }
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2342 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2343 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	2344 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	2345
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2346 pr_scale_header (os, scale);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2347
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2348 for (octave_idx_type col = 0; col < nc; col += inc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2349 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2350 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2351
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2352 pr_col_num_header (os, total_width, max_width, lim, col,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2353 extra_indent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2354
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2355 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2356 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2357 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2358
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2359 for (octave_idx_type j = col; j < lim; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2360 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2361 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2362
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2363 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2364
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2365 pr_complex (os, fmt, cm(i,j), r_fw, i_fw, scale);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2366 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2367
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2368 if (i < nr - 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2369 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2370 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2371 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2372 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2373 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2374 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2375
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2376 void
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2377 octave_print_internal (std::ostream& os, const ComplexDiagMatrix& cm,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2378 bool pr_as_read_syntax, int extra_indent)
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2379 {
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2380 octave_idx_type nr = cm.rows ();
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2381 octave_idx_type nc = cm.columns ();
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2382
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2383 if (nr == 0 \|\| nc == 0)
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2384 print_empty_matrix (os, nr, nc, pr_as_read_syntax);
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2385 else if (plus_format && ! pr_as_read_syntax)
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	2386 pr_plus_format_matrix (os, cm);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2387 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2388 {
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2389 int r_fw, i_fw;
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2390 double scale = 1;
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2391 float_display_format fmt
d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2392 = make_format (ComplexMatrix (cm.diag ()), r_fw, i_fw, scale);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2393 int column_width = i_fw + r_fw;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2394 column_width += (rat_format \|\| bank_format \|\| hex_format
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2395 \|\| bit_format) ? 2 : 7;
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2396 octave_idx_type total_width = nc * column_width;
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21747 diff changeset	2397 octave_idx_type max_width = octave::command_editor::terminal_cols ();
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2398
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2399 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2400 max_width -= 4;
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2401 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2402 max_width -= extra_indent;
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2403
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2404 if (max_width < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2405 max_width = 0;
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2406
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2407 if (free_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2408 {
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	2409 octave_print_free (os, cm, pr_as_read_syntax);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2410 return;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2411 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2412
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2413 octave_idx_type inc = nc;
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2414 if (total_width > max_width && Vsplit_long_rows)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2415 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2416 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2417 if (inc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2418 inc++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2419 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2420
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2421 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2422 {
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2423 os << "diag (";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2424
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2425 octave_idx_type col = 0;
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2426 while (col < nc)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2427 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2428 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2429
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2430 for (octave_idx_type j = col; j < lim; j++)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2431 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	2432 octave_quit ();
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2433
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2434 if (j == 0)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2435 os << "[ ";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2436 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2437 {
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2438 if (j > col && j < lim)
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2439 os << ", ";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2440 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2441 os << " ";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2442 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2443
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2444 pr_complex (os, fmt, cm(j,j));
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2445 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2446
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2447 col += inc;
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2448
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2449 if (col >= nc)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2450 os << " ]";
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2451 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2452 os << " ...\n";
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2453 }
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2454 os << ')';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2455 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2456 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2457 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	2458 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	2459
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2460 os << "Diagonal Matrix\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2461 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2462 os << "\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2463
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2464 pr_scale_header (os, scale);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2465
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21748 diff changeset	2466 // kluge. Get the true width of a number.
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2467 int zero_fw;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2468 {
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2469 std::ostringstream tmp_oss;
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2470 pr_complex (tmp_oss, fmt, Complex (0), r_fw, i_fw, scale);
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2471 zero_fw = tmp_oss.str ().length ();
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2472 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2473
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2474 for (octave_idx_type col = 0; col < nc; col += inc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2475 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2476 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2477
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2478 pr_col_num_header (os, total_width, max_width, lim, col,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2479 extra_indent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2480
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2481 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2482 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2483 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2484
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2485 for (octave_idx_type j = col; j < lim; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2486 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2487 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2488
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2489 os << " ";
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2490
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2491 if (i == j)
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2492 pr_complex (os, fmt, cm(i,j), r_fw, i_fw, scale);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2493 else
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2494 os << std::setw (zero_fw) << '0';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2495 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2496
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2497 if (i < nr - 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2498 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2499 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2500 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2501 }
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2502 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2503 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2504
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2505 void
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2506 octave_print_internal (std::ostream& os, const PermMatrix& m,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2507 bool pr_as_read_syntax, int extra_indent)
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2508 {
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2509 octave_idx_type nr = m.rows ();
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2510 octave_idx_type nc = m.columns ();
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2511
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2512 if (nr == 0 \|\| nc == 0)
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2513 print_empty_matrix (os, nr, nc, pr_as_read_syntax);
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2514 else if (plus_format && ! pr_as_read_syntax)
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	2515 pr_plus_format_matrix (os, m);
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2516 else
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2517 {
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2518 int fw = 2;
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2519 int column_width = fw + 2;
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2520 octave_idx_type total_width = nc * column_width;
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21747 diff changeset	2521 octave_idx_type max_width = octave::command_editor::terminal_cols ();
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2522
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2523 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2524 max_width -= 4;
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2525 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2526 max_width -= extra_indent;
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2527
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2528 if (max_width < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2529 max_width = 0;
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2530
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2531 if (free_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2532 {
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	2533 octave_print_free (os, m, pr_as_read_syntax);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2534 return;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2535 }
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2536
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2537 octave_idx_type inc = nc;
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2538 if (total_width > max_width && Vsplit_long_rows)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2539 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2540 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2541 if (inc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2542 inc++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2543 }
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2544
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2545 if (pr_as_read_syntax)
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2546 {
18849 aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18816 diff changeset	2547 Array<octave_idx_type> pvec = m.col_perm_vec ();
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2548
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2549 os << "eye (";
18849 aa9ca67f09fb make all permutation matrices column permutations (bug #42418) David Spies <dnspies@gmail.com> parents: 18816 diff changeset	2550 os << ":, ";
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2551
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2552 octave_idx_type col = 0;
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2553 while (col < nc)
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2554 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2555 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2556
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2557 for (octave_idx_type j = col; j < lim; j++)
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2558 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	2559 octave_quit ();
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2560
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2561 if (j == 0)
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2562 os << "[ ";
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2563 else
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2564 {
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2565 if (j > col && j < lim)
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2566 os << ", ";
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2567 else
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2568 os << " ";
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2569 }
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2570
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2571 os << pvec (j);
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2572 }
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2573
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2574 col += inc;
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2575
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2576 if (col >= nc)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2577 os << " ]";
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2578 else
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2579 os << " ...\n";
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2580 }
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2581 os << ')';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2582 }
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2583 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2584 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	2585 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	2586
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2587 os << "Permutation Matrix\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2588 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2589 os << "\n";
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2590
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2591 for (octave_idx_type col = 0; col < nc; col += inc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2592 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2593 octave_idx_type lim = (col + inc < nc ? col + inc : nc);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2594
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2595 pr_col_num_header (os, total_width, max_width, lim, col,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2596 extra_indent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2597
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2598 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2599 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2600 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2601
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2602 for (octave_idx_type j = col; j < lim; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2603 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2604 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2605
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2606 os << " ";
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2607
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2608 os << std::setw (fw) << m(i,j);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2609 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2610
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2611 if (i < nr - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2612 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2613 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2614 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2615 }
8891 d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2616 }
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2617 }
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2618
d077c590eb88 indicate diag & perm matrices on output Jaroslav Hajek <highegg@gmail.com> parents: 8746 diff changeset	2619 void
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2620 octave_print_internal (std::ostream& os, const ComplexNDArray& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2621 bool pr_as_read_syntax, int extra_indent)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2622 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2623 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2624 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2625 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2626 case 2:
19320 d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray. Carnë Draug <carandraug@octave.org> parents: 19318 diff changeset	2627 octave_print_internal (os, ComplexMatrix (nda),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2628 pr_as_read_syntax, extra_indent);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2629 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2630
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2631 default:
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2632 print_nd_array <ComplexNDArray, Complex, ComplexMatrix>
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19697 diff changeset	2633 (os, nda, pr_as_read_syntax);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2634 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2635 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2636 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2637
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2638 // FIXME: write single precision versions of the printing functions.
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2639
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2640 void
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2641 octave_print_internal (std::ostream& os, const FloatMatrix& m,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2642 bool pr_as_read_syntax, int extra_indent)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2643 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2644 octave_print_internal (os, Matrix (m), pr_as_read_syntax, extra_indent);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2645 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2646
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2647 void
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2648 octave_print_internal (std::ostream& os, const FloatDiagMatrix& m,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2649 bool pr_as_read_syntax, int extra_indent)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2650 {
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2651 octave_print_internal (os, DiagMatrix (m), pr_as_read_syntax, extra_indent);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2652 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2653
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2654 void
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2655 octave_print_internal (std::ostream& os, const FloatNDArray& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2656 bool pr_as_read_syntax, int extra_indent)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2657 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	2658 octave_print_internal (os, NDArray (nda), pr_as_read_syntax, extra_indent);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2659 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2660
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2661 void
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2662 octave_print_internal (std::ostream& os, const FloatComplexMatrix& cm,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2663 bool pr_as_read_syntax, int extra_indent)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2664 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2665 octave_print_internal (os, ComplexMatrix (cm), pr_as_read_syntax,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2666 extra_indent);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2667 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2668
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2669 void
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2670 octave_print_internal (std::ostream& os, const FloatComplexDiagMatrix& cm,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2671 bool pr_as_read_syntax, int extra_indent)
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2672 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2673 octave_print_internal (os, ComplexDiagMatrix (cm), pr_as_read_syntax,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2674 extra_indent);
8625 4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2675 }
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2676
4d90d21a9cd9 special printing of diagonal matrices Jaroslav Hajek <highegg@gmail.com> parents: 8333 diff changeset	2677 void
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2678 octave_print_internal (std::ostream& os, const FloatComplexNDArray& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2679 bool pr_as_read_syntax, int extra_indent)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2680 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2681 octave_print_internal (os, ComplexNDArray (nda), pr_as_read_syntax,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2682 extra_indent);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2683 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2684
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7721 diff changeset	2685 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	2686 octave_print_internal (std::ostream& os, const Range& r,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2687 bool pr_as_read_syntax, int extra_indent)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2688 {
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2689 double base = r.base ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2690 double increment = r.inc ();
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2691 double limit = r.limit ();
20228 00cf2847355d Deprecate Array::nelem() and Range::nelem() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20172 diff changeset	2692 octave_idx_type num_elem = r.numel ();
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2693
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2694 if (plus_format && ! pr_as_read_syntax)
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	2695 pr_plus_format_matrix (os, r);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2696 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2697 {
10987 eec74ee00b32 eliminate some GCC warnings John W. Eaton <jwe@octave.org> parents: 10846 diff changeset	2698 int fw = 0;
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2699 double scale = 1;
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2700 float_display_format fmt = make_format (r, fw, scale);
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2701
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2702 if (pr_as_read_syntax)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2703 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2704 if (free_format)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2705 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2706 os << base << " : ";
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2707 if (increment != 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2708 os << increment << " : ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2709 os << limit;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2710 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2711 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2712 {
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2713 pr_float (os, fmt, base, fw);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2714 os << " : ";
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	2715 if (increment != 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2716 {
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2717 pr_float (os, fmt, increment, fw);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2718 os << " : ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2719 }
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2720 pr_float (os, fmt, limit, fw);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2721 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2722 }
626 96be9eae023f [project @ 1994-08-19 02:10:54 by jwe] jwe parents: 575 diff changeset	2723 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2724 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	2725 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	2726
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2727 int column_width = fw + 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2728 octave_idx_type total_width = num_elem * column_width;
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21747 diff changeset	2729 octave_idx_type max_width = octave::command_editor::terminal_cols ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2730
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2731 if (free_format)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2732 {
24769 e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	2733 os << ' ';
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	2734 for (octave_idx_type i = 0; i < num_elem; i++)
e574b957b01b don't print extra newline after matrices with format free (bug #53168) John W. Eaton <jwe@octave.org> parents: 24767 diff changeset	2735 os << ' ' << r.elem(i);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2736 return;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2737 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2738
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2739 octave_idx_type inc = num_elem;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2740 if (total_width > max_width && Vsplit_long_rows)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2741 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2742 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2743 if (inc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2744 inc++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2745 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2746
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2747 max_width -= extra_indent;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2748
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2749 if (max_width < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2750 max_width = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2751
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2752 pr_scale_header (os, scale);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2753
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2754 octave_idx_type col = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2755 while (col < num_elem)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2756 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	2757 octave_idx_type lim = (col + inc < num_elem ? col + inc : num_elem);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2758
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2759 pr_col_num_header (os, total_width, max_width, lim, col,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2760 extra_indent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2761
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2762 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2763
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2764 for (octave_idx_type i = col; i < lim; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2765 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2766 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2767
16169 0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15467 diff changeset	2768 double val;
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15467 diff changeset	2769 if (i == 0)
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15467 diff changeset	2770 val = base;
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15467 diff changeset	2771 else
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15467 diff changeset	2772 val = base + i * increment;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2773
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2774 if (i == num_elem - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2775 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2776 // See the comments in Range::matrix_value.
16169 0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15467 diff changeset	2777 if ((increment > 0 && val >= limit)
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423) Rik <rik@octave.org> parents: 15467 diff changeset	2778 \|\| (increment < 0 && val <= limit))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2779 val = limit;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2780 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2781
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2782 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2783
24761 d7c3918955e6 eliminate file-scope static variable in pr-output.cc John W. Eaton <jwe@octave.org> parents: 24760 diff changeset	2784 pr_float (os, fmt, val, fw, scale);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2785 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2786
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2787 col += inc;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2788 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2789 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2790 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2791 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	2792
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	2793 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	2794 octave_print_internal (std::ostream& os, const boolMatrix& bm,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2795 bool pr_as_read_syntax,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2796 int extra_indent)
3215 bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe] jwe parents: 3164 diff changeset	2797 {
21583 d5963a6e29c2 Use integer output formatting for logicals (bug #47607) Mike Miller <mtmiller@octave.org> parents: 21568 diff changeset	2798 uint8NDArray tmp (bm);
3215 bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe] jwe parents: 3164 diff changeset	2799 octave_print_internal (os, tmp, pr_as_read_syntax, extra_indent);
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe] jwe parents: 3164 diff changeset	2800 }
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe] jwe parents: 3164 diff changeset	2801
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe] jwe parents: 3164 diff changeset	2802 void
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2803 octave_print_internal (std::ostream& os, const boolNDArray& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2804 bool pr_as_read_syntax,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2805 int extra_indent)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2806 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2807 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2808 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2809 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2810 case 2:
19317 25f535b90e52 Change boolMatrix to subclass boolNDArray rather than be another Array<bool>. Carnë Draug <carandraug@octave.org> parents: 19255 diff changeset	2811 octave_print_internal (os, boolMatrix (nda),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2812 pr_as_read_syntax, extra_indent);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2813 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2814
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2815 default:
13102 801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2816 print_nd_array<boolNDArray, bool,
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	2817 boolMatrix> (os, nda, pr_as_read_syntax);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2818 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2819 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2820 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2821
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2822 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	2823 octave_print_internal (std::ostream& os, const charMatrix& chm,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2824 bool pr_as_read_syntax,
21066 258c787cd9ce maint: Use "FIXME:" consistently in code base. Rik <rik@octave.org> parents: 20946 diff changeset	2825 int /* FIXME: extra_indent */,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2826 bool pr_as_string)
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	2827 {
1572 0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2828 if (pr_as_string)
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2829 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2830 octave_idx_type nstr = chm.rows ();
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	2831
1572 0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2832 if (pr_as_read_syntax && nstr > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2833 os << "[ ";
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	2834
2907 8bb31a2b480b [project @ 1997-04-30 05:01:46 by jwe] jwe parents: 2903 diff changeset	2835 if (nstr != 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2836 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2837 for (octave_idx_type i = 0; i < nstr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2838 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2839 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2840
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2841 std::string row = chm.row_as_string (i);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2842
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2843 if (pr_as_read_syntax)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2844 {
23803 90689bdbe048 Use C++11 raw string literals to avoid escaping double quotes. Rik <rik@octave.org> parents: 23797 diff changeset	2845 os << '"' << undo_string_escapes (row) << '"';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2846
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2847 if (i < nstr - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2848 os << "; ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2849 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2850 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2851 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2852 os << row;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2853
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2854 if (i < nstr - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2855 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2856 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2857 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2858 }
1572 0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2859
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2860 if (pr_as_read_syntax && nstr > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2861 os << " ]";
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	2862 }
1572 0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2863 else
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2864 {
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2865 os << "sorry, printing char matrices not implemented yet\n";
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe] jwe parents: 1488 diff changeset	2866 }
1343 94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	2867 }
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe] jwe parents: 1328 diff changeset	2868
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2869 void
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2870 octave_print_internal (std::ostream& os, const charNDArray& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2871 bool pr_as_read_syntax, int extra_indent,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2872 bool pr_as_string)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2873 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2874 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2875 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2876 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2877 case 2:
19318 6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>. Carnë Draug <carandraug@octave.org> parents: 19317 diff changeset	2878 octave_print_internal (os, charMatrix (nda),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2879 pr_as_read_syntax, extra_indent, pr_as_string);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2880 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2881
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2882 default:
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2883 print_nd_array <charNDArray, char, charMatrix> (os, nda,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2884 pr_as_read_syntax);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2885 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2886 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2887 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4509 diff changeset	2888
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2889 void
4925 90f51232d751 [project @ 2004-08-02 22:09:47 by jwe] jwe parents: 4901 diff changeset	2890 octave_print_internal (std::ostream& os, const std::string& s,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2891 bool pr_as_read_syntax, int extra_indent)
4925 90f51232d751 [project @ 2004-08-02 22:09:47 by jwe] jwe parents: 4901 diff changeset	2892 {
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9643 diff changeset	2893 Array<std::string> nda (dim_vector (1, 1), s);
4925 90f51232d751 [project @ 2004-08-02 22:09:47 by jwe] jwe parents: 4901 diff changeset	2894
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe] jwe parents: 4901 diff changeset	2895 octave_print_internal (os, nda, pr_as_read_syntax, extra_indent);
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe] jwe parents: 4901 diff changeset	2896 }
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe] jwe parents: 4901 diff changeset	2897
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe] jwe parents: 4901 diff changeset	2898 void
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9643 diff changeset	2899 octave_print_internal (std::ostream& os, const Array<std::string>& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2900 bool pr_as_read_syntax, int /* extra_indent */)
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2901 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2902 // FIXME: this mostly duplicates the code in the print_nd_array<>
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21748 diff changeset	2903 // function. Can fix this with std::is_same from C++11.
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2904
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23565 diff changeset	2905 if (nda.isempty ())
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2906 print_empty_nd_array (os, nda.dims (), pr_as_read_syntax);
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20230 diff changeset	2907 else if (nda.numel () == 1)
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2908 {
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2909 os << nda(0);
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2910 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2911 else
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2912 {
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2913 int ndims = nda.ndims ();
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2914
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2915 dim_vector dims = nda.dims ();
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2916
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	2917 Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2918
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2919 octave_idx_type m = 1;
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2920
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2921 for (int i = 2; i < ndims; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2922 m *= dims(i);
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2923
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2924 octave_idx_type nr = dims(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2925 octave_idx_type nc = dims(1);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2926
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	2927 for (octave_idx_type i = 0; i < m; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2928 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2929 std::string nm = "ans";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2930
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2931 if (m > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2932 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2933 nm += "(:,:,";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2934
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2935 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2936
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2937 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2938 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2939 buf << ra_idx(k) + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2940
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2941 if (k < ndims - 1)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2942 buf << ',';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2943 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	2944 buf << ')';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2945 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2946
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2947 nm += buf.str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2948 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2949
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	2950 Array<idx_vector> idx (dim_vector (ndims, 1));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2951
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2952 idx(0) = idx_vector (':');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2953 idx(1) = idx_vector (':');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2954
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2955 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2956 idx(k) = idx_vector (ra_idx(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2957
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	2958 Array<std::string> page (nda.index (idx), dim_vector (nr, nc));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2959
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2960 // FIXME: need to do some more work to put these
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2961 // in neatly aligned columns...
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2962
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2963 octave_idx_type n_rows = page.rows ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2964 octave_idx_type n_cols = page.cols ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2965
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2966 os << nm << " =\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2967 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	2968 os << "\n";
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2969
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2970 for (octave_idx_type ii = 0; ii < n_rows; ii++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2971 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2972 for (octave_idx_type jj = 0; jj < n_cols; jj++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2973 os << " " << page(ii,jj);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2974
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2975 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2976 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2977
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2978 if (i < m - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2979 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2980
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2981 if (i < m)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2982 increment_index (ra_idx, dims, 2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	2983 }
4655 c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2984 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2985 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe] jwe parents: 4632 diff changeset	2986
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21100 diff changeset	2987 template <typename T>
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	2988 class
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	2989 octave_print_conv
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	2990 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	2991 public:
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	2992 typedef T print_conv_type;
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	2993 };
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	2994
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2995 #define PRINT_CONV(T1, T2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2996 template <> \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2997 class \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2998 octave_print_conv<T1> \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	2999 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3000 public: \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3001 typedef T2 print_conv_type; \
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3002 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3003
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3004 PRINT_CONV (octave_int8, octave_int16);
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3005 PRINT_CONV (octave_uint8, octave_uint16);
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3006
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3007 #undef PRINT_CONV
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3008
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21100 diff changeset	3009 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	3010 static inline void
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3011 pr_int (std::ostream& os, const T& d, int fw = 0)
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3012 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14429 diff changeset	3013 size_t sz = d.byte_size ();
23432 e35a5c1233d0 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23410 diff changeset	3014 const unsigned char *tmpi = d.iptr ();
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3015
5544 2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe] jwe parents: 5404 diff changeset	3016 // Unless explicitly asked for, always print in big-endian
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe] jwe parents: 5404 diff changeset	3017 // format for hex and bit formats.
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe] jwe parents: 5404 diff changeset	3018 //
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe] jwe parents: 5404 diff changeset	3019 // {bit,hex}_format == 1: print big-endian
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe] jwe parents: 5404 diff changeset	3020 // {bit,hex}_format == 2: print native
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe] jwe parents: 5404 diff changeset	3021
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3022 if (hex_format)
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3023 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	3024 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	3025
f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	3026 os.flags (std::ios::right \| std::ios::hex);
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3027
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	3028 if (hex_format > 1 \|\| octave::mach_info::words_big_endian ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3029 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3030 for (size_t i = 0; i < sz; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3031 os << std::setw (2) << static_cast<int> (tmpi[i]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3032 }
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3033 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3034 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3035 for (int i = sz - 1; i >= 0; i--)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3036 os << std::setw (2) << static_cast<int> (tmpi[i]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3037 }
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3038 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3039 else if (bit_format)
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3040 {
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	3041 if (octave::mach_info::words_big_endian ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3042 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3043 for (size_t i = 0; i < sz; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3044 PRINT_CHAR_BITS (os, tmpi[i]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3045 }
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3046 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3047 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3048 if (bit_format > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3049 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3050 for (size_t i = 0; i < sz; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3051 PRINT_CHAR_BITS_SWAPPED (os, tmpi[i]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3052 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3053 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3054 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3055 for (int i = sz - 1; i >= 0; i--)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3056 PRINT_CHAR_BITS (os, tmpi[i]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3057 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3058 }
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3059 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3060 else
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3061 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	3062 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	3063
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3064 os << std::setw (fw)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3065 << typename octave_print_conv<T>::print_conv_type (d);
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3066
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3067 if (bank_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3068 os << ".00";
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3069 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3070 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3071
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3072 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3073 pr_int (std::ostream&, const octave_int8&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3074
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3075 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3076 pr_int (std::ostream&, const octave_int16&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3077
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3078 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3079 pr_int (std::ostream&, const octave_int32&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3080
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3081 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3082 pr_int (std::ostream&, const octave_int64&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3083
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3084 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3085 pr_int (std::ostream&, const octave_uint8&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3086
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3087 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3088 pr_int (std::ostream&, const octave_uint16&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3089
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3090 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3091 pr_int (std::ostream&, const octave_uint32&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3092
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3093 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3094 pr_int (std::ostream&, const octave_uint64&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3095
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21100 diff changeset	3096 template <typename T>
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3097 void
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3098 octave_print_internal_template (std::ostream& os,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3099 const float_display_format& fmt,
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3100 const octave_int<T>& val, bool)
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3101 {
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3102 if (plus_format)
24781 e6f380f9b2a4 use template for printing matrices in plus format John W. Eaton <jwe@octave.org> parents: 24771 diff changeset	3103 pr_plus_format (os, val);
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3104 else
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3105 {
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3106 if (free_format)
23534 b6498c088fca maint: Don't write '> >' for declaration of templates that use templates. Rik <rik@octave.org> parents: 23457 diff changeset	3107 os << typename octave_print_conv<octave_int<T>>::print_conv_type (val);
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3108 else
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3109 {
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3110 float_format r_fmt = fmt.real_format ();
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3111
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3112 pr_int (os, val, r_fmt.fw);
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3113 }
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3114 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3115 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3116
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3117 #define PRINT_INT_SCALAR_INTERNAL(TYPE) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3118 OCTINTERP_API void \
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3119 octave_print_internal (std::ostream& os, \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3120 const float_display_format& fmt, \
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3121 const octave_int<TYPE>& val, bool dummy) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3122 { \
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3123 octave_print_internal_template (os, fmt, val, dummy); \
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3124 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3125
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3126 PRINT_INT_SCALAR_INTERNAL (int8_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3127 PRINT_INT_SCALAR_INTERNAL (uint8_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3128 PRINT_INT_SCALAR_INTERNAL (int16_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3129 PRINT_INT_SCALAR_INTERNAL (uint16_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3130 PRINT_INT_SCALAR_INTERNAL (int32_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3131 PRINT_INT_SCALAR_INTERNAL (uint32_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3132 PRINT_INT_SCALAR_INTERNAL (int64_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3133 PRINT_INT_SCALAR_INTERNAL (uint64_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3134
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21100 diff changeset	3135 template <typename T>
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	3136 static inline void
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3137 octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3138 bool pr_as_read_syntax, int extra_indent)
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3139 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	3140 // FIXME: this mostly duplicates the code in the print_nd_array<>
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21748 diff changeset	3141 // function. Can fix this with std::is_same from C++11.
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3142
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23565 diff changeset	3143 if (nda.isempty ())
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3144 print_empty_nd_array (os, nda.dims (), pr_as_read_syntax);
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20230 diff changeset	3145 else if (nda.numel () == 1)
24745 d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3146 octave_print_internal_template (os, float_display_format (), nda(0),
d2467914ce33 enable (or improve) display for more types in the variable editor John W. Eaton <jwe@octave.org> parents: 24737 diff changeset	3147 pr_as_read_syntax);
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3148 else if (plus_format && ! pr_as_read_syntax)
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3149 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3150 int ndims = nda.ndims ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3151
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	3152 Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3153
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3154 dim_vector dims = nda.dims ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3155
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3156 octave_idx_type m = 1;
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3157
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3158 for (int i = 2; i < ndims; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3159 m *= dims(i);
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3160
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3161 octave_idx_type nr = dims(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3162 octave_idx_type nc = dims(1);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3163
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3164 for (octave_idx_type i = 0; i < m; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3165 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3166 if (m > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3167 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3168 std::string nm = "ans(:,:,";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3169
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3170 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3171
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3172 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3173 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3174 buf << ra_idx(k) + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3175
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3176 if (k < ndims - 1)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	3177 buf << ',';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3178 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	3179 buf << ')';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3180 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3181
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3182 nm += buf.str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3183
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3184 os << nm << " =\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3185 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3186 os << "\n";
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3187 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3188
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	3189 Array<idx_vector> idx (dim_vector (ndims, 1));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3190
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3191 idx(0) = idx_vector (':');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3192 idx(1) = idx_vector (':');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3193
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3194 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3195 idx(k) = idx_vector (ra_idx(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3196
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	3197 Array<T> page (nda.index (idx), dim_vector (nr, nc));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3198
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3199 for (octave_idx_type ii = 0; ii < nr; ii++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3200 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3201 for (octave_idx_type jj = 0; jj < nc; jj++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3202 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3203 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3204
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3205 pr_plus_format (os, page(ii,jj));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3206 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3207
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3208 if ((ii < nr - 1) \|\| (i < m -1))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3209 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3210 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3211
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3212 if (i < m - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3213 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3214 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3215 increment_index (ra_idx, dims, 2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3216 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3217 }
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3218 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3219 else
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3220 {
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3221 int ndims = nda.ndims ();
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3222
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3223 dim_vector dims = nda.dims ();
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3224
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	3225 Array<octave_idx_type> ra_idx (dim_vector (ndims, 1), 0);
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3226
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3227 octave_idx_type m = 1;
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3228
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3229 for (int i = 2; i < ndims; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3230 m *= dims(i);
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3231
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3232 octave_idx_type nr = dims(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3233 octave_idx_type nc = dims(1);
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3234
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3235 int fw = 0;
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3236 if (hex_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3237 fw = 2 * nda(0).byte_size ();
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3238 else if (bit_format)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3239 fw = nda(0).nbits ();
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3240 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3241 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3242 bool isneg = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3243 int digits = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3244
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3245 for (octave_idx_type i = 0; i < dims.numel (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3246 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	3247 int new_digits
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	3248 = static_cast<int>
24770 39186eac5a05 preparing for a brave new future, use templates in some pr-output functions John W. Eaton <jwe@octave.org> parents: 24769 diff changeset	3249 (std::floor (log10 (double (abs (nda(i).value ()))) + 1));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3250
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3251 if (new_digits > digits)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3252 digits = new_digits;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3253
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3254 if (! isneg)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	3255 isneg = (abs (nda(i).value ()) != nda(i).value ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3256 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3257
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3258 fw = digits + isneg;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3259 }
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3260
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3261 int column_width = fw + (rat_format ? 0 : (bank_format ? 5 : 2));
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3262 octave_idx_type total_width = nc * column_width;
21748 176536b15d68 use namespace for command_editor and command_history classes John W. Eaton <jwe@octave.org> parents: 21747 diff changeset	3263 int max_width = octave::command_editor::terminal_cols () - extra_indent;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3264 octave_idx_type inc = nc;
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3265 if (total_width > max_width && Vsplit_long_rows)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3266 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3267 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3268 if (inc == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3269 inc++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3270 }
4949 f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe] jwe parents: 4933 diff changeset	3271
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5086 diff changeset	3272 for (octave_idx_type i = 0; i < m; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3273 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3274 if (m > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3275 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3276 std::string nm = "ans(:,:,";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3277
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3278 std::ostringstream buf;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3279
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3280 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3281 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3282 buf << ra_idx(k) + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3283
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3284 if (k < ndims - 1)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	3285 buf << ',';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3286 else
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	3287 buf << ')';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3288 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3289
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3290 nm += buf.str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3291
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3292 os << nm << " =\n";
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3293 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3294 os << "\n";
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3295 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3296
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	3297 Array<idx_vector> idx (dim_vector (ndims, 1));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3298
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3299 idx(0) = idx_vector (':');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3300 idx(1) = idx_vector (':');
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3301
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3302 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3303 idx(k) = idx_vector (ra_idx(k));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3304
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11547 diff changeset	3305 Array<T> page (nda.index (idx), dim_vector (nr, nc));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3306
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3307 if (free_format)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3308 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3309 if (pr_as_read_syntax)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3310 os << "[\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3311
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3312 for (octave_idx_type ii = 0; ii < nr; ii++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3313 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3314 for (octave_idx_type jj = 0; jj < nc; jj++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3315 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3316 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3317 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3318 os << typename octave_print_conv<T>::print_conv_type (page(ii,jj));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3319 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3320 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3321 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3322
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3323 if (pr_as_read_syntax)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23803 diff changeset	3324 os << ']';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3325 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3326 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3327 {
23675 f71c0195b19d move octave_preserve_stream_state to octave namespace John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	3328 octave::preserve_stream_state stream_state (os);
17818 f1b59ef34eda attempt to avoid setting persistent state on i/o streams (bug #40396) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	3329
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3330 octave_idx_type n_rows = page.rows ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3331 octave_idx_type n_cols = page.cols ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3332
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3333 for (octave_idx_type col = 0; col < n_cols; col += inc)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3334 {
24737 5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	3335 octave_idx_type lim = (col + inc < n_cols ? col + inc
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083). Rik <rik@octave.org> parents: 24673 diff changeset	3336 : n_cols);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3337
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3338 pr_col_num_header (os, total_width, max_width, lim, col,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3339 extra_indent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3340
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3341 for (octave_idx_type ii = 0; ii < n_rows; ii++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3342 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3343 os << std::setw (extra_indent) << "";
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	3344
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3345 for (octave_idx_type jj = col; jj < lim; jj++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3346 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3347 octave_quit ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3348 os << " ";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3349 pr_int (os, page(ii,jj), fw);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3350 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3351 if ((ii < n_rows - 1) \|\| (i < m -1))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3352 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3353 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3354 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3355 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3356
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3357 if (i < m - 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3358 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3359 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3360 increment_index (ra_idx, dims, 2);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3361 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3362 }
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3363 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3364 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3365
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3366 #define PRINT_INT_ARRAY_INTERNAL(TYPE) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3367 OCTINTERP_API void \
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3368 octave_print_internal (std::ostream& os, const intNDArray<TYPE>& nda, \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3369 bool pr_as_read_syntax, int extra_indent) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22022 diff changeset	3370 { \
7215 dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3371 octave_print_internal_template (os, nda, pr_as_read_syntax, extra_indent); \
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3372 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3373
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3374 PRINT_INT_ARRAY_INTERNAL (octave_int8)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3375 PRINT_INT_ARRAY_INTERNAL (octave_uint8)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3376 PRINT_INT_ARRAY_INTERNAL (octave_int16)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3377 PRINT_INT_ARRAY_INTERNAL (octave_uint16)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3378 PRINT_INT_ARRAY_INTERNAL (octave_int32)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3379 PRINT_INT_ARRAY_INTERNAL (octave_uint32)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3380 PRINT_INT_ARRAY_INTERNAL (octave_int64)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe] jwe parents: 7097 diff changeset	3381 PRINT_INT_ARRAY_INTERNAL (octave_uint64)
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4869 diff changeset	3382
8012 63dbb85452cc fix extern decls in .cc files John W. Eaton <jwe@octave.org> parents: 7896 diff changeset	3383 void
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	3384 octave_print_internal (std::ostream&, const Cell&, bool, int, bool)
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3776 diff changeset	3385 {
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	3386 panic_impossible ();
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3776 diff changeset	3387 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3776 diff changeset	3388
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	3389 void
19620 a1d172bfcb2f eliminate some unused variable and typedef warnings John W. Eaton <jwe@octave.org> parents: 19367 diff changeset	3390 octave_print_internal (std::ostream&, const octave_value&, bool)
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	3391 {
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	3392 panic_impossible ();
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	3393 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17847 diff changeset	3394
20915 a3359fe50966 remove unused nargout variables John W. Eaton <jwe@octave.org> parents: 20909 diff changeset	3395 DEFUN (rats, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3396 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3397 @deftypefn {} {} rats (@var{x}, @var{len})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3398 Convert @var{x} into a rational approximation represented as a string.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3399
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3400 The string can be converted back into a matrix as follows:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3401
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3402 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3403 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3404 r = rats (hilb (4));
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3405 x = str2num (r)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3406 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3407 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3408
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3409 The optional second argument defines the maximum length of the string
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3410 representing the elements of @var{x}. By default @var{len} is 9.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3411
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3412 If the length of the smallest possible rational approximation exceeds
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3413 @var{len}, an asterisk (*) padded with spaces will be returned instead.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3414 @seealso{format, rat}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3415 @end deftypefn */)
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3416 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3417 int nargin = args.length ();
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3418
20909 03e4ddd49396 omit unnecessary nargout checks John W. Eaton <jwe@octave.org> parents: 20897 diff changeset	3419 if (nargin < 1 \|\| nargin > 2)
7896 92c26470fe56 Frats fix for nargin==0 David Bateman <dbateman@free.fr> parents: 7789 diff changeset	3420 print_usage ();
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3421
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3422 octave_value arg = args(0);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3423
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23577 diff changeset	3424 if (! arg.isnumeric ())
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3425 error ("rats: X must be numeric");
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3426
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3427 octave::unwind_protect frame;
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3428
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3429 frame.protect_var (rat_string_len);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3430
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3431 rat_string_len = 9;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3432 if (nargin == 2)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3433 rat_string_len = args(1).nint_value ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3434
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3435 frame.protect_var (rat_format);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3436
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3437 rat_format = true;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3438
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3439 std::ostringstream buf;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3440 arg.print (buf);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3441 std::string s = buf.str ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3442
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3443 std::list<std::string> lst;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3444
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3445 size_t n = 0;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3446 size_t s_len = s.length ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3447
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3448 while (n < s_len)
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3449 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3450 size_t m = s.find ('\n', n);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3451
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3452 if (m == std::string::npos)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3453 {
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3454 lst.push_back (s.substr (n));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3455 break;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3456 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3457 else
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3458 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3459 lst.push_back (s.substr (n, m - n));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3460 n = m + 1;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3461 }
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3462 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3463
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3464 return ovl (string_vector (lst));
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3465 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3466
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3467 DEFUN (disp, args, nargout,
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3468 classes: cell char double function_handle int8 int16 int32 int64 logical single struct uint8 uint16 uint32 uint64
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3469 doc: /* -- texinfo --
24764 36ca11f78553 Document second calling form of disp(). Rik <rik@octave.org> parents: 23219 diff changeset	3470 @deftypefn {} {} disp (@var{x})
36ca11f78553 Document second calling form of disp(). Rik <rik@octave.org> parents: 23219 diff changeset	3471 @deftypefnx {} {@var{str} =} disp (@var{x})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3472 Display the value of @var{x}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3473
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3474 For example:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3475
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3476 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3477 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3478 disp ("The value of pi is:"), disp (pi)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3479
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3480 @print{} the value of pi is:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3481 @print{} 3.1416
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3482 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3483 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3484
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3485 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3486 Note that the output from @code{disp} always ends with a newline.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3487
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3488 If an output value is requested, @code{disp} prints nothing and returns the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3489 formatted output in a string.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3490 @seealso{fdisp}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3491 @end deftypefn */)
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3492 {
20909 03e4ddd49396 omit unnecessary nargout checks John W. Eaton <jwe@octave.org> parents: 20897 diff changeset	3493 if (args.length () != 1)
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3494 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3495
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3496 octave_value_list retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20925 diff changeset	3497
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3498 octave_value arg = args(0);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3499
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3500 if (nargout == 0)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3501 arg.print (octave_stdout);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3502 else
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3503 {
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3504 std::ostringstream buf;
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3505 arg.print (buf);
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	3506 retval = (octave_value (buf.str (), arg.is_dq_string () ? '"' : '\''));
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3507 }
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3508
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3509 return retval;
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3510 }
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3511
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23675 diff changeset	3512 DEFMETHOD (fdisp, interp, args, ,
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23675 diff changeset	3513 classes: cell char double function_handle int8 int16 int32 int64 logical single struct uint8 uint16 uint32 uint64
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3514 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3515 @deftypefn {} {} fdisp (@var{fid}, @var{x})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3516 Display the value of @var{x} on the stream @var{fid}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3517
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3518 For example:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3519
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3520 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3521 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3522 fdisp (stdout, "The value of pi is:"), fdisp (stdout, pi)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3523
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3524 @print{} the value of pi is:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3525 @print{} 3.1416
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3526 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3527 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3528
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3529 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3530 Note that the output from @code{fdisp} always ends with a newline.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3531 @seealso{disp}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3532 @end deftypefn */)
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3533 {
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20801 diff changeset	3534 if (args.length () != 2)
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3535 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3536
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23675 diff changeset	3537 octave::stream_list& streams = interp.get_stream_list ();
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23675 diff changeset	3538
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23675 diff changeset	3539 int fid = streams.get_file_number (args(0));
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23675 diff changeset	3540
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23675 diff changeset	3541 octave::stream os = streams.lookup (fid, "fdisp");
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3542
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3543 std::ostream *osp = os.output_stream ();
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3544
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3545 octave_value arg = args(1);
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3546
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3547 if (osp)
a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3548 arg.print (*osp);
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3549 else
20801 a542a9bf177e eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20555 diff changeset	3550 error ("fdisp: stream FID not open for writing");
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3551
20941 a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()". Rik <rik@octave.org> parents: 20940 diff changeset	3552 return ovl ();
3685 9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3553 }
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe] jwe parents: 3683 diff changeset	3554
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	3555 /*
9629 e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3556 %!test
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3557 %! format short
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3558 %! fd = tmpfile ();
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3559 %! for r = [0, Inf -Inf, NaN]
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3560 %! for i = [0, Inf -Inf, NaN]
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3561 %! fdisp (fd, complex (r, i));
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3562 %! endfor
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3563 %! endfor
e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3564 %! fclose (fd);
13129 155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3565
155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3566 %!test
155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3567 %! foo.real = pi * ones (3,20,3);
155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3568 %! foo.complex = pi * ones (3,20,3) + 1i;
155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3569 %! foo.char = repmat ("- Hello World -", [3, 20]);
155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3570 %! foo.cell = {foo.real, foo.complex, foo.char};
155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3571 %! fields = fieldnames (foo);
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	3572 %! for f = 1:numel (fields)
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3573 %! format loose;
13129 155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3574 %! loose = disp (foo.(fields{f}));
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3575 %! format compact;
13129 155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3576 %! compact = disp (foo.(fields{f}));
155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3577 %! expected = strrep (loose, "\n\n", "\n");
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3578 %! assert (expected, compact);
13129 155d7a5e70f5 src/pr-output.cc: Test "format compact" Ben Abbott <bpabbott@mac.com> parents: 13112 diff changeset	3579 %! endfor
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	3580 */
9629 e1345a9002e8 pr-output.cc: new test John W. Eaton <jwe@octave.org> parents: 9612 diff changeset	3581
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3582 DEFUN (display, args, ,
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3583 classes: cell char double function_handle int8 int16 int32 int64 logical single struct uint8 uint16 uint32 uint64
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3584 doc: /* -- texinfo --
23565 3a730821e4a2 doc: Peridoc grammarcheck of documentation. Rik <rik@octave.org> parents: 23564 diff changeset	3585 @deftypefn {} {} display (@var{obj})
23332 7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3586 Display the contents of the object @var{obj} prepended by its name.
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3587
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3588 The Octave interpreter calls the @code{display} function whenever it needs
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3589 to present a class on-screen. Typically, this would be a statement which
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3590 does not end in a semicolon to suppress output. For example:
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3591
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3592 @example
23182 8a37443f1a7b doc: Document second input argument of display (bug #49794) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	3593 myclass (@dots{})
8a37443f1a7b doc: Document second input argument of display (bug #49794) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	3594 @end example
8a37443f1a7b doc: Document second input argument of display (bug #49794) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	3595
8a37443f1a7b doc: Document second input argument of display (bug #49794) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	3596 Or:
8a37443f1a7b doc: Document second input argument of display (bug #49794) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	3597
8a37443f1a7b doc: Document second input argument of display (bug #49794) Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23084 diff changeset	3598 @example
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3599 myobj = myclass (@dots{})
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3600 @end example
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3601
23410 705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3602 In general, user-defined classes should overload the @code{disp} method to
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3603 avoid the default output:
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3604
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3605 @example
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3606 @group
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3607 myobj = myclass (@dots{})
23410 705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3608 @result{} myobj =
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3609
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3610 <class myclass>
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3611 @end group
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3612 @end example
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3613
23410 705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3614 When overloading the @code{display} method instead, one has to take care
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3615 of properly displaying the object's name. This can be done by using the
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3616 @code{inputname} function.
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3617
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23398 diff changeset	3618 @seealso{disp, class, subsref, subsasgn}
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3619 @end deftypefn */)
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3620 {
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3621 int nargin = args.length ();
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3622
23332 7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3623 // Matlab apparently accepts two arguments with the second set to the
7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3624 // inputname of the first. This is undocumented, but we'll use it.
7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3625 // However, we never call display methods for classes with more than
7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3626 // one argument.
7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3627
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3628 if (nargin < 1 \|\| nargin > 2)
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3629 print_usage ();
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3630
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3631 std::string name;
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3632
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3633 if (nargin == 2)
23332 7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3634 name = args(1).xstring_value ("NAME must be a string");
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3635 else
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3636 {
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3637 string_vector names = args.name_tags ();
22921 b28801182c08 don't display "ans" for "display (expr)" (bug #49794) John W. Eaton <jwe@octave.org> parents: 22898 diff changeset	3638 name = names(0);
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3639 }
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3640
23332 7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3641 // We are here because there is no overloaded display method for this
7d4ca8c01bbb don't call display methods with more than one argument (bug #50640) John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	3642 // object type.
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3643
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3644 octave_value value = args(0);
22989 698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag. John W. Eaton <jwe@octave.org> parents: 22921 diff changeset	3645
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag. John W. Eaton <jwe@octave.org> parents: 22921 diff changeset	3646 // If print_name_tag displays a newline, then also print one after
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag. John W. Eaton <jwe@octave.org> parents: 22921 diff changeset	3647 // disp is done.
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag. John W. Eaton <jwe@octave.org> parents: 22921 diff changeset	3648
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag. John W. Eaton <jwe@octave.org> parents: 22921 diff changeset	3649 bool print_newlines = false;
22921 b28801182c08 don't display "ans" for "display (expr)" (bug #49794) John W. Eaton <jwe@octave.org> parents: 22898 diff changeset	3650 if (valid_identifier (name))
22989 698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag. John W. Eaton <jwe@octave.org> parents: 22921 diff changeset	3651 print_newlines = value.print_name_tag (octave_stdout, name);
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3652
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3653 // Use feval so that dispatch will also work for disp.
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3654
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23059 diff changeset	3655 octave::feval ("disp", ovl (value));
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3656
22989 698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag. John W. Eaton <jwe@octave.org> parents: 22921 diff changeset	3657 if (print_newlines)
22898 9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3658 octave_stdout << std::endl;
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3659
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3660 return ovl ();
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3661 }
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3662
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3663 /*
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3664 %!test
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3665 %! str = evalc ("x = 1.1; display (x)");
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3666 %! assert (str, "x = 1.1000\n");
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3667
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3668 %!test
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3669 %! str = evalc ("display (1.1)");
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3670 %! assert (str, " 1.1000\n");
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3671
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3672 ## Test input validation
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3673 %!error display ()
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3674 %!error display (1,2)
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3675 */
9baa19102908 refactor display and disp functions (bug #49794) John W. Eaton <jwe@octave.org> parents: 22881 diff changeset	3676
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	3677 static inline void
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3678 init_format_state (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3679 {
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	3680 free_format = false;
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	3681 plus_format = false;
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3682 rat_format = false;
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	3683 bank_format = false;
3608 ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe] jwe parents: 3568 diff changeset	3684 hex_format = 0;
1309 c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe] jwe parents: 1282 diff changeset	3685 bit_format = 0;
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3686 Vcompact_format = false;
2387 be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	3687 print_e = false;
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe] jwe parents: 2317 diff changeset	3688 print_big_e = false;
4509 9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe] jwe parents: 4431 diff changeset	3689 print_g = false;
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3690 print_eng = false;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3691 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3692
24782 0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	3693 static inline std::string format_string ("short");
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	3694
0eb41237424e more templates for pr-output.cc functions John W. Eaton <jwe@octave.org> parents: 24781 diff changeset	3695 static inline void
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3696 set_format_style (int argc, const string_vector& argv)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3697 {
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3698 int idx = 1;
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3699 std::string format;
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3700
1899 2f19333b1e72 [project @ 1996-02-09 17:46:58 by jwe] jwe parents: 1884 diff changeset	3701 if (--argc > 0)
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3702 {
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	3703 std::string arg = argv[idx++];
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3704 format = arg;
2584 5e41d9c42283 [project @ 1996-12-10 09:39:44 by jwe] jwe parents: 2522 diff changeset	3705
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3706 if (arg == "short")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3707 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3708 if (--argc > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3709 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3710 arg = argv[idx++];
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3711 format.append (arg);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3712
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3713 if (arg == "e")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3714 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3715 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3716 print_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3717 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3718 else if (arg == "E")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3719 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3720 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3721 print_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3722 print_big_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3723 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3724 else if (arg == "g")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3725 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3726 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3727 print_g = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3728 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3729 else if (arg == "G")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3730 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3731 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3732 print_g = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3733 print_big_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3734 }
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3735 else if (arg == "eng")
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3736 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3737 init_format_state ();
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3738 print_eng = true;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3739 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3740 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	3741 error ("format: unrecognized option 'short %s'", arg.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3742 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3743 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3744 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3745
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3746 set_output_prec_and_fw (5, 10);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3747 }
18464 917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3748 else if (arg == "shorte")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3749 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3750 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3751 print_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3752 set_output_prec_and_fw (5, 10);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3753 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3754 else if (arg == "shortE")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3755 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3756 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3757 print_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3758 print_big_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3759 set_output_prec_and_fw (5, 10);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3760 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3761 else if (arg == "shortg")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3762 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3763 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3764 print_g = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3765 set_output_prec_and_fw (5, 10);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3766 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3767 else if (arg == "shortG")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3768 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3769 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3770 print_g = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3771 print_big_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3772 set_output_prec_and_fw (5, 10);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3773 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3774 else if (arg == "shortEng")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3775 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3776 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3777 print_eng = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3778 set_output_prec_and_fw (5, 10);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3779 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3780 else if (arg == "long")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3781 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3782 if (--argc > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3783 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3784 arg = argv[idx++];
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3785 format.append (arg);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3786
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3787 if (arg == "e")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3788 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3789 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3790 print_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3791 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3792 else if (arg == "E")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3793 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3794 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3795 print_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3796 print_big_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3797 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3798 else if (arg == "g")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3799 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3800 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3801 print_g = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3802 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3803 else if (arg == "G")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3804 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3805 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3806 print_g = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3807 print_big_e = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3808 }
10741 38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3809 else if (arg == "eng")
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3810 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3811 init_format_state ();
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3812 print_eng = true;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163) David Bateman <dbateman@free.fr> parents: 10706 diff changeset	3813 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3814 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	3815 error ("format: unrecognized option 'long %s'", arg.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3816 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3817 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3818 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3819
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3820 set_output_prec_and_fw (15, 20);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3821 }
18464 917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3822 else if (arg == "longe")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3823 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3824 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3825 print_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3826 set_output_prec_and_fw (15, 20);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3827 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3828 else if (arg == "longE")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3829 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3830 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3831 print_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3832 print_big_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3833 set_output_prec_and_fw (15, 20);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3834 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3835 else if (arg == "longg")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3836 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3837 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3838 print_g = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3839 set_output_prec_and_fw (15, 20);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3840 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3841 else if (arg == "longG")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3842 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3843 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3844 print_g = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3845 print_big_e = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3846 set_output_prec_and_fw (15, 20);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3847 }
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3848 else if (arg == "longEng")
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3849 {
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3850 init_format_state ();
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3851 print_eng = true;
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3852 set_output_prec_and_fw (15, 20);
917f1af7d2e4 Additional format options for matlab compatibility (bug #41541). Markus Bergholz <markuman@gmail.com> parents: 18438 diff changeset	3853 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3854 else if (arg == "hex")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3855 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3856 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3857 hex_format = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3858 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3859 else if (arg == "native-hex")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3860 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3861 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3862 hex_format = 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3863 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3864 else if (arg == "bit")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3865 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3866 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3867 bit_format = 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3868 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3869 else if (arg == "native-bit")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3870 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3871 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3872 bit_format = 2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3873 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3874 else if (arg == "+" \|\| arg == "plus")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3875 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3876 if (--argc > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3877 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3878 arg = argv[idx++];
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3879 format.append (arg);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3880
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3881 if (arg.length () == 3)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3882 plus_format_chars = arg;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3883 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	3884 error ("format: invalid option for plus format");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3885 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3886 else
19232 97eea1e2d9ff pr-output.cc: fix default chars for "format +" for Matlab compatibility Andreas Weber <andy.weber.aw@gmail.com> parents: 18433 diff changeset	3887 plus_format_chars = "+- ";
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3888
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3889 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3890 plus_format = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3891 }
6788 c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman] dbateman parents: 6670 diff changeset	3892 else if (arg == "rat")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3893 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3894 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3895 rat_format = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3896 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3897 else if (arg == "bank")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3898 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3899 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3900 bank_format = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3901 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3902 else if (arg == "free")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3903 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3904 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3905 free_format = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3906 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3907 else if (arg == "none")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3908 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3909 init_format_state ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3910 free_format = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3911 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3912 else if (arg == "compact")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3913 {
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3914 Vcompact_format = true;
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3915 return;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3916 }
1755 3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe] jwe parents: 1742 diff changeset	3917 else if (arg == "loose")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3918 {
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 13102 diff changeset	3919 Vcompact_format = false;
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3920 return;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	3921 }
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3922 else
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	3923 error ("format: unrecognized format state '%s'", arg.c_str ());
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3924 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3925 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3926 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3927 init_format_state ();
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3928 set_output_prec_and_fw (5, 10);
23829 01899bdd2a3a Eliminate unnecessary std::string ("...") constructor calls when "..." suffices. Rik <rik@octave.org> parents: 23807 diff changeset	3929 format = "short";
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3930 }
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3931
28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	3932 format_string = format;
1 78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3933 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe] jwe parents: diff changeset	3934
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3935 DEFUN (format, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3936 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3937 @deftypefn {} {} format
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3938 @deftypefnx {} {} format options
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3939 @deftypefnx {} {[@var{format}, @var{formatspacing}] =} format
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3940 Reset or specify the format of the output produced by @code{disp} and Octave's
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3941 normal echoing mechanism.
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3942
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3943 This command only affects the display of numbers, but not how they are stored
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3944 or computed. To change the internal representation from the default double use
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3945 one of the conversion functions such as @code{single}, @code{uint8},
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3946 @code{int64}, etc.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3947
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3948 By default, Octave displays 5 significant digits in a human readable form
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3949 (option @samp{short} paired with @samp{loose} format for matrices). If
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3950 @code{format} is invoked without any options, this default format is restored.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3951
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3952 Valid formats for floating point numbers are listed in the following
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3953 table.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3954
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3955 @table @code
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3956 @item short
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3957 Fixed point format with 5 significant figures in a field that is a maximum of
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3958 10 characters wide. (default).
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3959
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3960 If Octave is unable to format a matrix so that columns line up on the decimal
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3961 point and all numbers fit within the maximum field width then it switches to an
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3962 exponential @samp{e} format.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3963
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3964 @item long
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3965 Fixed point format with 15 significant figures in a field that is a maximum of
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3966 20 characters wide.
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3967
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3968 As with the @samp{short} format, Octave will switch to an exponential @samp{e}
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3969 format if it is unable to format a matrix properly using the current format.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3970
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3971 @item short e
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3972 @itemx long e
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3973 Exponential format. The number to be represented is split between a mantissa
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3974 and an exponent (power of 10). The mantissa has 5 significant digits in the
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3975 short format and 15 digits in the long format. For example, with the
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3976 @samp{short e} format, @code{pi} is displayed as @code{3.1416e+00}.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3977
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3978 @item short E
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3979 @itemx long E
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3980 Identical to @samp{short e} or @samp{long e} but displays an uppercase @samp{E}
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3981 to indicate the exponent. For example, with the @samp{long E} format,
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3982 @code{pi} is displayed as @code{3.14159265358979E+00}.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3983
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3984 @item short g
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3985 @itemx long g
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3986 Optimally choose between fixed point and exponential format based on the
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	3987 magnitude of the number. For example, with the @samp{short g} format,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3988 @code{pi .^ [2; 4; 8; 16; 32]} is displayed as
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3989
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3990 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3991 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3992 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3993
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3994 9.8696
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3995 97.409
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3996 9488.5
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3997 9.0032e+07
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3998 8.1058e+15
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	3999 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4000 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4001
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4002 @item short eng
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4003 @itemx long eng
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4004 Identical to @samp{short e} or @samp{long e} but displays the value using an
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4005 engineering format, where the exponent is divisible by 3. For example, with
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4006 the @samp{short eng} format, @code{10 * pi} is displayed as @code{31.4159e+00}.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4007
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4008 @item long G
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4009 @itemx short G
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4010 Identical to @samp{short g} or @samp{long g} but displays an uppercase @samp{E}
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4011 to indicate the exponent.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4012
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4013 @item free
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4014 @itemx none
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4015 Print output in free format, without trying to line up columns of matrices on
24771 d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4016 the decimal point. This is a raw format equivalent to the C++ code
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4017 @code{std::cout << @var{variable}}. In general, the result is a presentation
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4018 with 6 significant digits where unnecessary precision (such as trailing zeros
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4019 for integers) is suppressed. Complex numbers are formatted as numeric pairs
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4020 like this @samp{(0.60419, 0.60709)} instead of like this
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4021 @samp{0.60419 + 0.60709i}.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4022 @end table
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4023
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4024 The following formats affect all numeric output (floating point and integer
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4025 types).
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4026
24771 d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4027 @table @asis
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4028 @item @qcode{"+"}
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4029 @itemx @qcode{"+"} @qcode{"@var{chars}"}
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4030 @itemx @code{plus}
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4031 @itemx @code{plus @var{chars}}
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4032 Print a @samp{+} symbol for matrix elements greater than zero, a @samp{-}
24771 d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4033 symbol for elements less than zero, and a space for zero matrix elements. This
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4034 format can be useful for examining the sparsity structure of a large matrix.
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4035 For very large matrices the function @code{spy} which plots the sparsity
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4036 pattern will be clearer.
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4037
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4038 The optional argument @var{chars} specifies a list of 3 characters to use for
24771 d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4039 printing values greater than zero, less than zero, and equal to zero. For
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4040 example, with the format @qcode{"+" "+-."}, the matrix
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4041 @code{[1, 0, -1; -1, 0, 1]} is displayed as
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4042
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4043 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4044 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4045 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4046
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4047 +.-
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4048 -.+
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4049 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4050 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4051
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4052 @item bank
24771 d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4053 Print variable in a format appropriate for a currency (fixed format with two
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4054 digits to the right of the decimal point). Only the real part of a variable is
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169). Rik <rik@octave.org> parents: 24770 diff changeset	4055 displayed, as the imaginary part makes no sense for a currency.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4056
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4057 @item native-hex
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4058 Print the hexadecimal representation of numbers as they are stored in memory.
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4059 For example, on a workstation which stores 8 byte real values in IEEE format
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4060 with the least significant byte first, the value of @code{pi} when printed in
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4061 @code{native-hex} format is @code{400921fb54442d18}.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4062
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4063 @item hex
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4064 The same as @code{native-hex}, but always print the most significant byte
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4065 first.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4066
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4067 @item native-bit
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4068 Print the bit representation of numbers as stored in memory. For example, the
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4069 value of @code{pi} is
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4070
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4071 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4072 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4073 01000000000010010010000111111011
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4074 01010100010001000010110100011000
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4075 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4076 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4077
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4078 (shown here in two 32 bit sections for typesetting purposes) when printed in
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4079 native-bit format on a workstation which stores 8 byte real values in IEEE
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4080 format with the least significant byte first.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4081
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4082 @item bit
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4083 The same as @code{native-bit}, but always print the most significant bits
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4084 first.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4085
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4086 @item rat
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4087 Print a rational approximation, i.e., values are approximated as the ratio of
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4088 small integers. For example, with the @samp{rat} format, @code{pi} is
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4089 displayed as @code{355/113}.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4090 @end table
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4091
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4092 The following two options affect the display of all matrices.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4093
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4094 @table @code
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4095 @item compact
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4096 Remove blank lines around column number labels and between matrices producing
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4097 more compact output with more data per page.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4098
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4099 @item loose
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4100 Insert blank lines above and below column number labels and between matrices to
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4101 produce a more readable output with less data per page. (default).
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4102 @end table
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4103
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4104 If called with one or two output arguments, and no inputs, return the current
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4105 format and format spacing.
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4106
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4107 @seealso{fixed_point_format, output_max_field_width, output_precision, split_long_rows, print_empty_dimensions, rats}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4108 @end deftypefn */)
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 453 diff changeset	4109 {
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4110 octave_value_list retval (std::min (nargout, 2));
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4111
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4112 if (nargout == 0)
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4113 {
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4114 int argc = args.length () + 1;
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4115
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4116 string_vector argv = args.make_argv ("format");
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4117
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4118 set_format_style (argc, argv);
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4119 }
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4120 else
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4121 {
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4122 if (nargout >= 2)
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23433 diff changeset	4123 retval(1) = (Vcompact_format ? "compact" : "loose");
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4124
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4125 retval(0) = format_string;
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4126 }
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4127
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4128 return retval;
529 7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 453 diff changeset	4129 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe] jwe parents: 453 diff changeset	4130
22881 f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4131 /*
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4132 %!test
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4133 %! [old_fmt, old_spacing] = format ();
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4134 %! unwind_protect
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4135 %! ## Test one of the formats
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4136 %! format long;
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4137 %! str = disp (pi);
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4138 %! assert (str, " 3.14159265358979\n");
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4139 %! new_fmt = format ();
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4140 %! assert (new_fmt, "long");
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4141 %! ## Test resetting format
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4142 %! format compact;
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4143 %! [~, new_spacing] = format ();
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4144 %! assert (new_spacing, "compact");
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4145 %! format;
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4146 %! [new_fmt, new_spacing] = format ();
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4147 %! assert (new_fmt, "short");
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4148 %! assert (new_spacing, "loose");
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4149 %! unwind_protect_cleanup
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4150 %! format (old_fmt);
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4151 %! format (old_spacing);
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4152 %! end_unwind_protect
f84aa17075d4 Add Octave-only query mode for format command to find status. Rik <rik@octave.org> parents: 22868 diff changeset	4153 */
18735 28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 18676 diff changeset	4154
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4155 DEFUN (fixed_point_format, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4156 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4157 @deftypefn {} {@var{val} =} fixed_point_format ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4158 @deftypefnx {} {@var{old_val} =} fixed_point_format (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4159 @deftypefnx {} {} fixed_point_format (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4160 Query or set the internal variable that controls whether Octave will
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4161 use a scaled format to print matrix values.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4162
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4163 The scaled format prints a scaling factor on the first line of output chosen
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4164 such that the largest matrix element can be written with a single leading
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4165 digit. For example:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4166
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4167 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4168 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4169 logspace (1, 7, 5)'
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4170 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4171
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4172 1.0e+07 *
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4173
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4174 0.00000
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4175 0.00003
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4176 0.00100
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4177 0.03162
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4178 1.00000
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4179 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4180 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4181
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4182 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4183 Notice that the first value appears to be 0 when it is actually 1. Because
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4184 of the possibility for confusion you should be careful about enabling
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4185 @code{fixed_point_format}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4186
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4187 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4188 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4189 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4190 @seealso{format, output_max_field_width, output_precision}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4191 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4192 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4193 return SET_INTERNAL_VARIABLE (fixed_point_format);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4194 }
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4195
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4196 DEFUN (print_empty_dimensions, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4197 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4198 @deftypefn {} {@var{val} =} print_empty_dimensions ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4199 @deftypefnx {} {@var{old_val} =} print_empty_dimensions (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4200 @deftypefnx {} {} print_empty_dimensions (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4201 Query or set the internal variable that controls whether the dimensions of
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4202 empty matrices are printed along with the empty matrix symbol, @samp{[]}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4203
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4204 For example, the expression
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4205
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4206 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4207 zeros (3, 0)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4208 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4209
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4210 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4211 will print
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4212
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4213 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4214 ans = [](3x0)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4215 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4216
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4217 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4218 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4219 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4220 @seealso{format}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4221 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4222 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4223 return SET_INTERNAL_VARIABLE (print_empty_dimensions);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4224 }
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4225
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4226 DEFUN (split_long_rows, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4227 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4228 @deftypefn {} {@var{val} =} split_long_rows ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4229 @deftypefnx {} {@var{old_val} =} split_long_rows (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4230 @deftypefnx {} {} split_long_rows (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4231 Query or set the internal variable that controls whether rows of a matrix
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4232 may be split when displayed to a terminal window.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4233
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4234 If the rows are split, Octave will display the matrix in a series of smaller
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4235 pieces, each of which can fit within the limits of your terminal width and
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4236 each set of rows is labeled so that you can easily see which columns are
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4237 currently being displayed. For example:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4238
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4239 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4240 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4241 octave:13> rand (2,10)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4242 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4243
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4244 Columns 1 through 6:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4245
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4246 0.75883 0.93290 0.40064 0.43818 0.94958 0.16467
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4247 0.75697 0.51942 0.40031 0.61784 0.92309 0.40201
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4248
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4249 Columns 7 through 10:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4250
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4251 0.90174 0.11854 0.72313 0.73326
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4252 0.44672 0.94303 0.56564 0.82150
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4253 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4254 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4255
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4256 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4257 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4258 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4259 @seealso{format}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	4260 @end deftypefn */)
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4261 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4262 return SET_INTERNAL_VARIABLE (split_long_rows);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5775 diff changeset	4263 }

Mercurial > octave

annotate libinterp/corefcn/pr-output.cc @ 24782:0eb41237424e