annotate libinterp/corefcn/pr-output.cc @ 27918:b442ec6dda5c

use centralized file for copyright info for individual contributors * COPYRIGHT.md: New file. * In most other files, use "Copyright (C) YYYY-YYYY The Octave Project Developers" instead of tracking individual names in separate source files. The motivation is to reduce the effort required to update the notices each year. Until now, the Octave source files contained copyright notices that list individual contributors. I adopted these file-scope copyright notices because that is what everyone was doing 30 years ago in the days before distributed version control systems. But now, with many contributors and modern version control systems, having these file-scope copyright notices causes trouble when we update copyright years or refactor code. Over time, the file-scope copyright notices may become outdated as new contributions are made or code is moved from one file to another. Sometimes people contribute significant patches but do not add a line claiming copyright. Other times, people add a copyright notice for their contribution but then a later refactoring moves part or all of their contribution to another file and the notice is not moved with the code. As a practical matter, moving such notices is difficult -- determining what parts are due to a particular contributor requires a time-consuming search through the project history. Even managing the yearly update of copyright years is problematic. We have some contributors who are no longer living. Should we update the copyright dates for their contributions when we release new versions? Probably not, but we do still want to claim copyright for the project as a whole. To minimize the difficulty of maintaining the copyright notices, I would like to change Octave's sources to use what is described here: https://softwarefreedom.org/resources/2012/ManagingCopyrightInformation.html in the section "Maintaining centralized copyright notices": The centralized notice approach consolidates all copyright notices in a single location, usually a top-level file. This file should contain all of the copyright notices provided project contributors, unless the contribution was clearly insignificant. It may also credit -- without a copyright notice -- anyone who helped with the project but did not contribute code or other copyrighted material. This approach captures less information about contributions within individual files, recognizing that the DVCS is better equipped to record those details. As we mentioned before, it does have one disadvantage as compared to the file-scope approach: if a single file is separated from the distribution, the recipient won't see the contributors' copyright notices. But this can be easily remedied by including a single copyright notice in each file's header, pointing to the top-level file: Copyright YYYY-YYYY The Octave Project Developers See the COPYRIGHT file at the top-level directory of this distribution or at https://octave.org/COPYRIGHT.html. followed by the usual GPL copyright statement. For more background, see the discussion here: https://lists.gnu.org/archive/html/octave-maintainers/2020-01/msg00009.html Most files in the following directories have been skipped intentinally in this changeset: doc libgui/qterminal liboctave/external m4
author John W. Eaton <jwe@octave.org>
date Mon, 06 Jan 2020 15:38:17 -0500
parents 3912e3a74e31
children 1891570abac8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
27918
b442ec6dda5c use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents: 27522
diff changeset
3 Copyright (C) 1993-2019 The Octave Project Developers
b442ec6dda5c use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents: 27522
diff changeset
4
b442ec6dda5c use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents: 27522
diff changeset
5 See the file COPYRIGHT.md in the top-level directory of this distribution
b442ec6dda5c use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents: 27522
diff changeset
6 or <https://octave.org/COPYRIGHT.html/>.
b442ec6dda5c use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents: 27522
diff changeset
7
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
8
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
9 This file is part of Octave.
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
10
24534
194eb4bd202b maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents: 23829
diff changeset
11 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
12 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
13 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
14 (at your option) any later version.
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22407
diff changeset
15
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22407
diff changeset
16 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
17 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22407
diff changeset
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents: 22407
diff changeset
19 GNU General Public License for more details.
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 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
22 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
23 <https://www.gnu.org/licenses/>.
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
24
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
25 */
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
26
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21662
diff changeset
27 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21200
diff changeset
28 # include "config.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
29 #endif
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
30
23662
bd77ab816e43 eliminate obsolete file lo-math.h
John W. Eaton <jwe@octave.org>
parents: 23619
diff changeset
31 #include <cmath>
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
32
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 3373
diff changeset
33 #include <iomanip>
23455
73ff72d3d603 maint: Eliminate <cfloat.h> header from libinterp files
Rik <rik@octave.org>
parents: 23450
diff changeset
34 #include <limits>
73ff72d3d603 maint: Eliminate <cfloat.h> header from libinterp files
Rik <rik@octave.org>
parents: 23450
diff changeset
35 #include <list>
5765
7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe]
jwe
parents: 5759
diff changeset
36 #include <sstream>
1728
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe]
jwe
parents: 1716
diff changeset
37 #include <string>
42b4f904f1af [project @ 1996-01-09 11:36:01 by jwe]
jwe
parents: 1716
diff changeset
38
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
39 #include "Array-util.h"
453
393e95f46b51 [project @ 1994-06-06 00:05:20 by jwe]
jwe
parents: 296
diff changeset
40 #include "CMatrix.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
41 #include "Range.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2915
diff changeset
42 #include "cmd-edit.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1346
diff changeset
43 #include "dMatrix.h"
2891
1a30f46e1870 [project @ 1997-04-28 01:49:00 by jwe]
jwe
parents: 2847
diff changeset
44 #include "lo-mappers.h"
2317
8c09c04f7747 [project @ 1996-07-14 22:30:15 by jwe]
jwe
parents: 2305
diff changeset
45 #include "mach-info.h"
1651
e846e361a265 [project @ 1995-12-20 06:59:12 by jwe]
jwe
parents: 1588
diff changeset
46 #include "oct-cmplx.h"
26111
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084).
Markus Mützel <markus.muetzel@gmx.de>
parents: 26009
diff changeset
47 #include "oct-string.h"
4153
6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe]
jwe
parents: 4051
diff changeset
48 #include "quit.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
49
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
50 #include "Cell.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1346
diff changeset
51 #include "defun.h"
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1346
diff changeset
52 #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
53 #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
54 #include "ovl.h"
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
55 #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
56 #include "octave-preserve-stream-state.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1346
diff changeset
57 #include "pager.h"
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
58 #include "parse.h"
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
59 #include "pr-flt-fmt.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1346
diff changeset
60 #include "pr-output.h"
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
61 #include "sysdep.h"
6803
fe19c6cb5bc6 [project @ 2007-07-26 18:04:05 by jwe]
jwe
parents: 6788
diff changeset
62 #include "unwind-prot.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
63 #include "utils.h"
1352
19c10b8657d5 [project @ 1995-09-05 08:11:57 by jwe]
jwe
parents: 1346
diff changeset
64 #include "variables.h"
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
65
15466
d174210ce1ec use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents: 14138
diff changeset
66 // 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
67 // 'format short'.
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
68 static bool Vfixed_point_format = false;
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
69
5360
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe]
jwe
parents: 5331
diff changeset
70 // 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
71 // like this: x = [](2x0).
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
72 bool Vprint_empty_dimensions = true;
2165
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe]
jwe
parents: 2086
diff changeset
73
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe]
jwe
parents: 2086
diff changeset
74 // 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
75 // smaller slices that fit on the screen.
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
76 static bool Vsplit_long_rows = true;
2165
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe]
jwe
parents: 2086
diff changeset
77
3018
5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe]
jwe
parents: 3014
diff changeset
78 // TRUE means don't do any fancy formatting.
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
79 static bool free_format = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
80
3018
5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe]
jwe
parents: 3014
diff changeset
81 // 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
82 static bool plus_format = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
83
4632
0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe]
jwe
parents: 4574
diff changeset
84 // 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
85 static std::string plus_format_chars = "+- ";
4632
0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe]
jwe
parents: 4574
diff changeset
86
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
87 // TRUE means always print in a rational approximation
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
88 static bool rat_format = false;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
89
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
90 // 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
91 static int rat_string_len = -1;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
92
3018
5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe]
jwe
parents: 3014
diff changeset
93 // TRUE means always print like dollars and cents.
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
94 static bool bank_format = false;
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
95
3018
5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe]
jwe
parents: 3014
diff changeset
96 // TRUE means print data in hexadecimal format.
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
97 static int hex_format = 0;
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
98
3018
5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe]
jwe
parents: 3014
diff changeset
99 // 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
100 static int bit_format = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
101
3018
5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe]
jwe
parents: 3014
diff changeset
102 // 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
103 bool Vcompact_format = false;
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
104
3018
5708b8bb4f06 [project @ 1997-06-03 21:48:05 by jwe]
jwe
parents: 3014
diff changeset
105 // TRUE means use an e format.
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
106 static bool print_e = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
107
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
108 // TRUE means use a g format.
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
109 static bool print_g = false;
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
110
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
111 // TRUE means print uppercase E in exponent field and A-F in hex format.
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
112 static bool uppercase_format = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
113
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
114 // 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
115 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
116
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
117 static int
10771
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
118 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
119 {
10771
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
120 if (! print_eng)
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
121 return x;
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
122 else
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
123 return x - 3*static_cast<int> (x/3);
20946
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
124
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
125 // The expression above is equivalent to x - (x % 3).
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
126
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
127 // 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
128 // 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
129 // 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
130 // to avoid portability issues, we re-implement the modulo function to
27454
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
131 // the desired behavior (truncation). There may be a gnulib replacement.
20946
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
132
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
133 // 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
134 // 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
135 // 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
136 // 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
137 // 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
138 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
139
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
140 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
141 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
142 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
143 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
144 int ex = 0;
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
145
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
146 if (x != 0)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
147 {
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
148 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
149 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
150
20946
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
151 // Avoid using modulo function with negative arguments for
6eff66fb8a02 style fixes for comments
John W. Eaton <jwe@octave.org>
parents: 20941
diff changeset
152 // 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
153
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
154 if (logabsval < 0)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
155 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
156 else
10771
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
157 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
158 }
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
159
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
160 return ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
161 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
162
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
163 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
164 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
165 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
166 {
11450
5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script
John W. Eaton <jwe@octave.org>
parents: 10987
diff changeset
167 return 1 + (print_eng
5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script
John W. Eaton <jwe@octave.org>
parents: 10987
diff changeset
168 ? engineering_exponent (x)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21782
diff changeset
169 : 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
170 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
171
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
172 template <typename T>
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
173 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
174 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
175 {
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
176 return engineering_exponent (m_val);
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
177 }
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
178
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
179 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
180 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
181 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
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 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
184 }
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
185
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
186 template <typename T>
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
187 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
188 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
189 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
190 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
191
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
192 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
193
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
194 if (real_fmt.width () >= 0)
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
195 os << std::setw (real_fmt.width () - real_fmt.exponent_width ());
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
196
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
197 if (real_fmt.precision () >= 0)
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
198 os << std::setprecision (real_fmt.precision ());
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
199
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
200 os.flags (real_fmt.format_flags ());
10771
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 os << pef.mantissa ();
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
203
82d9efde7e96 pr-output.cc: Avoid use of % operator on negative operands
Rik <octave@nomad.inbox5.com>
parents: 10741
diff changeset
204 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
205 if (ex < 0)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
206 {
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
207 if (uppercase_format)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
208 os << std::setw (0) << "E-";
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
209 else
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
210 os << std::setw (0) << "e-";
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
211 ex = -ex;
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 else
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
214 {
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
215 if (uppercase_format)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
216 os << std::setw (0) << "E+";
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
217 else
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
218 os << std::setw (0) << "e+";
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
219 }
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
220
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
221 os << std::setw (real_fmt.exponent_width () - 2)
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
222 << 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
223
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
224 return os;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
225 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
226
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
227 template <typename T>
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
228 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
229 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
230 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
231 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
232
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
233 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
234
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
235 if (real_fmt.width () >= 0)
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
236 os << std::setw (real_fmt.width ());
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
237
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
238 if (real_fmt.precision () >= 0)
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
239 os << std::setprecision (real_fmt.precision ());
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
240
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
241 os.flags (real_fmt.format_flags ());
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
242
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
243 os << pff.m_val;
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
244
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
245 return os;
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
246 }
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
247
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
248 template <typename T>
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
249 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
250 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
251 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
252 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
253
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
254 float_format real_fmt = prf.m_ff;
27473
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
255 bool have_neg_sign = prf.m_val < 0;
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
256
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
257 int fw = (rat_string_len > 0 ? rat_string_len : real_fmt.width ());
27473
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
258 std::string s;
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
259
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
260 if (have_neg_sign)
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
261 s = rational_approx (prf.m_val, fw);
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
262 else
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
263 s = rational_approx (prf.m_val, fw-1);
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
264
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
265 if (fw >= 0)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
266 os << std::setw (fw);
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
267
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
268 os.flags (real_fmt.format_flags ());
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
269
27473
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
270 if (s == "0")
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
271 s = '*';
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
272 else if (fw > 0)
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
273 {
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
274 if (s.find ('/') != std::string::npos)
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
275 {
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
276 if (s.length () > (static_cast<unsigned int> (fw)))
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
277 s = '*';
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
278 }
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
279 else
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
280 {
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
281 if (have_neg_sign)
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
282 {
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
283 if (s.length () > (static_cast<unsigned int> (fw) - 2))
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
284 s = '*';
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
285 }
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
286 else
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
287 {
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
288 if (s.length () > (static_cast<unsigned int> (fw) - 3))
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
289 s = '*';
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
290 }
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
291 }
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
292 }
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
293
d503426130bf Display '*' rather than '0' for small rational approximations (bug #56941)
Rik <rik@octave.org>
parents: 27466
diff changeset
294 os << s;
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
295
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
296 return os;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
297 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
298
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
299 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
300 static inline T
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
301 pr_max_internal (const MArray<T>& m)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
302 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
303 // We expect a 2-d array.
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
304 assert (m.ndims () == 2);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
305
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
306 octave_idx_type nr = m.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
307 octave_idx_type nc = m.columns ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
308
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
309 T result = std::numeric_limits<T>::lowest ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
310
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
311 bool all_inf_or_nan = true;
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
312
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
313 for (octave_idx_type j = 0; j < nc; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
314 for (octave_idx_type i = 0; i < nr; i++)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
315 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
316 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
317 if (! octave::math::isfinite (val))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
318 continue;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
319
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
320 all_inf_or_nan = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
321
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
322 if (val > result)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
323 result = val;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
324 }
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
325
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
326 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
327 result = 0;
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
328
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
329 return result;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
330 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
331
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
332 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
333 static inline T
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
334 pr_min_internal (const MArray<T>& m)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
335 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
336 octave_idx_type nr = m.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
337 octave_idx_type nc = m.columns ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
338
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
339 T result = std::numeric_limits<T>::max ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
340
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
341 bool all_inf_or_nan = true;
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
342
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
343 for (octave_idx_type j = 0; j < nc; j++)
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
344 for (octave_idx_type i = 0; i < nr; i++)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
345 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
346 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
347 if (! octave::math::isfinite (val))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
348 continue;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
349
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
350 all_inf_or_nan = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
351
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
352 if (val < result)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
353 result = val;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
354 }
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
355
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
356 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
357 result = 0;
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
358
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
359 return result;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
360 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
361
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
362 template <typename>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
363 struct pr_output_traits
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
364 {
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
365 static const int digits10;
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
366 static const int max_field_width;
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
367 };
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
368
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
369 template <>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
370 struct pr_output_traits<double>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
371 {
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
372 static const int digits10;
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
373 static const int max_field_width;
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
374 };
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
375
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
376 const int pr_output_traits<double>::digits10 = 16;
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
377 const int pr_output_traits<double>::max_field_width = 21;
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
378
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
379 template <>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
380 struct pr_output_traits<float>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
381 {
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
382 static const int digits10;
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
383 static const int max_field_width;
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
384 };
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
385
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
386 const int pr_output_traits<float>::digits10 = 8;
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
387 const int pr_output_traits<float>::max_field_width = 13;
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
388
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
389 // 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
390
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
391 // Works for double and float.
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
392
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
393 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
394 static inline float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
395 make_real_format (int digits, bool inf_or_nan, bool int_only)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
396 {
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
397 float_format fmt;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
398
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
399 int prec = std::min (output_precision (), pr_output_traits<T>::digits10);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
400
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
401 int fw = 0, ld = 0, rd = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
402
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
403 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
404 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
405 fw = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
406 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
407 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
408 else if (bank_format)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
409 {
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
410 fw = (digits < 0 ? 4 : digits + 3);
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
411 if (inf_or_nan)
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
412 fw = 3;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
413 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
414 }
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
415 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
416 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
417 fw = 2 * sizeof (T);
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
418 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
419 }
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
420 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
421 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
422 fw = 8 * sizeof (T);
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
423 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
424 }
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
425 else if (inf_or_nan)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
426 {
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
427 fw = 3;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
428 }
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
429 else if (int_only)
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
430 {
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
431 fw = digits;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
432 ld = digits;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
433 rd = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
434 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
435 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
436 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
437 if (digits > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
438 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
439 ld = digits;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
440 rd = (prec > digits ? prec - digits : prec);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
441 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
442 else if (digits < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
443 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
444 ld = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
445 rd = (prec > digits ? prec - digits : prec);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
446 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
447 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
448 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
449 ld = 1;
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
450 rd = (prec > digits ? prec - 1 : prec);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
451 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
452
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
453 fw = ld + 1 + rd;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
454 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
455
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
456 if (! (rat_format || bank_format || hex_format || bit_format)
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
457 && (print_e || print_g || print_eng
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
458 || ld + rd > pr_output_traits<T>::digits10
27466
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
459 || fw > pr_output_traits<T>::max_field_width
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
460 || ld + rd > (1.5 * prec)))
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
461 {
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
462 if (print_g)
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
463 fmt = float_format (prec, prec);
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
464 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
465 {
16339
0c340bf413d7 allow exponent in output to always have 3 digits
John W. Eaton <jwe@octave.org>
parents: 16169
diff changeset
466 // e+ddd
0c340bf413d7 allow exponent in output to always have 3 digits
John W. Eaton <jwe@octave.org>
parents: 16169
diff changeset
467 int ex = 5;
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
468
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
469 if (print_eng)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
470 {
16339
0c340bf413d7 allow exponent in output to always have 3 digits
John W. Eaton <jwe@octave.org>
parents: 16169
diff changeset
471 // -ddd.
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
472 fw = 1 + prec + ex;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
473 if (inf_or_nan)
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
474 {
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
475 fw = 3;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
476 ex = 0;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
477 }
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
478 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
479 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
480 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
481 {
16339
0c340bf413d7 allow exponent in output to always have 3 digits
John W. Eaton <jwe@octave.org>
parents: 16169
diff changeset
482 // -d.
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
483 fw = prec + ex;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
484 if (inf_or_nan)
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
485 {
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
486 fw = 3;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
487 ex = 0;
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
488 }
16339
0c340bf413d7 allow exponent in output to always have 3 digits
John W. Eaton <jwe@octave.org>
parents: 16169
diff changeset
489 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
490 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
491 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
492 }
5086
55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe]
jwe
parents: 5030
diff changeset
493 else if (! bank_format && (inf_or_nan || int_only))
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
494 fmt = float_format (fw, ld);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
495 else
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
496 fmt = float_format (fw, rd, std::ios::fixed);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
497
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
498 if (uppercase_format)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
499 fmt.uppercase ();
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
500
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
501 return float_display_format (fmt);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
502 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
503
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
504 // Works for double and float.
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
505
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
506 template <typename T>
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
507 float_display_format
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
508 make_scalar_format (const T& val)
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
509 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
510 if (free_format)
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
511 return float_display_format ();
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
512
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
513 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
514
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
515 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
516
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
517 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
518
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
519 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
520
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
521 return make_real_format<T> (digits, inf_or_nan, int_only);
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
522 }
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
523
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
524 template <>
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
525 float_display_format
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
526 make_format (const double& d)
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
527 {
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
528 return make_scalar_format (d);
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
529 }
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
530
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
531 template <>
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
532 float_display_format
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
533 make_format (const float& f)
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
534 {
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
535 return make_scalar_format (f);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
536 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
537
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
538 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
539 static inline float_display_format
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
540 make_real_matrix_format (int x_max, int x_min, bool inf_or_nan,
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
541 int int_or_inf_or_nan)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
542 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
543 T scale = ((x_max == 0 || int_or_inf_or_nan)
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
544 ? 1 : std::pow (10.0, calc_scale_exp (x_max - 1)));
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
545
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
546 float_format fmt;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
547
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
548 int prec = std::min (output_precision (), pr_output_traits<T>::digits10);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
549
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
550 int fw = 0, ld = 0, rd = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
551
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
552 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
553 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
554 fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
555 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
556 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
557 else if (bank_format)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
558 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
559 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
560 fw = (digits <= 0 ? 5 : digits + 4);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
561 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
562 }
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
563 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
564 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
565 fw = 2 * sizeof (T);
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
566 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
567 }
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
568 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
569 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
570 fw = 8 * sizeof (T);
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
571 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
572 }
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
573 else if (Vfixed_point_format && ! print_g)
3268
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe]
jwe
parents: 3258
diff changeset
574 {
27453
05f84e5cb08a Display correct number of digits with "format long" and fixed_point_format (bug #56938).
Rik <rik@octave.org>
parents: 27451
diff changeset
575 rd = prec - 1;
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
576 fw = rd + 3;
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
577 if (inf_or_nan && fw < 4)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
578 fw = 4;
3268
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe]
jwe
parents: 3258
diff changeset
579 }
1715
6f4631c7118c [project @ 1996-01-08 07:57:04 by jwe]
jwe
parents: 1658
diff changeset
580 else if (int_or_inf_or_nan)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
581 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
582 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
583 fw = (digits <= 0 ? 2 : digits + 1);
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
584 if (inf_or_nan && fw < 4)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
585 fw = 4;
3682
19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe]
jwe
parents: 3611
diff changeset
586 rd = fw;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
587 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
588 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
589 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
590 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
591 if (x_max > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
592 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
593 ld_max = x_max;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
594 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
595 x_max++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
596 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
597 else if (x_max < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
598 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
599 ld_max = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
600 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
601 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
602 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
603 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
604 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
605 ld_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
606 rd_max = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
607 x_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
608 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
609
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
610 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
611 if (x_min > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
612 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
613 ld_min = x_min;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
614 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
615 x_min++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
616 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
617 else if (x_min < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
618 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
619 ld_min = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
620 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
621 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
622 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
623 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
624 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
625 ld_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
626 rd_min = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
627 x_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
628 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
629
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
630 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
631 rd = (rd_max > rd_min ? rd_max : rd_min);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
632
5832
5e41e06f6a78 [project @ 2006-05-26 21:41:32 by jwe]
jwe
parents: 5823
diff changeset
633 fw = 1 + ld + 1 + rd;
5748
8510034588a7 [project @ 2006-04-07 07:51:59 by jwe]
jwe
parents: 5642
diff changeset
634 if (inf_or_nan && fw < 4)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
635 fw = 4;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
636 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
637
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
638 if (! (rat_format || bank_format || hex_format || bit_format)
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
639 && (print_e || print_eng || print_g
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
640 || (! Vfixed_point_format
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
641 && (ld + rd > pr_output_traits<T>::digits10
27466
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
642 || fw > pr_output_traits<T>::max_field_width
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
643 || ld + rd > (1.5 * prec)))))
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
644 {
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
645 if (print_g)
27439
251056aeba5d Align negative numbers correctly with g format (bug #56940).
Rik <rik@octave.org>
parents: 27434
diff changeset
646 fmt = float_format (prec+6, prec);
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
647 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
648 {
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
649 int ex = 4;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
650 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
651 ex++;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
652
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
653 if (print_eng)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
654 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
655 fw = 4 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
656 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
657 fw = 6;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
658 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
659 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
660 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
661 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
662 fw = 2 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
663 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
664 fw = 4;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
665 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
666 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
667 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
668 }
5086
55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe]
jwe
parents: 5030
diff changeset
669 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
670 fmt = float_format (fw, rd);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
671 else
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
672 fmt = float_format (fw, rd, std::ios::fixed);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
673
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
674 if (uppercase_format)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
675 fmt.uppercase ();
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
676
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
677 return float_display_format (scale, fmt);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
678 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
679
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
680 template <typename MT>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
681 static inline float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
682 make_matrix_format (const MT& m)
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
683 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
684 assert (m.ndims () == 2);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
685
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
686 if (free_format)
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
687 return float_display_format ();
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
688
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
689 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
690
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
691 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
692
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
693 MT m_abs = m.abs ();
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
694
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
695 typedef typename MT::element_type ELT_T;
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
696
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
697 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
698 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
699
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
700 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
701
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24769
diff changeset
702 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
703
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
704 return make_real_matrix_format<ELT_T> (x_max, x_min, inf_or_nan,
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
705 int_or_inf_or_nan);
24782
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
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
708 template <>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
709 float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
710 make_format (const Matrix& m)
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
711 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
712 return make_matrix_format (m);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
713 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
714
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
715 template <>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
716 float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
717 make_format (const FloatMatrix& m)
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
718 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
719 return make_matrix_format (m);
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
720 }
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
721
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
722 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
723 static inline float_display_format
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
724 make_complex_format (int x_max, int x_min, int r_x,
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
725 bool inf_or_nan, int int_only)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
726 {
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
727 float_format r_fmt;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
728 float_format i_fmt;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
729
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
730 int prec = std::min (output_precision (), pr_output_traits<T>::digits10);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
731
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
732 int i_fw = 0, r_fw = 0, ld = 0, rd = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
733
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
734 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
735 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
736 i_fw = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
737 r_fw = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
738 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
739 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
740 else if (bank_format)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
741 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
742 int digits = r_x;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
743 i_fw = 0;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
744 r_fw = (digits <= 0 ? 5 : digits + 4);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
745 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
746 }
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
747 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
748 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
749 r_fw = 2 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
750 i_fw = 2 * sizeof (T);
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
751 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
752 }
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
753 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
754 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
755 r_fw = 8 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
756 i_fw = 8 * sizeof (T);
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
757 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
758 }
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
759 else if (inf_or_nan || int_only)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
760 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
761 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
762 i_fw = (digits <= 0 ? 1 : digits);
5945
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
763 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
764 if (inf_or_nan && i_fw < 3)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
765 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
766 i_fw = 3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
767 r_fw = 4;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
768 }
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
769
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
770 if (int_only)
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
771 {
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
772 ld = digits;
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
773 rd = 0;
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
774 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
775 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
776 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
777 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
778 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
779 if (x_max > 0)
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 = x_max;
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++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
784 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
785 else if (x_max < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
786 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
787 ld_max = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
788 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
789 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
790 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
791 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
792 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
793 ld_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
794 rd_max = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
795 x_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
796 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
797
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
798 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
799 if (x_min > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
800 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
801 ld_min = x_min;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
802 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
803 x_min++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
804 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
805 else if (x_min < 0)
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 ld_min = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
808 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
809 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
810 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
811 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
812 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
813 ld_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
814 rd_min = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
815 x_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
816 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
817
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
818 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
819 rd = (rd_max > rd_min ? rd_max : rd_min);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
820
5945
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
821 i_fw = ld + 1 + rd;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
822 r_fw = i_fw + 1;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
823 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
824
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
825 if (! (rat_format || bank_format || hex_format || bit_format)
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
826 && (print_e || print_eng || print_g
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
827 || ld + rd > pr_output_traits<T>::digits10
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
828 || r_fw > pr_output_traits<T>::max_field_width
27466
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
829 || i_fw > pr_output_traits<T>::max_field_width
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
830 || ld + rd > (1.5 * prec)))
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
831 {
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
832 if (print_g)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
833 {
27439
251056aeba5d Align negative numbers correctly with g format (bug #56940).
Rik <rik@octave.org>
parents: 27434
diff changeset
834 int width = prec + 6;
27429
e0134184c1fd Fix regression with display of "format g" (bug #55919).
Rik <rik@octave.org>
parents: 27277
diff changeset
835 r_fmt = float_format (width, prec);
e0134184c1fd Fix regression with display of "format g" (bug #55919).
Rik <rik@octave.org>
parents: 27277
diff changeset
836 i_fmt = float_format (width, prec);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
837 }
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
838 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
839 {
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
840 int ex = 4;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
841 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
842 ex++;
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 if (print_eng)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
845 {
21568
3d60ed163b70 maint: Eliminate bad spacing around '='.
Rik <rik@octave.org>
parents: 21547
diff changeset
846 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
847 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
848 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
849 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
850 i_fw = 5;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
851 r_fw = 6;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
852 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
853 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
854 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
855 }
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
856 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
857 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
858 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
859 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
860 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
861 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
862 i_fw = 3;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
863 r_fw = 4;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
864 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
865 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
866 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
867 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
868 }
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
869
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
870 if (uppercase_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
871 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
872 r_fmt.uppercase ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
873 i_fmt.uppercase ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
874 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
875 }
5086
55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe]
jwe
parents: 5030
diff changeset
876 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
877 {
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
878 r_fmt = float_format (r_fw, ld);
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
879 i_fmt = float_format (i_fw, ld);
3611
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe]
jwe
parents: 3608
diff changeset
880 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
881 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
882 {
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
883 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
884 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
885 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
886
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
887 return float_display_format (r_fmt, i_fmt);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
888 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
889
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
890 template <typename T>
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
891 float_display_format
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
892 make_complex_scalar_format (const std::complex<T>& c)
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
893 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
894 if (free_format)
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
895 return float_display_format ();
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
896
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
897 T rp = c.real ();
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
898 T ip = c.imag ();
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
899
21782
2aef506f3fec use namespace for lo-mappers.h functions
John W. Eaton <jwe@octave.org>
parents: 21751
diff changeset
900 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
901
22407
34ce5be04942 maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents: 22323
diff changeset
902 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
903 && octave::math::x_nint (ip) == ip);
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
904
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
905 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
906 T i_abs = (ip < 0 ? -ip : ip);
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
907
23564
7049da1648c0 Deprecate octave::math::finite in favor of octave::math::isfinite.
Rik <rik@octave.org>
parents: 23534
diff changeset
908 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
909 || 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
910
23564
7049da1648c0 Deprecate octave::math::finite in favor of octave::math::isfinite.
Rik <rik@octave.org>
parents: 23534
diff changeset
911 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
912 || i_abs == 0) ? 0 : num_digits (i_abs);
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
913
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
914 int x_max, x_min;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
915
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
916 if (r_x > i_x)
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
917 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
918 x_max = r_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
919 x_min = i_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
920 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
921 else
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
922 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
923 x_max = i_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
924 x_min = r_x;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
925 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
926
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
927 return make_complex_format<T> (x_max, x_min, r_x, inf_or_nan, int_only);
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
928 }
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
929
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
930 template <>
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
931 float_display_format
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
932 make_format (const std::complex<double>& c)
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
933 {
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
934 return make_complex_scalar_format (c);
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
935 }
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
936
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
937 template <>
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
938 float_display_format
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
939 make_format (const std::complex<float>& fc)
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
940 {
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
941 return make_complex_scalar_format (fc);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
942 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
943
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
944 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
945 static inline float_display_format
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
946 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
947 int r_x_min, bool inf_or_nan,
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
948 int int_or_inf_or_nan)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
949 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
950 T scale = ((x_max == 0 || int_or_inf_or_nan)
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
951 ? 1 : std::pow (10.0, calc_scale_exp (x_max - 1)));
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
952
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
953 float_format r_fmt;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
954 float_format i_fmt;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
955
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
956 int prec = std::min (output_precision (), pr_output_traits<T>::digits10);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
957
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
958 int i_fw = 0, r_fw = 0, ld = 0, rd = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
959
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
960 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
961 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
962 i_fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
963 r_fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
964 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
965 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
966 else if (bank_format)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
967 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
968 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
969 i_fw = 0;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
970 r_fw = (digits <= 0 ? 5 : digits + 4);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
971 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
972 }
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
973 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
974 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
975 r_fw = 2 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
976 i_fw = 2 * sizeof (T);
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
977 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
978 }
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
979 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
980 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
981 r_fw = 8 * sizeof (T);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
982 i_fw = 8 * sizeof (T);
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
983 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
984 }
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
985 else if (Vfixed_point_format && ! print_g)
3268
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe]
jwe
parents: 3258
diff changeset
986 {
27453
05f84e5cb08a Display correct number of digits with "format long" and fixed_point_format (bug #56938).
Rik <rik@octave.org>
parents: 27451
diff changeset
987 rd = prec - 1;
5945
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
988 i_fw = rd + 1;
27453
05f84e5cb08a Display correct number of digits with "format long" and fixed_point_format (bug #56938).
Rik <rik@octave.org>
parents: 27451
diff changeset
989 r_fw = i_fw + 2;
5945
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
990 if (inf_or_nan && i_fw < 3)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
991 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
992 i_fw = 3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
993 r_fw = 4;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
994 }
3268
fdc7dd08cd85 [project @ 1999-09-10 05:16:49 by jwe]
jwe
parents: 3258
diff changeset
995 }
1715
6f4631c7118c [project @ 1996-01-08 07:57:04 by jwe]
jwe
parents: 1658
diff changeset
996 else if (int_or_inf_or_nan)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
997 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
998 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
999 i_fw = (digits <= 0 ? 1 : digits);
5945
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
1000 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
1001 if (inf_or_nan && i_fw < 3)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1002 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1003 i_fw = 3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1004 r_fw = 4;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1005 }
3682
19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe]
jwe
parents: 3611
diff changeset
1006 rd = r_fw;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1007 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1008 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1009 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1010 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1011 if (x_max > 0)
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 ld_max = x_max;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1014 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
1015 x_max++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1016 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1017 else if (x_max < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1018 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1019 ld_max = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1020 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
1021 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1022 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1023 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1024 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1025 ld_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1026 rd_max = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1027 x_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1028 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1029
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1030 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1031 if (x_min > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1032 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1033 ld_min = x_min;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1034 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
1035 x_min++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1036 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1037 else if (x_min < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1038 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1039 ld_min = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1040 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
1041 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1042 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1043 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1044 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1045 ld_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1046 rd_min = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1047 x_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1048 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1049
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1050 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
1051 rd = (rd_max > rd_min ? rd_max : rd_min);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1052
5945
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
1053 i_fw = ld + 1 + rd;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
1054 r_fw = i_fw + 1;
76cfea89e4e7 [project @ 2006-08-18 22:19:24 by jwe]
jwe
parents: 5832
diff changeset
1055 if (inf_or_nan && i_fw < 3)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1056 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1057 i_fw = 3;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1058 r_fw = 4;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1059 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1060 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1061
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1062 if (! (rat_format || bank_format || hex_format || bit_format)
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
1063 && (print_e || print_eng || print_g
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
1064 || (! Vfixed_point_format
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
1065 && (ld + rd > pr_output_traits<T>::digits10
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
1066 || r_fw > pr_output_traits<T>::max_field_width
27466
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
1067 || i_fw > pr_output_traits<T>::max_field_width
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
1068 || ld + rd > (1.5 * prec)))))
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1069 {
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
1070 if (print_g)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1071 {
27439
251056aeba5d Align negative numbers correctly with g format (bug #56940).
Rik <rik@octave.org>
parents: 27434
diff changeset
1072 int width = prec + 6;
27429
e0134184c1fd Fix regression with display of "format g" (bug #55919).
Rik <rik@octave.org>
parents: 27277
diff changeset
1073 r_fmt = float_format (width, prec);
e0134184c1fd Fix regression with display of "format g" (bug #55919).
Rik <rik@octave.org>
parents: 27277
diff changeset
1074 i_fmt = float_format (width, prec);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1075 }
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
1076 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1077 {
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1078 int ex = 4;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1079 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
1080 ex++;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1081
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1082 if (print_eng)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1083 {
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1084 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
1085 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
1086 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
1087 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1088 i_fw = 5;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1089 r_fw = 6;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1090 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1091 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
1092 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
1093 }
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1094 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1095 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1096 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
1097 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
1098 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
1099 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1100 i_fw = 3;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1101 r_fw = 4;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1102 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1103 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
1104 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
1105 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1106 }
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
1107
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1108 if (uppercase_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1109 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1110 r_fmt.uppercase ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1111 i_fmt.uppercase ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1112 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1113 }
5086
55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe]
jwe
parents: 5030
diff changeset
1114 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
1115 {
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe]
jwe
parents: 3608
diff changeset
1116 r_fmt = float_format (r_fw, rd);
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe]
jwe
parents: 3608
diff changeset
1117 i_fmt = float_format (i_fw, rd);
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe]
jwe
parents: 3608
diff changeset
1118 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1119 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1120 {
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
1121 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
1122 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
1123 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1124
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1125 return float_display_format (scale, r_fmt, i_fmt);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1126 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1127
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1128 template <typename CMT>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1129 static inline float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1130 make_complex_matrix_format (const CMT& cm)
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1131 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1132 if (free_format)
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1133 return float_display_format ();
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1134
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1135 typedef typename CMT::real_matrix_type RMT;
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1136 typedef typename CMT::real_elt_type ELT_T;
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1137
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1138 RMT rp = real (cm);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1139 RMT ip = imag (cm);
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1140
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
1141 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
1142
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
1143 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
1144 && 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
1145
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1146 RMT r_m_abs = rp.abs ();
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1147 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
1148 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
1149
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1150 RMT i_m_abs = ip.abs ();
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1151 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
1152 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
1153
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
1154 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
1155
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24769
diff changeset
1156 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
1157
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24769
diff changeset
1158 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
1159
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24769
diff changeset
1160 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
1161
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1162 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
1163 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
1164
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1165 return make_complex_matrix_format<ELT_T> (x_max, x_min, r_x_max, r_x_min,
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1166 inf_or_nan, int_or_inf_or_nan);
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1167 }
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1168
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1169 template <>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1170 float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1171 make_format (const ComplexMatrix& cm)
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1172 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1173 return make_complex_matrix_format (cm);
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1174 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1175
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1176 template <>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1177 float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1178 make_format (const FloatComplexMatrix& cm)
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1179 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1180 return make_complex_matrix_format (cm);
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1181 }
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1182
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1183 template <>
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1184 float_display_format
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1185 make_format (const boolNDArray&)
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1186 {
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1187 return float_display_format (float_format (1, 1));
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1188 }
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1189
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1190 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1191 static inline float_display_format
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1192 make_range_format (int x_max, int x_min, int all_ints)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1193 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1194 double scale = ((x_max == 0 || all_ints)
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1195 ? 1 : std::pow (10.0, calc_scale_exp (x_max - 1)));
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1196
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1197 float_format fmt;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1198
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
1199 int prec = std::min (output_precision (), pr_output_traits<T>::digits10);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1200
24789
a4d4ec566fd7 improve formatting of large values in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24788
diff changeset
1201 int fw = 0, ld = 0, rd = 0;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1202
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1203 if (rat_format)
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1204 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1205 fw = 9;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1206 rd = 0;
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1207 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1208 else if (bank_format)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1209 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1210 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
1211 fw = (digits < 0 ? 5 : digits + 4);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1212 rd = 2;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1213 }
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1214 else if (hex_format)
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1215 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1216 fw = 2 * sizeof (T);
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1217 rd = 0;
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1218 }
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1219 else if (bit_format)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1220 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1221 fw = 8 * sizeof (T);
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1222 rd = 0;
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1223 }
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1224 else if (all_ints)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1225 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1226 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
1227 fw = digits + 1;
3682
19e1ac7359fb [project @ 2000-06-27 03:23:10 by jwe]
jwe
parents: 3611
diff changeset
1228 rd = fw;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1229 }
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
1230 else if (Vfixed_point_format && ! print_g)
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1231 {
27453
05f84e5cb08a Display correct number of digits with "format long" and fixed_point_format (bug #56938).
Rik <rik@octave.org>
parents: 27451
diff changeset
1232 rd = prec - 1;
7465
8d6ab12f8fda format Range output more like N-d arrays
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
1233 fw = rd + 3;
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1234 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1235 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1236 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1237 int ld_max, rd_max;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1238 if (x_max > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1239 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1240 ld_max = x_max;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1241 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
1242 x_max++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1243 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1244 else if (x_max < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1245 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1246 ld_max = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1247 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
1248 x_max = -x_max + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1249 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1250 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1251 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1252 ld_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1253 rd_max = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1254 x_max = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1255 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1256
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1257 int ld_min, rd_min;
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1258 if (x_min > 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1259 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1260 ld_min = x_min;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1261 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
1262 x_min++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1263 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1264 else if (x_min < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1265 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1266 ld_min = 1;
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1267 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
1268 x_min = -x_min + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1269 }
27451
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1270 else
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1271 {
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1272 ld_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1273 rd_min = (prec > 1 ? prec - 1 : prec);
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1274 x_min = 1;
ce0399fa017a Display only 5 significant digits for "format short" at all times (bug #56936).
Rik <rik@octave.org>
parents: 27439
diff changeset
1275 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1276
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1277 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
1278 rd = (rd_max > rd_min ? rd_max : rd_min);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1279
7465
8d6ab12f8fda format Range output more like N-d arrays
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
1280 fw = ld + rd + 3;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1281 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1282
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
1283 if (! (rat_format || bank_format || hex_format || bit_format)
24785
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
1284 && (print_e || print_eng || print_g
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
1285 || (! Vfixed_point_format
504869574c89 restore auto switch to E formats octave_print_internal functions
John W. Eaton <jwe@octave.org>
parents: 24784
diff changeset
1286 && (ld + rd > pr_output_traits<T>::digits10
27466
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
1287 || fw > pr_output_traits<T>::max_field_width
6e8dac65d405 Switch to scientific notation for format short when values are large or small (bug #56971).
Rik <rik@octave.org>
parents: 27459
diff changeset
1288 || ld + rd > (1.5 * prec)))))
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1289 {
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
1290 if (print_g)
27439
251056aeba5d Align negative numbers correctly with g format (bug #56940).
Rik <rik@octave.org>
parents: 27434
diff changeset
1291 fmt = float_format (prec+6, prec);
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
1292 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1293 {
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1294 int ex = 4;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1295 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
1296 ex++;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1297
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1298 if (print_eng)
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1299 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1300 fw = 5 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1301 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
1302 }
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1303 else
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1304 {
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1305 fw = 3 + prec + ex;
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
1306 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
1307 }
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1308 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1309 }
5086
55f5b61d74b7 [project @ 2004-11-19 21:50:50 by jwe]
jwe
parents: 5030
diff changeset
1310 else if (! bank_format && all_ints)
3611
b1ff6597576f [project @ 2000-03-17 09:44:29 by jwe]
jwe
parents: 3608
diff changeset
1311 fmt = float_format (fw, rd);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1312 else
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
1313 fmt = float_format (fw, rd, std::ios::fixed);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1314
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1315 if (uppercase_format)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1316 fmt.uppercase ();
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1317
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1318 return float_display_format (scale, fmt);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1319 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1320
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1321 template <>
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1322 float_display_format
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1323 make_format (const Range& r)
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1324 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1325 if (free_format)
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1326 return float_display_format ();
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1327
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1328 double r_min = r.base ();
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1329 double r_max = r.limit ();
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1330
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1331 if (r_max < r_min)
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1332 {
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1333 double tmp = r_max;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1334 r_max = r_min;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1335 r_min = tmp;
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1336 }
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1337
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
1338 bool all_ints = r.all_elements_are_ints ();
1658
0e9cd25503d9 [project @ 1995-12-20 16:49:05 by jwe]
jwe
parents: 1651
diff changeset
1339
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
1340 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
1341 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
1342
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24769
diff changeset
1343 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
1344
39186eac5a05 preparing for a brave new future, use templates in some pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24769
diff changeset
1345 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
1346
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1347 return make_range_format<double> (x_max, x_min, all_ints);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1348 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1349
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
1350 template <typename T>
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1351 union equiv
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1352 {
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
1353 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
1354 unsigned char i[sizeof (T)];
1282
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1355 };
dac3c9c58b1a [project @ 1995-04-27 19:27:40 by jwe]
jwe
parents: 1192
diff changeset
1356
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1357 #define PRINT_CHAR_BITS(os, c) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1358 do \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1359 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1360 unsigned char ctmp = c; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1361 char stmp[9]; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1362 stmp[0] = (ctmp & 0x80) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1363 stmp[1] = (ctmp & 0x40) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1364 stmp[2] = (ctmp & 0x20) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1365 stmp[3] = (ctmp & 0x10) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1366 stmp[4] = (ctmp & 0x08) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1367 stmp[5] = (ctmp & 0x04) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1368 stmp[6] = (ctmp & 0x02) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1369 stmp[7] = (ctmp & 0x01) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1370 stmp[8] = '\0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1371 os << stmp; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1372 } \
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1373 while (0)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1374
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1375 #define PRINT_CHAR_BITS_SWAPPED(os, c) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1376 do \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1377 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1378 unsigned char ctmp = c; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1379 char stmp[9]; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1380 stmp[0] = (ctmp & 0x01) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1381 stmp[1] = (ctmp & 0x02) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1382 stmp[2] = (ctmp & 0x04) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1383 stmp[3] = (ctmp & 0x08) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1384 stmp[4] = (ctmp & 0x10) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1385 stmp[5] = (ctmp & 0x20) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1386 stmp[6] = (ctmp & 0x40) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1387 stmp[7] = (ctmp & 0x80) ? '1' : '0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1388 stmp[8] = '\0'; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1389 os << stmp; \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
1390 } \
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1391 while (0)
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
1392
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
1393 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1394 static inline void
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1395 pr_any_float (std::ostream& os, const float_format& fmt, T val)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1396 {
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1397 // 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
1398 // for hex and bit formats.
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1399 //
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1400 // {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
1401 // {bit,hex}_format == 2: print native
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1402
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
1403 int fw = fmt.width ();
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1404
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1405 if (hex_format)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1406 {
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1407 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
1408
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
1409 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
1410 tmp.val = val;
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1411
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1412 // 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
1413
27462
730af4e7034a Correctly display integer types with format hex (bug #56966).
Rik <rik@octave.org>
parents: 27154
diff changeset
1414 // FIXME: Will bad things happen if we are interrupted before resetting
730af4e7034a Correctly display integer types with format hex (bug #56966).
Rik <rik@octave.org>
parents: 27154
diff changeset
1415 // the format flags and fill character?
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1416
27277
db687716fed6 style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents: 27183
diff changeset
1417 octave::mach_info::float_format flt_fmt
db687716fed6 style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents: 27183
diff changeset
1418 = octave::mach_info::native_float_format ();
24667
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 os.fill ('0');
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1421 if (uppercase_format)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1422 os.flags (std::ios::right | std::ios::hex | std::ios::uppercase);
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1423 else
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
1424 os.flags (std::ios::right | std::ios::hex);
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1425
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1426 if (hex_format > 1
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1427 || 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
1428 {
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
1429 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
1430 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
1431 }
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1432 else
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1433 {
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
1434 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
1435 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
1436 }
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1437 }
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1438 else if (bit_format)
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1439 {
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
1440 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
1441 tmp.val = val;
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1442
27277
db687716fed6 style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents: 27183
diff changeset
1443 octave::mach_info::float_format flt_fmt
db687716fed6 style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents: 27183
diff changeset
1444 = octave::mach_info::native_float_format ();
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1445
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1446 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
1447 {
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
1448 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
1449 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
1450 }
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1451 else
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1452 {
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1453 if (bit_format > 1)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1454 {
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
1455 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
1456 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
1457 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1458 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1459 {
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
1460 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
1461 PRINT_CHAR_BITS (os, tmp.i[i]);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1462 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1463 }
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1464 }
27433
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1465 else if (val == 0)
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1466 {
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1467 octave::preserve_stream_state stream_state (os);
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1468
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1469 if (fw > 0)
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1470 os << std::setw (fw) << "0";
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1471 else
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1472 os << "0";
fc7504df6a12 Display "0" for true zeros rather than "0.0000" (bug #53083).
Rik <rik@octave.org>
parents: 27430
diff changeset
1473 }
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
1474 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
1475 {
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1476 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
1477
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1478 if (fw > 0)
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1479 os << std::setw (fw) << "NA";
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1480 else
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1481 os << "NA";
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1482 }
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1483 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
1484 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
1485 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
1486 {
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1487 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
1488
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1489 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
1490 if (val < 0)
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1491 s = "-Inf";
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1492 else
24667
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1493 s = "Inf";
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1494
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1495 if (fw > 0)
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1496 os << std::setw (fw) << s;
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1497 else
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1498 os << s;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1499 }
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
1500 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
1501 {
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1502 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
1503
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1504 if (fw > 0)
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1505 os << std::setw (fw) << "NaN";
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1506 else
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1507 os << "NaN";
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1508 }
56f889d66b7c move float_format container to setparate file
John W. Eaton <jwe@octave.org>
parents: 24534
diff changeset
1509 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
1510 os << pr_engineering_float<T> (fmt, val);
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 453
diff changeset
1511 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
1512 os << pr_formatted_float<T> (fmt, val);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1513 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1514
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
1515 template <typename T>
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1516 static inline void
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1517 pr_float (std::ostream& os, const float_display_format& fmt, T val)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1518 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1519 double scale = fmt.scale_factor ();
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1520
27434
57f5c5768eb3 Disallow exponential format in combination with fixed_point_format.
Rik <rik@octave.org>
parents: 27433
diff changeset
1521 if (Vfixed_point_format && ! (print_g || print_e) && scale != 1)
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
1522 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
1523
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1524 pr_any_float (os, fmt.real_format (), val);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1525 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1526
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 template <typename T>
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1528 static inline void
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1529 pr_imag_float (std::ostream& os, const float_display_format& fmt, T val)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1530 {
27454
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
1531 double scale = fmt.scale_factor ();
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
1532
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
1533 if (Vfixed_point_format && ! (print_g || print_e) && scale != 1)
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
1534 val /= scale;
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
1535
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1536 pr_any_float (os, fmt.imag_format (), val);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1537 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1538
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
1539 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1540 static inline void
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1541 pr_float (std::ostream& os, const float_display_format& fmt,
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1542 const std::complex<T>& cval)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1543 {
27454
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
1544 T r = cval.real ();
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
1545
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1546 pr_float (os, fmt, r);
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
1547
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1548 if (! bank_format)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1549 {
27454
43ece0b8318b Fix display of complex values when fixed_point_format is true (bug #56961).
Rik <rik@octave.org>
parents: 27453
diff changeset
1550 T i = cval.imag ();
4349
a6c22c2c9b09 [project @ 2003-02-21 18:59:07 by jwe]
jwe
parents: 4270
diff changeset
1551 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
1552 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1553 os << " - ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1554 i = -i;
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1555 pr_imag_float (os, fmt, i);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1556 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1557 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1558 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1559 if (hex_format || bit_format)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1560 os << " ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1561 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1562 os << " + ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1563
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
1564 pr_imag_float (os, fmt, i);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1565 }
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
1566 os << 'i';
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1567 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1568 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1569
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1570 static inline void
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
1571 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
1572 bool pr_as_read_syntax)
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1573 {
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1574 assert (nr == 0 || nc == 0);
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1575
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1576 if (pr_as_read_syntax)
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1577 {
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1578 if (nr == 0 && nc == 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1579 os << "[]";
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1580 else
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
1581 os << "zeros (" << nr << ", " << nc << ')';
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1582 }
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1583 else
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1584 {
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1585 os << "[]";
4559
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1586
2165
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe]
jwe
parents: 2086
diff changeset
1587 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
1588 os << '(' << nr << 'x' << nc << ')';
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1589 }
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1590 }
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1591
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1592 static inline void
4559
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1593 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
1594 bool pr_as_read_syntax)
4559
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1595 {
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1596 assert (dims.any_zero ());
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1597
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1598 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
1599 os << "zeros (" << dims.str (',') << ')';
4559
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1600 else
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1601 {
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1602 os << "[]";
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1603
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1604 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
1605 os << '(' << dims.str () << ')';
4559
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1606 }
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1607 }
802818bfac91 [project @ 2003-10-28 19:13:43 by jwe]
jwe
parents: 4532
diff changeset
1608
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1609 static inline void
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1610 pr_scale_header (std::ostream& os, double scale)
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1611 {
27434
57f5c5768eb3 Disallow exponential format in combination with fixed_point_format.
Rik <rik@octave.org>
parents: 27433
diff changeset
1612 if (Vfixed_point_format && ! (print_g || print_e) && scale != 1)
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1613 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
1614 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
1615
3568
58549b931ad5 [project @ 2000-02-03 10:21:54 by jwe]
jwe
parents: 3548
diff changeset
1616 os << " "
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1617 << std::setw (8) << std::setprecision (1)
21662
5b9868c2e212 maint: Octave coding convention cleanups.
Rik <rik@octave.org>
parents: 21583
diff changeset
1618 << 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
1619 << scale
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
1620 << "*\n";
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1621
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
1622 if (! Vcompact_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1623 os << "\n";
3105
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1624 }
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1625 }
f936c7f5074f [project @ 1997-11-19 04:36:17 by jwe]
jwe
parents: 3018
diff changeset
1626
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1627 static inline void
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
1628 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
1629 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
1630 {
2165
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe]
jwe
parents: 2086
diff changeset
1631 if (total_width > max_width && Vsplit_long_rows)
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1632 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
1633 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
1634
4833
399e8681b774 [project @ 2004-03-10 20:49:48 by jwe]
jwe
parents: 4791
diff changeset
1635 if (col != 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1636 {
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
1637 if (Vcompact_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1638 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1639 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1640 os << "\n\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1641 }
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1642
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
1643 octave_idx_type num_cols = lim - col;
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1644
3548
ab7fa5a8f23f [project @ 2000-02-03 01:17:15 by jwe]
jwe
parents: 3538
diff changeset
1645 os << std::setw (extra_indent) << "";
1972
58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe]
jwe
parents: 1968
diff changeset
1646
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1647 if (num_cols == 1)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1648 os << " Column " << col + 1 << ":\n";
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1649 else if (num_cols == 2)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1650 os << " Columns " << col + 1 << " and " << lim << ":\n";
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1651 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1652 os << " Columns " << col + 1 << " through " << lim << ":\n";
2915
649549662cf6 [project @ 1997-04-30 20:51:40 by jwe]
jwe
parents: 2907
diff changeset
1653
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
1654 if (! Vcompact_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1655 os << "\n";
1186
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1656 }
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1657 }
d94bcafabac2 [project @ 1995-03-30 04:57:32 by jwe]
jwe
parents: 1086
diff changeset
1658
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21100
diff changeset
1659 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1660 static inline void
5030
160365410ad4 [project @ 2004-09-24 03:22:23 by jwe]
jwe
parents: 4949
diff changeset
1661 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
1662 {
5030
160365410ad4 [project @ 2004-09-24 03:22:23 by jwe]
jwe
parents: 4949
diff changeset
1663 if (val > T (0))
4632
0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe]
jwe
parents: 4574
diff changeset
1664 os << plus_format_chars[0];
5030
160365410ad4 [project @ 2004-09-24 03:22:23 by jwe]
jwe
parents: 4949
diff changeset
1665 else if (val < T (0))
4632
0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe]
jwe
parents: 4574
diff changeset
1666 os << plus_format_chars[1];
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
1667 else
4632
0e28461651f2 [project @ 2003-11-18 19:07:13 by jwe]
jwe
parents: 4574
diff changeset
1668 os << plus_format_chars[2];
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
1669 }
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
1670
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
1671 // 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
1672 //
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 // 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
1674 //
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 // 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
1676
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 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1678 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
1679 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
1680 {
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114)
John W. Eaton <jwe@octave.org>
parents: 24745
diff changeset
1681 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
1682 }
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114)
John W. Eaton <jwe@octave.org>
parents: 24745
diff changeset
1683
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114)
John W. Eaton <jwe@octave.org>
parents: 24745
diff changeset
1684 #define INSTANTIATE_ABS(T) \
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1685 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
1686
25569
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1687 INSTANTIATE_ABS(int8_t);
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1688 INSTANTIATE_ABS(int16_t);
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1689 INSTANTIATE_ABS(int32_t);
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1690 INSTANTIATE_ABS(int64_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
1691
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114)
John W. Eaton <jwe@octave.org>
parents: 24745
diff changeset
1692 #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
1693 template <> \
25569
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1694 inline T \
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1695 abs (T x) \
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
1696 { \
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114)
John W. Eaton <jwe@octave.org>
parents: 24745
diff changeset
1697 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
1698 }
6114be517240 * pr-output.cc: Move defn of specialized abs before first use (bug #53114)
John W. Eaton <jwe@octave.org>
parents: 24745
diff changeset
1699
25569
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1700 SPECIALIZE_UABS(uint8_t)
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1701 SPECIALIZE_UABS(uint16_t)
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1702 SPECIALIZE_UABS(uint32_t)
e8961d677661 build: avoid compiler warning about unused function 'abs' (bug #54237)
Mike Miller <mtmiller@octave.org>
parents: 25108
diff changeset
1703 SPECIALIZE_UABS(uint64_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
1704
24745
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1705 #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
1706 template <> \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1707 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
1708 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
1709 { \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1710 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
1711 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
1712 \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1713 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
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 new_digits \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1716 = 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
1717 (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
1718 \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1719 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
1720 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
1721 \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1722 if (! isneg) \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1723 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
1724 } \
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 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
1727 }
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1728
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1729 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
1730 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
1731 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
1732 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
1733 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
1734 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
1735 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
1736 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
1737
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1738 #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
1739 template <> \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1740 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
1741 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
1742 { \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1743 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
1744 int digits \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1745 = 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
1746 (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
1747 \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1748 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
1749 \
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1750 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
1751 }
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1752
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
1753 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
1754 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
1755 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
1756 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
1757 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
1758 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
1759 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
1760 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
1761
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1762 void
24760
b784d68f7c44 fix printing of logical values (bug #53160)
John W. Eaton <jwe@octave.org>
parents: 24747
diff changeset
1763 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
1764 bool d, bool pr_as_read_syntax)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1765 {
24760
b784d68f7c44 fix printing of logical values (bug #53160)
John W. Eaton <jwe@octave.org>
parents: 24747
diff changeset
1766 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
1767 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1768
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
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, 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
1771 {
24760
b784d68f7c44 fix printing of logical values (bug #53160)
John W. Eaton <jwe@octave.org>
parents: 24747
diff changeset
1772 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
1773 }
b784d68f7c44 fix printing of logical values (bug #53160)
John W. Eaton <jwe@octave.org>
parents: 24747
diff changeset
1774
b784d68f7c44 fix printing of logical values (bug #53160)
John W. Eaton <jwe@octave.org>
parents: 24747
diff changeset
1775 void
b784d68f7c44 fix printing of logical values (bug #53160)
John W. Eaton <jwe@octave.org>
parents: 24747
diff changeset
1776 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
1777 char, bool)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1778 {
17866
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1779 panic_impossible ();
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1780 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1781
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1782 void
24668
d4dd741b2794 new octave_value functions for formatting output
John W. Eaton <jwe@octave.org>
parents: 24667
diff changeset
1783 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
1784 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
1785 {
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1786 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
1787 os << d;
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1788 else if (plus_format)
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
1789 pr_plus_format (os, d);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1790 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1791 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1792 if (free_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1793 os << d;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1794 else
24668
d4dd741b2794 new octave_value functions for formatting output
John W. Eaton <jwe@octave.org>
parents: 24667
diff changeset
1795 pr_float (os, fmt, d);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1796 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1797 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1798
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1799 void
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1800 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
1801 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
1802 {
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1803 if (pr_as_read_syntax)
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1804 os << d;
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1805 else if (plus_format)
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1806 pr_plus_format (os, d);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1807 else
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1808 {
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1809 if (free_format)
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1810 os << d;
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1811 else
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1812 pr_float (os, fmt, d);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1813 }
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1814 }
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1815
24769
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
1816 template <typename MT>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
1817 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
1818 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
1819 {
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
1820 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
1821 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
1822
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
1823 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
1824 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
1825
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
1826 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
1827 {
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
1828 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
1829 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
1830
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
1831 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
1832 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
1833 }
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 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
1836 os << ']';
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
24781
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1839 template <typename MT>
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1840 static inline void
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1841 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
1842 {
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1843 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
1844 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
1845
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1846 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
1847 {
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1848 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
1849 {
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1850 octave_quit ();
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1851
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1852 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
1853 }
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 if (i < nr - 1)
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1856 os << "\n";
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
1857 }
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
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1860 static inline int
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1861 get_column_width (const float_display_format& fmt)
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1862 {
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
1863 int r_fw = fmt.real_format().width ();
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
1864 int i_fw = fmt.imag_format().width ();
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1865
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1866 int retval = r_fw + i_fw + 2;
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1867
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1868 if (i_fw && ! (rat_format || bank_format || hex_format || bit_format))
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1869 retval += 5;
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1870
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1871 return retval;
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1872 }
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1873
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
1874 template <typename MT>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
1875 static void
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1876 octave_print_matrix_internal (std::ostream& os, const MT& m,
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1877 bool pr_as_read_syntax, int extra_indent)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1878 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
1879 octave_idx_type nr = m.rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
1880 octave_idx_type nc = m.columns ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1881
2408
e22aae3ccfad [project @ 1996-10-15 16:37:52 by jwe]
jwe
parents: 2387
diff changeset
1882 if (nr == 0 || nc == 0)
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1883 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
1884 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
1885 pr_plus_format_matrix (os, m);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1886 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1887 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1888 float_display_format fmt = make_format (m);
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1889 int column_width = get_column_width (fmt);
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
1890 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
1891 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
1892
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1893 if (pr_as_read_syntax)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1894 max_width -= 4;
1972
58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe]
jwe
parents: 1968
diff changeset
1895 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1896 max_width -= extra_indent;
1972
58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe]
jwe
parents: 1968
diff changeset
1897
58ac5f889c64 [project @ 1996-02-24 07:12:58 by jwe]
jwe
parents: 1968
diff changeset
1898 if (max_width < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1899 max_width = 0;
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1900
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1901 if (free_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1902 {
24769
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
1903 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
1904 return;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1905 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1906
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
1907 octave_idx_type inc = nc;
2165
83d91aa3759b [project @ 1996-05-13 13:28:10 by jwe]
jwe
parents: 2086
diff changeset
1908 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
1909 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1910 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1911 if (inc == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1912 inc++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1913 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1914
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1915 if (pr_as_read_syntax)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1916 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1917 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
1918 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1919 octave_idx_type col = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1920 while (col < nc)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1921 {
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
1922 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
1923
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1924 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
1925 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1926 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1927
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1928 if (i == 0 && j == 0)
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 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1931 {
26501
cfe28edab48b pr-output.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
1932 if (j > col)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1933 os << ", ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1934 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1935 os << " ";
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
24761
d7c3918955e6 eliminate file-scope static variable in pr-output.cc
John W. Eaton <jwe@octave.org>
parents: 24760
diff changeset
1938 pr_float (os, fmt, m(i,j));
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1939 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1940
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1941 col += inc;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1942
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1943 if (col >= nc)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1944 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1945 if (i == nr - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1946 os << " ]";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1947 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1948 os << ";\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1949 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1950 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1951 os << " ...\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1952 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1953 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1954 }
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
1955 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1956 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
1957 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
1958
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1959 pr_scale_header (os, fmt.scale_factor ());
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1960
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1961 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
1962 {
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
1963 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
1964
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1965 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
1966 extra_indent);
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 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
1969 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1970 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1971
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1972 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
1973 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1974 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1975
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1976 os << " ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1977
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
1978 pr_float (os, fmt, m(i,j));
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1979 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1980
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1981 if (i < nr - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1982 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1983 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1984 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
1985 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1986 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1987 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
1988
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
1989 template <typename DMT>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
1990 static void
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1991 octave_print_diag_matrix_internal (std::ostream& os, const DMT& m,
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
1992 bool pr_as_read_syntax, int extra_indent)
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
1993 {
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
1994 octave_idx_type nr = m.rows ();
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
1995 octave_idx_type nc = m.columns ();
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
1996
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
1997 if (nr == 0 || nc == 0)
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
1998 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
1999 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
2000 pr_plus_format_matrix (os, m);
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2001 else
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2002 {
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
2003 float_display_format fmt
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
2004 = make_format (typename DMT::full_matrix_type (m.diag ()));
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2005 int column_width = get_column_width (fmt);
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2006 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
2007 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
2008
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2009 if (pr_as_read_syntax)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2010 max_width -= 4;
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2011 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2012 max_width -= extra_indent;
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2013
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2014 if (max_width < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2015 max_width = 0;
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 if (free_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2018 {
24769
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
2019 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
2020 return;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2021 }
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2022
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2023 octave_idx_type inc = nc;
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2024 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
2025 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2026 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2027 if (inc == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2028 inc++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2029 }
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2030
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2031 if (pr_as_read_syntax)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2032 {
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2033 os << "diag (";
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2034
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2035 octave_idx_type col = 0;
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2036 while (col < nc)
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2037 {
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
2038 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
2039
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2040 for (octave_idx_type j = col; j < lim; j++)
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2041 {
10142
829e69ec3110 make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents: 10066
diff changeset
2042 octave_quit ();
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2043
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2044 if (j == 0)
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 else
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2047 {
26501
cfe28edab48b pr-output.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
2048 if (j > col)
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2049 os << ", ";
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2050 else
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2051 os << " ";
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
24761
d7c3918955e6 eliminate file-scope static variable in pr-output.cc
John W. Eaton <jwe@octave.org>
parents: 24760
diff changeset
2054 pr_float (os, fmt, m(j,j));
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2055 }
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2056
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2057 col += inc;
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2058
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2059 if (col >= nc)
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2060 os << " ]";
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2061 else
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2062 os << " ...\n";
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2063 }
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2064 os << ')';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2065 }
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2066 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2067 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
2068 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
2069
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2070 os << "Diagonal Matrix\n";
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2071 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2072 os << "\n";
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2073
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
2074 pr_scale_header (os, fmt.scale_factor ());
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2075
21751
b571fc85953f maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents: 21748
diff changeset
2076 // kluge. Get the true width of a number.
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2077 int zero_fw;
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2078 {
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2079 std::ostringstream tmp_oss;
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2080 typename DMT::element_type zero = 0;
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
2081 pr_float (tmp_oss, fmt, zero);
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2082 zero_fw = tmp_oss.str ().length ();
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2083 }
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2084
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2085 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
2086 {
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
2087 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
2088
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2089 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
2090 extra_indent);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2091
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2092 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
2093 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2094 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2095
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2096 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
2097 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2098 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2099
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2100 os << " ";
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2101
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2102 if (i == j)
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
2103 pr_float (os, fmt, m(i,j));
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2104 else
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2105 os << std::setw (zero_fw) << '0';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2106 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2107
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2108 if (i < nr - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2109 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2110 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2111 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2112 }
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2113 }
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2114 }
13102
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2115
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2116 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
2117 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
2118 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
2119 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2120
23577
80c42f4cca13 maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents: 23565
diff changeset
2121 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
2122 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
2123 else
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2124 {
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 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
2127
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2128 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
2129
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2130 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
2131
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 m = 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 (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
2135 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
2136
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2137 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
2138 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
2139
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2140 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
2141 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2142 octave_quit ();
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::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
2145
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2146 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
2147 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2148 nm += "(:,:,";
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 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
2151
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2152 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
2153 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2154 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
2155
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2156 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
2157 buf << ',';
13102
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2158 else
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2159 buf << ')';
13102
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
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2162 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
2163 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2164
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2165 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
2166
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2167 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
2168 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
2169
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2170 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
2171 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
2172
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2173 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
2174 = 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
2175
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2176 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
2177 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2178 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
2179 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2180 else
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2181 {
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2182 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
2183 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
2184 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2185
26501
cfe28edab48b pr-output.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
2186 NDA_T::increment_index (ra_idx, dims, 2);
13102
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2187 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2188 }
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2189 }
4532
01ee68d18069 [project @ 2003-10-10 00:49:54 by jwe]
jwe
parents: 4513
diff changeset
2190
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2191 void
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2192 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
2193 bool pr_as_read_syntax, int extra_indent)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2194 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2195 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2196 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2197 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2198 case 2:
19320
d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents: 19318
diff changeset
2199 octave_print_internal (os, Matrix (nda),
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2200 pr_as_read_syntax, extra_indent);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2201 break;
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 default:
13102
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2204 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
2205 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2206 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2207 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2208
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2209 void
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2210 octave_print_internal (std::ostream& os, const FloatNDArray& nda,
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2211 bool pr_as_read_syntax, int extra_indent)
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2212 {
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2213 switch (nda.ndims ())
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2214 {
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2215 case 1:
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2216 case 2:
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2217 octave_print_internal (os, FloatMatrix (nda),
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2218 pr_as_read_syntax, extra_indent);
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2219 break;
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2220
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2221 default:
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2222 print_nd_array <FloatNDArray, float, FloatMatrix> (os, nda, pr_as_read_syntax);
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2223 break;
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2224 }
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2225 }
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2226
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2227 template <typename T>
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2228 static inline void
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2229 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
2230 {
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2231 T rp = c.real ();
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2232 T ip = c.imag ();
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
2233
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
2234 if (rp == 0)
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
2235 {
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
2236 if (ip == 0)
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2237 os << ' ';
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
2238 else
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2239 os << 'i';
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
2240 }
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
2241 else if (ip == 0)
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
2242 pr_plus_format (os, rp);
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
2243 else
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2244 os << 'c';
3248
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
2245 }
68259f410026 [project @ 1999-07-13 03:34:54 by jwe]
jwe
parents: 3215
diff changeset
2246
24668
d4dd741b2794 new octave_value functions for formatting output
John W. Eaton <jwe@octave.org>
parents: 24667
diff changeset
2247 extern void
d4dd741b2794 new octave_value functions for formatting output
John W. Eaton <jwe@octave.org>
parents: 24667
diff changeset
2248 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
2249 const Complex& c, bool pr_as_read_syntax)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2250 {
17867
49d573a1deda avoid initial spaces for scalars in GUI workspace viewer (bug #40500)
John W. Eaton <jwe@octave.org>
parents: 17866
diff changeset
2251 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
2252 os << c;
49d573a1deda avoid initial spaces for scalars in GUI workspace viewer (bug #40500)
John W. Eaton <jwe@octave.org>
parents: 17866
diff changeset
2253 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
2254 pr_plus_format (os, c);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2255 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2256 {
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2257 if (free_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2258 os << c;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2259 else
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2260 pr_float (os, fmt, c);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2261 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2262 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2263
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2264 void
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2265 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
2266 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
2267 {
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2268 if (pr_as_read_syntax)
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2269 os << c;
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2270 else if (plus_format)
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2271 pr_plus_format (os, c);
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2272 else
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2273 {
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2274 if (free_format)
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2275 os << c;
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2276 else
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2277 pr_float (os, fmt, c);
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2278 }
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2279 }
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2280
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2281 void
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2282 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
2283 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
2284 {
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2285 octave_idx_type nr = m.rows ();
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2286 octave_idx_type nc = m.columns ();
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2287
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2288 if (nr == 0 || nc == 0)
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2289 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
2290 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
2291 pr_plus_format_matrix (os, m);
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2292 else
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2293 {
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2294 int fw = 2;
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2295 int column_width = fw + 2;
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2296 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
2297 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
2298
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2299 if (pr_as_read_syntax)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2300 max_width -= 4;
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2301 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2302 max_width -= extra_indent;
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2303
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2304 if (max_width < 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2305 max_width = 0;
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2306
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2307 if (free_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2308 {
24769
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
2309 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
2310 return;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2311 }
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2312
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2313 octave_idx_type inc = nc;
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2314 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
2315 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2316 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2317 if (inc == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2318 inc++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2319 }
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2320
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2321 if (pr_as_read_syntax)
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2322 {
18849
aa9ca67f09fb make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents: 18816
diff changeset
2323 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
2324
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2325 os << "eye (";
18849
aa9ca67f09fb make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents: 18816
diff changeset
2326 os << ":, ";
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2327
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2328 octave_idx_type col = 0;
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2329 while (col < nc)
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2330 {
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
2331 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
2332
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2333 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
2334 {
10142
829e69ec3110 make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents: 10066
diff changeset
2335 octave_quit ();
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2336
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2337 if (j == 0)
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2338 os << "[ ";
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2339 else
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2340 {
26501
cfe28edab48b pr-output.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
2341 if (j > col)
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2342 os << ", ";
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2343 else
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2344 os << " ";
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2345 }
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2346
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2347 os << pvec (j);
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2348 }
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2349
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2350 col += inc;
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2351
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2352 if (col >= nc)
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2353 os << " ]";
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2354 else
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2355 os << " ...\n";
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2356 }
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2357 os << ')';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2358 }
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2359 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2360 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
2361 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
2362
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2363 os << "Permutation Matrix\n";
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2364 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2365 os << "\n";
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2366
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2367 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
2368 {
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
2369 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
2370
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2371 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
2372 extra_indent);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2373
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2374 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
2375 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2376 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2377
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2378 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
2379 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2380 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2381
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2382 os << " ";
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2383
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2384 os << std::setw (fw) << m(i,j);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2385 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2386
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2387 if (i < nr - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2388 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2389 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2390 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2391 }
8891
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2392 }
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2393 }
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2394
d077c590eb88 indicate diag & perm matrices on output
Jaroslav Hajek <highegg@gmail.com>
parents: 8746
diff changeset
2395 void
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2396 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
2397 bool pr_as_read_syntax, int extra_indent)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2398 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2399 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2400 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2401 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2402 case 2:
19320
d0c73e23a505 Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents: 19318
diff changeset
2403 octave_print_internal (os, ComplexMatrix (nda),
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2404 pr_as_read_syntax, extra_indent);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2405 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2406
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2407 default:
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2408 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
2409 (os, nda, pr_as_read_syntax);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2410 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2411 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2412 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2413
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2414 void
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2415 octave_print_internal (std::ostream& os, const FloatComplexNDArray& nda,
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2416 bool pr_as_read_syntax, int extra_indent)
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2417 {
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2418 switch (nda.ndims ())
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2419 {
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2420 case 1:
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2421 case 2:
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2422 octave_print_internal (os, FloatComplexMatrix (nda),
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2423 pr_as_read_syntax, extra_indent);
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2424 break;
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2425
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2426 default:
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2427 print_nd_array <FloatComplexNDArray, FloatComplex, FloatComplexMatrix>
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2428 (os, nda, pr_as_read_syntax);
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2429 break;
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2430 }
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2431 }
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2432
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2433 // 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
2434
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2435 void
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2436 octave_print_internal (std::ostream& os, const Matrix& m,
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2437 bool pr_as_read_syntax, int extra_indent)
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2438 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2439 octave_print_matrix_internal (os, m, pr_as_read_syntax, extra_indent);
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2440 }
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2441
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2442 void
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2443 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
2444 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
2445 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2446 octave_print_matrix_internal (os, m, pr_as_read_syntax, extra_indent);
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2447 }
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2448
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2449 void
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2450 octave_print_internal (std::ostream& os, const DiagMatrix& m,
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2451 bool pr_as_read_syntax, int extra_indent)
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2452 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2453 octave_print_diag_matrix_internal (os, m, pr_as_read_syntax, extra_indent);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2454 }
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2455
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2456 void
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2457 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
2458 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
2459 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2460 octave_print_diag_matrix_internal (os, m, pr_as_read_syntax, extra_indent);
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2461 }
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2462
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2463 void
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2464 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
2465 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
2466 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2467 octave_print_matrix_internal (os, cm, pr_as_read_syntax, extra_indent);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2468 }
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2469
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2470 void
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2471 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
2472 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
2473 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2474 octave_print_matrix_internal (os, cm, pr_as_read_syntax, extra_indent);
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2475 }
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2476
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2477 void
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2478 octave_print_internal (std::ostream& os, const ComplexDiagMatrix& cm,
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2479 bool pr_as_read_syntax, int extra_indent)
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
2480 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2481 octave_print_diag_matrix_internal (os, cm, pr_as_read_syntax, extra_indent);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2482 }
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2483
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2484 void
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2485 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
2486 bool pr_as_read_syntax, int extra_indent)
8625
4d90d21a9cd9 special printing of diagonal matrices
Jaroslav Hajek <highegg@gmail.com>
parents: 8333
diff changeset
2487 {
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2488 octave_print_diag_matrix_internal (os, cm, pr_as_read_syntax, extra_indent);
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2489 }
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2490
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7721
diff changeset
2491 void
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
2492 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
2493 bool pr_as_read_syntax, int extra_indent)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2494 {
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
2495 double base = r.base ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2496 double increment = r.inc ();
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
2497 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
2498 octave_idx_type num_elem = r.numel ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2499
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
2500 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
2501 pr_plus_format_matrix (os, r);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2502 else
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2503 {
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
2504 float_display_format fmt = make_format (r);
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2505
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
2506 if (pr_as_read_syntax)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2507 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2508 if (free_format)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2509 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2510 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
2511 if (increment != 1)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2512 os << increment << " : ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2513 os << limit;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2514 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2515 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2516 {
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
2517 pr_float (os, fmt, base);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2518 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
2519 if (increment != 1)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2520 {
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
2521 pr_float (os, fmt, increment);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2522 os << " : ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2523 }
24786
0aeef407b04e don't pass field width as separate argument in pr-output functions
John W. Eaton <jwe@octave.org>
parents: 24785
diff changeset
2524 pr_float (os, fmt, limit);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2525 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2526 }
626
96be9eae023f [project @ 1994-08-19 02:10:54 by jwe]
jwe
parents: 575
diff changeset
2527 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2528 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
2529 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
2530
24788
6f04028d5d86 use templates to eliminate more nearly duplicate pr-output code
John W. Eaton <jwe@octave.org>
parents: 24787
diff changeset
2531 int column_width = get_column_width (fmt);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2532 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
2533 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
2534
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2535 if (free_format)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2536 {
24769
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
2537 os << ' ';
e574b957b01b don't print extra newline after matrices with format free (bug #53168)
John W. Eaton <jwe@octave.org>
parents: 24767
diff changeset
2538 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
2539 os << ' ' << r.elem(i);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2540 return;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2541 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2542
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2543 octave_idx_type inc = num_elem;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2544 if (total_width > max_width && Vsplit_long_rows)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2545 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2546 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2547 if (inc == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2548 inc++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2549 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2550
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2551 max_width -= extra_indent;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2552
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2553 if (max_width < 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2554 max_width = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2555
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
2556 pr_scale_header (os, fmt.scale_factor ());
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2557
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2558 octave_idx_type col = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2559 while (col < num_elem)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2560 {
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
2561 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
2562
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2563 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
2564 extra_indent);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2565
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2566 os << std::setw (extra_indent) << "";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2567
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2568 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
2569 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2570 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2571
16169
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents: 15467
diff changeset
2572 double val;
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents: 15467
diff changeset
2573 if (i == 0)
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents: 15467
diff changeset
2574 val = base;
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents: 15467
diff changeset
2575 else
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents: 15467
diff changeset
2576 val = base + i * increment;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2577
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2578 if (i == num_elem - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2579 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2580 // 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
2581 if ((increment > 0 && val >= limit)
0303fda3e929 Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents: 15467
diff changeset
2582 || (increment < 0 && val <= limit))
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2583 val = limit;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2584 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2585
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2586 os << " ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2587
24787
168d5b43c840 store scale factor in float_display_format object
John W. Eaton <jwe@octave.org>
parents: 24786
diff changeset
2588 pr_float (os, fmt, val);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2589 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2590
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2591 col += inc;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2592 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2593 }
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2594 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2595 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
2596
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
2597 void
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
2598 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
2599 bool pr_as_read_syntax,
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2600 int extra_indent)
3215
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe]
jwe
parents: 3164
diff changeset
2601 {
21583
d5963a6e29c2 Use integer output formatting for logicals (bug #47607)
Mike Miller <mtmiller@octave.org>
parents: 21568
diff changeset
2602 uint8NDArray tmp (bm);
3215
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe]
jwe
parents: 3164
diff changeset
2603 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
2604 }
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe]
jwe
parents: 3164
diff changeset
2605
bc3fdfe311a3 [project @ 1998-11-10 14:06:21 by jwe]
jwe
parents: 3164
diff changeset
2606 void
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2607 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
2608 bool pr_as_read_syntax,
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2609 int extra_indent)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2610 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2611 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2612 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2613 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2614 case 2:
19317
25f535b90e52 Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents: 19255
diff changeset
2615 octave_print_internal (os, boolMatrix (nda),
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2616 pr_as_read_syntax, extra_indent);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2617 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2618
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2619 default:
13102
801c5a6ad487 Change the PRINT_ND_ARRAY macro into a templated function
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 12483
diff changeset
2620 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
2621 boolMatrix> (os, nda, pr_as_read_syntax);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2622 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2623 }
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
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2626 void
3523
b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe]
jwe
parents: 3503
diff changeset
2627 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
2628 bool pr_as_read_syntax,
21066
258c787cd9ce maint: Use "FIXME:" consistently in code base.
Rik <rik@octave.org>
parents: 20946
diff changeset
2629 int /* FIXME: extra_indent */,
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2630 bool pr_as_string)
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
2631 {
1572
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2632 if (pr_as_string)
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2633 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2634 octave_idx_type nstr = chm.rows ();
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
2635
1572
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2636 if (pr_as_read_syntax && nstr > 1)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2637 os << "[ ";
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
2638
2907
8bb31a2b480b [project @ 1997-04-30 05:01:46 by jwe]
jwe
parents: 2903
diff changeset
2639 if (nstr != 0)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2640 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2641 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
2642 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2643 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2644
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2645 std::string row = chm.row_as_string (i);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2646
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2647 if (pr_as_read_syntax)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2648 {
25646
4d565baa475e move libinterp/utils functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 25569
diff changeset
2649 os << '"' << octave::undo_string_escapes (row) << '"';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2650
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2651 if (i < nstr - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2652 os << "; ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2653 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2654 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2655 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2656 os << row;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2657
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2658 if (i < nstr - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2659 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2660 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2661 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2662 }
1572
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2663
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2664 if (pr_as_read_syntax && nstr > 1)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2665 os << " ]";
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
2666 }
1572
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2667 else
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2668 {
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2669 os << "sorry, printing char matrices not implemented yet\n";
0d9e10d10bd7 [project @ 1995-10-19 04:31:30 by jwe]
jwe
parents: 1488
diff changeset
2670 }
1343
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
2671 }
94bedeb289e5 [project @ 1995-09-04 00:29:21 by jwe]
jwe
parents: 1328
diff changeset
2672
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2673 void
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2674 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
2675 bool pr_as_read_syntax, int extra_indent,
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2676 bool pr_as_string)
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2677 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2678 switch (nda.ndims ())
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2679 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2680 case 1:
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2681 case 2:
19318
6c9ea5be96bf Change charMatrix to subclass charNDArray rather than be another Array<char>.
Carnë Draug <carandraug@octave.org>
parents: 19317
diff changeset
2682 octave_print_internal (os, charMatrix (nda),
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2683 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
2684 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2685
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2686 default:
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2687 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
2688 pr_as_read_syntax);
4513
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2689 break;
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2690 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2691 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe]
jwe
parents: 4509
diff changeset
2692
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2693 void
4925
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe]
jwe
parents: 4901
diff changeset
2694 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
2695 bool pr_as_read_syntax, int extra_indent)
4925
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe]
jwe
parents: 4901
diff changeset
2696 {
9732
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 9643
diff changeset
2697 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
2698
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe]
jwe
parents: 4901
diff changeset
2699 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
2700 }
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe]
jwe
parents: 4901
diff changeset
2701
90f51232d751 [project @ 2004-08-02 22:09:47 by jwe]
jwe
parents: 4901
diff changeset
2702 void
9732
b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 9643
diff changeset
2703 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
2704 bool pr_as_read_syntax, int /* extra_indent */)
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2705 {
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2706 // 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
2707 // 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
2708
23577
80c42f4cca13 maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents: 23565
diff changeset
2709 if (nda.isempty ())
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2710 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
2711 else if (nda.numel () == 1)
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2712 {
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2713 os << nda(0);
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2714 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2715 else
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2716 {
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2717 int ndims = nda.ndims ();
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2718
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2719 dim_vector dims = nda.dims ();
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2720
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
2721 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
2722
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2723 octave_idx_type m = 1;
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2724
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2725 for (int i = 2; i < ndims; i++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2726 m *= dims(i);
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2727
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2728 octave_idx_type nr = dims(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2729 octave_idx_type nc = dims(1);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2730
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2731 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
2732 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2733 std::string nm = "ans";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2734
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2735 if (m > 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2736 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2737 nm += "(:,:,";
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 std::ostringstream buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2740
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2741 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2742 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2743 buf << ra_idx(k) + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2744
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2745 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
2746 buf << ',';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2747 else
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2748 buf << ')';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2749 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2750
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2751 nm += buf.str ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2752 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2753
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
2754 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
2755
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2756 idx(0) = idx_vector (':');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2757 idx(1) = idx_vector (':');
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 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2760 idx(k) = idx_vector (ra_idx(k));
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2761
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
2762 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
2763
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2764 // 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
2765 // in neatly aligned columns...
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2766
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2767 octave_idx_type n_rows = page.rows ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2768 octave_idx_type n_cols = page.cols ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2769
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2770 os << nm << " =\n";
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2771 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2772 os << "\n";
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 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
2775 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2776 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
2777 os << " " << page(ii,jj);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2778
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2779 os << "\n";
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 if (i < m - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2783 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2784
26501
cfe28edab48b pr-output.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents: 26376
diff changeset
2785 increment_index (ra_idx, dims, 2);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2786 }
4655
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2787 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2788 }
c8829691db47 [project @ 2003-11-24 21:24:37 by jwe]
jwe
parents: 4632
diff changeset
2789
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21100
diff changeset
2790 template <typename T>
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2791 class
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2792 octave_print_conv
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2793 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2794 public:
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2795 typedef T print_conv_type;
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2796 };
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2797
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2798 #define PRINT_CONV(T1, T2) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2799 template <> \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2800 class \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2801 octave_print_conv<T1> \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2802 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2803 public: \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2804 typedef T2 print_conv_type; \
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2805 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2806
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2807 PRINT_CONV (octave_int8, octave_int16);
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2808 PRINT_CONV (octave_uint8, octave_uint16);
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2809
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2810 #undef PRINT_CONV
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2811
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21100
diff changeset
2812 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2813 static inline void
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2814 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
2815 {
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
2816 size_t sz = d.byte_size ();
23432
e35a5c1233d0 maint: Use convention 'int *x' for naming pointers.
Rik <rik@octave.org>
parents: 23410
diff changeset
2817 const unsigned char *tmpi = d.iptr ();
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2818
5544
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe]
jwe
parents: 5404
diff changeset
2819 // Unless explicitly asked for, always print in big-endian
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe]
jwe
parents: 5404
diff changeset
2820 // format for hex and bit formats.
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe]
jwe
parents: 5404
diff changeset
2821 //
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe]
jwe
parents: 5404
diff changeset
2822 // {bit,hex}_format == 1: print big-endian
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe]
jwe
parents: 5404
diff changeset
2823 // {bit,hex}_format == 2: print native
2286fa5f2e5d [project @ 2005-11-21 18:44:31 by jwe]
jwe
parents: 5404
diff changeset
2824
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2825 if (hex_format)
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2826 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
2827 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
2828
27462
730af4e7034a Correctly display integer types with format hex (bug #56966).
Rik <rik@octave.org>
parents: 27154
diff changeset
2829 os.fill ('0');
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
2830 if (uppercase_format)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
2831 os.flags (std::ios::right | std::ios::hex | std::ios::uppercase);
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
2832 else
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
2833 os.flags (std::ios::right | std::ios::hex);
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2834
21739
c4ab2e54f100 use namespace for oct_mach_info class
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
2835 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
2836 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2837 for (size_t i = 0; i < sz; i++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2838 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
2839 }
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2840 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2841 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2842 for (int i = sz - 1; i >= 0; i--)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2843 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
2844 }
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2845 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2846 else if (bit_format)
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2847 {
21739
c4ab2e54f100 use namespace for oct_mach_info class
John W. Eaton <jwe@octave.org>
parents: 21724
diff changeset
2848 if (octave::mach_info::words_big_endian ())
10315
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 for (size_t i = 0; i < sz; i++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2851 PRINT_CHAR_BITS (os, tmpi[i]);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2852 }
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2853 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2854 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2855 if (bit_format > 1)
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 for (size_t i = 0; i < sz; i++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2858 PRINT_CHAR_BITS_SWAPPED (os, tmpi[i]);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2859 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2860 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2861 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2862 for (int i = sz - 1; i >= 0; i--)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2863 PRINT_CHAR_BITS (os, tmpi[i]);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2864 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2865 }
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2866 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2867 else
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2868 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
2869 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
2870
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2871 os << std::setw (fw)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2872 << 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
2873
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2874 if (bank_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2875 os << ".00";
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2876 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2877 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2878
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2879 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2880 pr_int (std::ostream&, const octave_int8&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2881
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2882 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2883 pr_int (std::ostream&, const octave_int16&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2884
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2885 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2886 pr_int (std::ostream&, const octave_int32&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2887
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2888 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2889 pr_int (std::ostream&, const octave_int64&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2890
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2891 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2892 pr_int (std::ostream&, const octave_uint8&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2893
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2894 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2895 pr_int (std::ostream&, const octave_uint16&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2896
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2897 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2898 pr_int (std::ostream&, const octave_uint32&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2899
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2900 template void
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2901 pr_int (std::ostream&, const octave_uint64&, int);
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2902
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21100
diff changeset
2903 template <typename T>
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2904 void
24745
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
2905 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
2906 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
2907 const octave_int<T>& val, bool)
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2908 {
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2909 if (plus_format)
24781
e6f380f9b2a4 use template for printing matrices in plus format
John W. Eaton <jwe@octave.org>
parents: 24771
diff changeset
2910 pr_plus_format (os, val);
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2911 else
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2912 {
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2913 if (free_format)
23534
b6498c088fca maint: Don't write '> >' for declaration of templates that use templates.
Rik <rik@octave.org>
parents: 23457
diff changeset
2914 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
2915 else
24745
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
2916 {
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
2917 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
2918
27183
2d9decd77e58 revamp float_format object
John W. Eaton <jwe@octave.org>
parents: 27156
diff changeset
2919 pr_int (os, val, r_fmt.width ());
24745
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
2920 }
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2921 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2922 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2923
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2924 #define PRINT_INT_SCALAR_INTERNAL(TYPE) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2925 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
2926 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
2927 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
2928 const octave_int<TYPE>& val, bool dummy) \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
2929 { \
24745
d2467914ce33 enable (or improve) display for more types in the variable editor
John W. Eaton <jwe@octave.org>
parents: 24737
diff changeset
2930 octave_print_internal_template (os, fmt, val, dummy); \
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2931 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2932
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2933 PRINT_INT_SCALAR_INTERNAL (int8_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2934 PRINT_INT_SCALAR_INTERNAL (uint8_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2935 PRINT_INT_SCALAR_INTERNAL (int16_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2936 PRINT_INT_SCALAR_INTERNAL (uint16_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2937 PRINT_INT_SCALAR_INTERNAL (int32_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2938 PRINT_INT_SCALAR_INTERNAL (uint32_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2939 PRINT_INT_SCALAR_INTERNAL (int64_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2940 PRINT_INT_SCALAR_INTERNAL (uint64_t)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2941
21139
538b57866b90 consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents: 21100
diff changeset
2942 template <typename T>
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
2943 static inline void
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
2944 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
2945 bool pr_as_read_syntax, int extra_indent)
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2946 {
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
2947 // 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
2948 // 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
2949
23577
80c42f4cca13 maint: Deprecate is_empty and replace with isempty.
Rik <rik@octave.org>
parents: 23565
diff changeset
2950 if (nda.isempty ())
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2951 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
2952 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
2953 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
2954 pr_as_read_syntax);
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
2955 else if (plus_format && ! pr_as_read_syntax)
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2956 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2957 int ndims = nda.ndims ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2958
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
2959 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
2960
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2961 dim_vector dims = nda.dims ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2962
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2963 octave_idx_type m = 1;
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2964
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2965 for (int i = 2; i < ndims; i++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2966 m *= dims(i);
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
2967
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2968 octave_idx_type nr = dims(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2969 octave_idx_type nc = dims(1);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2970
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
2971 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
2972 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2973 if (m > 1)
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 std::string nm = "ans(:,:,";
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 std::ostringstream buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2978
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2979 for (int k = 2; k < ndims; k++)
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 buf << ra_idx(k) + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2982
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2983 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
2984 buf << ',';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2985 else
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
2986 buf << ')';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2987 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2988
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2989 nm += buf.str ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2990
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2991 os << nm << " =\n";
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2992 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
2993 os << "\n";
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2994 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2995
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
2996 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
2997
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2998 idx(0) = idx_vector (':');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
2999 idx(1) = idx_vector (':');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3000
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3001 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3002 idx(k) = idx_vector (ra_idx(k));
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3003
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
3004 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
3005
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3006 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
3007 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3008 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
3009 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3010 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3011
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3012 pr_plus_format (os, page(ii,jj));
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3013 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3014
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3015 if ((ii < nr - 1) || (i < m -1))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3016 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3017 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3018
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3019 if (i < m - 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3020 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3021 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3022 increment_index (ra_idx, dims, 2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3023 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3024 }
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3025 }
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3026 else
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3027 {
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3028 int ndims = nda.ndims ();
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3029
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3030 dim_vector dims = nda.dims ();
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3031
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
3032 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
3033
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
3034 octave_idx_type m = 1;
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3035
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3036 for (int i = 2; i < ndims; i++)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3037 m *= dims(i);
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3038
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
3039 octave_idx_type nr = dims(0);
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
3040 octave_idx_type nc = dims(1);
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3041
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3042 int fw = 0;
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3043 if (hex_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3044 fw = 2 * nda(0).byte_size ();
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3045 else if (bit_format)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3046 fw = nda(0).nbits ();
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3047 else
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3048 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3049 bool isneg = false;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3050 int digits = 0;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3051
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3052 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
3053 {
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
3054 int new_digits
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
3055 = 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
3056 (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
3057
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3058 if (new_digits > digits)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3059 digits = new_digits;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3060
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3061 if (! isneg)
17787
175b392e91fe Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents: 17744
diff changeset
3062 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
3063 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3064
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3065 fw = digits + isneg;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3066 }
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3067
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3068 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
3069 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
3070 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
3071 octave_idx_type inc = nc;
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3072 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
3073 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3074 inc = max_width / column_width;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3075 if (inc == 0)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3076 inc++;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3077 }
4949
f6b63ff1119b [project @ 2004-08-31 19:17:44 by jwe]
jwe
parents: 4933
diff changeset
3078
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5086
diff changeset
3079 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
3080 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3081 if (m > 1)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3082 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3083 std::string nm = "ans(:,:,";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3084
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3085 std::ostringstream buf;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3086
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3087 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3088 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3089 buf << ra_idx(k) + 1;
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3090
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3091 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
3092 buf << ',';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3093 else
23807
336f89b6208b Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents: 23803
diff changeset
3094 buf << ')';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3095 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3096
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3097 nm += buf.str ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3098
13112
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
3099 os << nm << " =\n";
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
3100 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact"
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 13102
diff changeset
3101 os << "\n";
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3102 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3103
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
3104 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
3105
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3106 idx(0) = idx_vector (':');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3107 idx(1) = idx_vector (':');
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3108
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3109 for (int k = 2; k < ndims; k++)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3110 idx(k) = idx_vector (ra_idx(k));
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3111
11570
57632dea2446 attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents: 11547
diff changeset
3112 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
3113
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3114 if (free_format)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3115 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3116 if (pr_as_read_syntax)
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3117 os << "[\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3118
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3119 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
3120 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3121 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
3122 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3123 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3124 os << " ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3125 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
3126 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3127 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3128 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3129
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3130 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
3131 os << ']';
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3132 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3133 else
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3134 {
23675
f71c0195b19d move octave_preserve_stream_state to octave namespace
John W. Eaton <jwe@octave.org>
parents: 23662
diff changeset
3135 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
3136
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3137 octave_idx_type n_rows = page.rows ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3138 octave_idx_type n_cols = page.cols ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3139
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3140 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
3141 {
24737
5be92b26ef8f Fix alignment of numbers in fixed_point_format display (bug #53083).
Rik <rik@octave.org>
parents: 24673
diff changeset
3142 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
3143 : n_cols);
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3144
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3145 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
3146 extra_indent);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3147
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3148 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
3149 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3150 os << std::setw (extra_indent) << "";
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
3151
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3152 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
3153 {
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3154 octave_quit ();
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3155 os << " ";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3156 pr_int (os, page(ii,jj), fw);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3157 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3158 if ((ii < n_rows - 1) || (i < m -1))
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3159 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3160 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3161 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3162 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3163
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3164 if (i < m - 1)
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 os << "\n";
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3167 increment_index (ra_idx, dims, 2);
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3168 }
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3169 }
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
3170 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
3171 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
3172
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
3173 #define PRINT_INT_ARRAY_INTERNAL(TYPE) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
3174 OCTINTERP_API void \
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3175 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
3176 bool pr_as_read_syntax, int extra_indent) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22022
diff changeset
3177 { \
7215
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3178 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
3179 }
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3180
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3181 PRINT_INT_ARRAY_INTERNAL (octave_int8)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3182 PRINT_INT_ARRAY_INTERNAL (octave_uint8)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3183 PRINT_INT_ARRAY_INTERNAL (octave_int16)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3184 PRINT_INT_ARRAY_INTERNAL (octave_uint16)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3185 PRINT_INT_ARRAY_INTERNAL (octave_int32)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3186 PRINT_INT_ARRAY_INTERNAL (octave_uint32)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3187 PRINT_INT_ARRAY_INTERNAL (octave_int64)
dd88d61d443f [project @ 2007-11-29 16:44:45 by jwe]
jwe
parents: 7097
diff changeset
3188 PRINT_INT_ARRAY_INTERNAL (octave_uint64)
4901
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe]
jwe
parents: 4869
diff changeset
3189
8012
63dbb85452cc fix extern decls in .cc files
John W. Eaton <jwe@octave.org>
parents: 7896
diff changeset
3190 void
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
3191 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
3192 {
3933
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe]
jwe
parents: 3928
diff changeset
3193 panic_impossible ();
3928
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3776
diff changeset
3194 }
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe]
jwe
parents: 3776
diff changeset
3195
17866
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
3196 void
19620
a1d172bfcb2f eliminate some unused variable and typedef warnings
John W. Eaton <jwe@octave.org>
parents: 19367
diff changeset
3197 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
3198 {
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
3199 panic_impossible ();
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
3200 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499)
John W. Eaton <jwe@octave.org>
parents: 17847
diff changeset
3201
20915
a3359fe50966 remove unused nargout variables
John W. Eaton <jwe@octave.org>
parents: 20909
diff changeset
3202 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
3203 doc: /* -*- texinfo -*-
27154
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3204 @deftypefn {} {@var{s} =} rats (@var{x})
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3205 @deftypefnx {} {@var{s} =} rats (@var{x}, @var{len})
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3206 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
3207
27154
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3208 A rational approximation to a floating point number is a simple fraction
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3209 with numerator @var{N} and denominator @var{D} such that
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3210 @code{@var{x} = @var{N}/@var{D}}.
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3211
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3212 The optional second argument defines the maximum length of the string
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3213 representing the elements of @var{x}. By default, @var{len} is 9.
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3214
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3215 If the length of the smallest possible rational approximation exceeds
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3216 @var{len}, an asterisk (*) padded with spaces will be returned instead.
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3217
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3218 Example conversion from matrix to string, and back again.
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3219
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3220 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3221 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3222 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
3223 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
3224 @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
3225 @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
3226
27154
ecc16b72bfb3 doc: Redo documentation for rats() function.
Rik <rik@octave.org>
parents: 26585
diff changeset
3227 @seealso{rat, 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
3228 @end deftypefn */)
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3229 {
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3230 int nargin = args.length ();
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3231
20909
03e4ddd49396 omit unnecessary nargout checks
John W. Eaton <jwe@octave.org>
parents: 20897
diff changeset
3232 if (nargin < 1 || nargin > 2)
7896
92c26470fe56 Frats fix for nargin==0
David Bateman <dbateman@free.fr>
parents: 7789
diff changeset
3233 print_usage ();
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3234
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3235 octave_value arg = args(0);
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3236
23586
f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric.
Rik <rik@octave.org>
parents: 23577
diff changeset
3237 if (! arg.isnumeric ())
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3238 error ("rats: X must be numeric");
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3239
27477
b470734a025e Return an empty string from rats when input is empty (bug #57004).
Rik <rik@octave.org>
parents: 27476
diff changeset
3240 if (arg.isempty ())
b470734a025e Return an empty string from rats when input is empty (bug #57004).
Rik <rik@octave.org>
parents: 27476
diff changeset
3241 return ovl (octave_value (""));
b470734a025e Return an empty string from rats when input is empty (bug #57004).
Rik <rik@octave.org>
parents: 27476
diff changeset
3242
27476
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3243 // Convert to N-D arrays to 2-D arrays for Matlab compatibility
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3244 if (arg.ndims () > 2)
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3245 {
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3246 dim_vector dv (arg.rows (), arg.numel () / arg.rows ());
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3247 arg = arg.reshape (dv);
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3248 }
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3249
21743
f4d7d0eb5b0c use namespace for unwind_protect class
John W. Eaton <jwe@octave.org>
parents: 21739
diff changeset
3250 octave::unwind_protect frame;
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3251
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3252 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
3253
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3254 rat_string_len = 9;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3255 if (nargin == 2)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3256 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
3257
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3258 frame.protect_var (rat_format);
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3259
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3260 rat_format = true;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3261
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3262 std::ostringstream buf;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3263 arg.print (buf);
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3264 std::string s = buf.str ();
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3265
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3266 std::list<std::string> lst;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3267
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3268 size_t n = 0;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3269 size_t s_len = s.length ();
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3270
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3271 while (n < s_len)
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3272 {
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3273 size_t m = s.find ('\n', n);
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3274
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3275 if (m == std::string::npos)
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3276 {
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3277 lst.push_back (s.substr (n));
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3278 break;
10315
57a59eae83cc untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents: 10160
diff changeset
3279 }
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3280 else
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3281 {
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3282 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
3283 n = m + 1;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3284 }
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3285 }
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3286
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3287 return ovl (string_vector (lst));
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3288 }
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3289
26111
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084).
Markus Mützel <markus.muetzel@gmx.de>
parents: 26009
diff changeset
3290 /*
27475
f429338b9f85 Mark rats BIST test with bug #56941.
Rik <rik@octave.org>
parents: 27473
diff changeset
3291 %!test <56941>
26716
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3292 %! [old_fmt, old_spacing] = format ();
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3293 %! unwind_protect
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3294 %! format short;
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3295 %! assert (rats (2.0005, 9), "4001/2000");
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3296 %! assert (rats (-2.0005, 10), "-4001/2000");
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3297 %! assert (strtrim (rats (2.0005, 30)), "4001/2000");
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3298 %! assert (pi - str2num (rats (pi, 30)), 0, 4 * eps);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3299 %! assert (e - str2num (rats (e, 30)), 0, 4 * eps);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3300 %! assert (rats (123, 2), " *");
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3301 %! v = 1 / double (intmax);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3302 %! err = v - str2num (rats (v, 12));
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3303 %! assert (err, 0, 4 * eps);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3304 %! unwind_protect_cleanup
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3305 %! format (old_fmt);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3306 %! format (old_spacing);
daa281e03d9a Harden BIST tests against changes in format().
Rik <rik@octave.org>
parents: 26585
diff changeset
3307 %! end_unwind_protect
27476
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3308
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3309 %!test <57003>
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3310 %! x = ones (2,1,3);
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3311 %! s = rats (x,4);
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3312 %! assert (ndims (s) == 2);
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3313 %! assert (rows (s) == 2);
27477
b470734a025e Return an empty string from rats when input is empty (bug #57004).
Rik <rik@octave.org>
parents: 27476
diff changeset
3314 %! assert (columns (s) == 3 * 6);
b470734a025e Return an empty string from rats when input is empty (bug #57004).
Rik <rik@octave.org>
parents: 27476
diff changeset
3315
b470734a025e Return an empty string from rats when input is empty (bug #57004).
Rik <rik@octave.org>
parents: 27476
diff changeset
3316 %!assert <57004> (rats ([]), '')
27476
b8b1bf5b2bbf Reshape N-D arrays to 2-D arrays within rats() (bug #57003).
Rik <rik@octave.org>
parents: 27475
diff changeset
3317
26111
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084).
Markus Mützel <markus.muetzel@gmx.de>
parents: 26009
diff changeset
3318 */
3e44ed9d50b6 Move rational_approx to liboctave (patch #9084).
Markus Mützel <markus.muetzel@gmx.de>
parents: 26009
diff changeset
3319
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3320 DEFUN (disp, args, nargout,
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3321 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
3322 doc: /* -*- texinfo -*-
24764
36ca11f78553 Document second calling form of disp().
Rik <rik@octave.org>
parents: 23219
diff changeset
3323 @deftypefn {} {} disp (@var{x})
36ca11f78553 Document second calling form of disp().
Rik <rik@octave.org>
parents: 23219
diff changeset
3324 @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
3325 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
3326
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3327 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
3328
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3329 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3330 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3331 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
3332
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3333 @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
3334 @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
3335 @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
3336 @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
3337
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3338 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3339 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
3340
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3341 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
3342 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
3343 @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
3344 @end deftypefn */)
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3345 {
20909
03e4ddd49396 omit unnecessary nargout checks
John W. Eaton <jwe@octave.org>
parents: 20897
diff changeset
3346 if (args.length () != 1)
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3347 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3348
20939
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3349 octave_value_list retval;
b17fda023ca6 maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents: 20925
diff changeset
3350
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3351 octave_value arg = args(0);
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3352
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3353 if (nargout == 0)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3354 arg.print (octave_stdout);
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3355 else
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3356 {
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3357 std::ostringstream buf;
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3358 arg.print (buf);
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
3359 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
3360 }
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3361
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3362 return retval;
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3363 }
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3364
23738
8acd390d16c9 don't use singleton for stream_list object
John W. Eaton <jwe@octave.org>
parents: 23675
diff changeset
3365 DEFMETHOD (fdisp, interp, args, ,
8acd390d16c9 don't use singleton for stream_list object
John W. Eaton <jwe@octave.org>
parents: 23675
diff changeset
3366 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
3367 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
3368 @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
3369 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
3370
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3371 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
3372
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3373 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3374 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3375 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
3376
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3377 @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
3378 @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
3379 @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
3380 @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
3381
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3382 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3383 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
3384 @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
3385 @end deftypefn */)
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3386 {
20819
f428cbe7576f eliminate unnecessary uses of nargin
John W. Eaton <jwe@octave.org>
parents: 20801
diff changeset
3387 if (args.length () != 2)
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3388 print_usage ();
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3389
23738
8acd390d16c9 don't use singleton for stream_list object
John W. Eaton <jwe@octave.org>
parents: 23675
diff changeset
3390 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
3391
8acd390d16c9 don't use singleton for stream_list object
John W. Eaton <jwe@octave.org>
parents: 23675
diff changeset
3392 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
3393
8acd390d16c9 don't use singleton for stream_list object
John W. Eaton <jwe@octave.org>
parents: 23675
diff changeset
3394 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
3395
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3396 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
3397
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3398 octave_value arg = args(1);
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3399
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3400 if (osp)
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3401 arg.print (*osp);
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3402 else
20801
a542a9bf177e eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents: 20555
diff changeset
3403 error ("fdisp: stream FID not open for writing");
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3404
20941
a4f5da7c5463 maint: Replace "octave_value_list ()" with "ovl ()".
Rik <rik@octave.org>
parents: 20940
diff changeset
3405 return ovl ();
3685
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3406 }
9d8306640373 [project @ 2000-06-28 19:25:02 by jwe]
jwe
parents: 3683
diff changeset
3407
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
3408 /*
25108
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3409 ## FIXME: This test writes values to a file, but then never checks them.
9629
e1345a9002e8 pr-output.cc: new test
John W. Eaton <jwe@octave.org>
parents: 9612
diff changeset
3410 %!test
25108
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3411 %! [old_fmt, old_spacing] = format ();
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3412 %! unwind_protect
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3413 %! format short
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3414 %! fd = tmpfile ();
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3415 %! for r = [0, Inf -Inf, NaN]
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3416 %! for i = [0, Inf -Inf, NaN]
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3417 %! fdisp (fd, complex (r, i));
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3418 %! endfor
9629
e1345a9002e8 pr-output.cc: new test
John W. Eaton <jwe@octave.org>
parents: 9612
diff changeset
3419 %! endfor
25108
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3420 %! fclose (fd);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3421 %! unwind_protect_cleanup
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3422 %! format (old_fmt);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3423 %! format (old_spacing);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3424 %! end_unwind_protect
13129
155d7a5e70f5 src/pr-output.cc: Test "format compact"
Ben Abbott <bpabbott@mac.com>
parents: 13112
diff changeset
3425
155d7a5e70f5 src/pr-output.cc: Test "format compact"
Ben Abbott <bpabbott@mac.com>
parents: 13112
diff changeset
3426 %!test
25108
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3427 %! [old_fmt, old_spacing] = format ();
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3428 %! unwind_protect
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3429 %! foo.real = pi * ones (3,20,3);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3430 %! foo.complex = pi * ones (3,20,3) + 1i;
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3431 %! foo.char = repmat ("- Hello World -", [3, 20]);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3432 %! foo.cell = {foo.real, foo.complex, foo.char};
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3433 %! fields = fieldnames (foo);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3434 %! for f = 1:numel (fields)
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3435 %! format loose;
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3436 %! loose = disp (foo.(fields{f}));
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3437 %! format compact;
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3438 %! compact = disp (foo.(fields{f}));
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3439 %! expected = strrep (loose, "\n\n", "\n");
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3440 %! assert (expected, compact);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3441 %! endfor
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3442 %! unwind_protect_cleanup
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3443 %! format (old_fmt);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3444 %! format (old_spacing);
7561fb4ab972 pr-output.cc: Fix BIST tests so that display format is saved & restored.
Rik <rik@octave.org>
parents: 25107
diff changeset
3445 %! end_unwind_protect
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11572
diff changeset
3446 */
9629
e1345a9002e8 pr-output.cc: new test
John W. Eaton <jwe@octave.org>
parents: 9612
diff changeset
3447
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3448 DEFUN (display, args, ,
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3449 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
3450 doc: /* -*- texinfo -*-
23565
3a730821e4a2 doc: Peridoc grammarcheck of documentation.
Rik <rik@octave.org>
parents: 23564
diff changeset
3451 @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
3452 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
3453
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3454 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
3455 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
3456 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
3457
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3458 @example
23182
8a37443f1a7b doc: Document second input argument of display (bug #49794)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23084
diff changeset
3459 myclass (@dots{})
8a37443f1a7b doc: Document second input argument of display (bug #49794)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23084
diff changeset
3460 @end example
8a37443f1a7b doc: Document second input argument of display (bug #49794)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23084
diff changeset
3461
8a37443f1a7b doc: Document second input argument of display (bug #49794)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23084
diff changeset
3462 Or:
8a37443f1a7b doc: Document second input argument of display (bug #49794)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23084
diff changeset
3463
8a37443f1a7b doc: Document second input argument of display (bug #49794)
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23084
diff changeset
3464 @example
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3465 myobj = myclass (@dots{})
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3466 @end example
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3467
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
3468 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
3469 avoid the default output:
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3470
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3471 @example
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3472 @group
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3473 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
3474 @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
3475
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23398
diff changeset
3476 <class myclass>
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3477 @end group
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3478 @end example
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3479
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
3480 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
3481 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
3482 @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
3483
705361dfe353 doc: disp rather than display should be overloaded (bug #50640, bug #50729).
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 23398
diff changeset
3484 @seealso{disp, class, subsref, subsasgn}
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3485 @end deftypefn */)
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3486 {
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3487 int nargin = args.length ();
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3488
23332
7d4ca8c01bbb don't call display methods with more than one argument (bug #50640)
John W. Eaton <jwe@octave.org>
parents: 23220
diff changeset
3489 // 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
3490 // 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
3491 // 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
3492 // 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
3493
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3494 if (nargin < 1 || nargin > 2)
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3495 print_usage ();
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3496
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3497 std::string name;
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3498
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3499 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
3500 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
3501 else
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3502 {
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3503 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
3504 name = names(0);
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3505 }
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3506
23332
7d4ca8c01bbb don't call display methods with more than one argument (bug #50640)
John W. Eaton <jwe@octave.org>
parents: 23220
diff changeset
3507 // 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
3508 // object type.
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3509
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3510 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
3511
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag.
John W. Eaton <jwe@octave.org>
parents: 22921
diff changeset
3512 // 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
3513 // disp is done.
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag.
John W. Eaton <jwe@octave.org>
parents: 22921
diff changeset
3514
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag.
John W. Eaton <jwe@octave.org>
parents: 22921
diff changeset
3515 bool print_newlines = false;
25646
4d565baa475e move libinterp/utils functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 25569
diff changeset
3516 if (octave::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
3517 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
3518
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3519 // 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
3520
23075
4e3d47dc7e25 move parse tree classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 23059
diff changeset
3521 octave::feval ("disp", ovl (value));
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3522
22989
698c1190d790 * pr-output.cc (Fdisplay): Use octave_value::print_name_tag.
John W. Eaton <jwe@octave.org>
parents: 22921
diff changeset
3523 if (print_newlines)
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3524 octave_stdout << std::endl;
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3525
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3526 return ovl ();
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3527 }
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3528
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3529 /*
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3530 %!test
26585
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3531 %! [old_fmt, old_spacing] = format ();
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3532 %! unwind_protect
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3533 %! format short;
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3534 %! str = evalc ("x = 1.1; display (x)");
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
3535 %! assert (str, "x = 1.1000\n");
26585
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3536 %! unwind_protect_cleanup
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3537 %! format (old_fmt);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3538 %! format (old_spacing);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3539 %! end_unwind_protect
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3540
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3541 %!test
26585
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3542 %! [old_fmt, old_spacing] = format ();
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3543 %! unwind_protect
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3544 %! format short;
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3545 %! str = evalc ("display (1.1)");
27458
2f4e8dce06da Don't print leading spaces before scalar values in interpeter (bug #56939)
Rik <rik@octave.org>
parents: 27454
diff changeset
3546 %! assert (str, "1.1000\n");
26585
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3547 %! unwind_protect_cleanup
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3548 %! format (old_fmt);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3549 %! format (old_spacing);
d673b506f382 test: use "format short" in tests depending on output format (bug #55539)
Mike Miller <mtmiller@octave.org>
parents: 26501
diff changeset
3550 %! end_unwind_protect
22898
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3551
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3552 ## Test input validation
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3553 %!error display ()
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3554 %!error display (1,2)
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3555 */
9baa19102908 refactor display and disp functions (bug #49794)
John W. Eaton <jwe@octave.org>
parents: 22881
diff changeset
3556
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
3557 static inline void
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3558 init_format_state (void)
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3559 {
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
3560 free_format = false;
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
3561 plus_format = false;
6788
c81a0f3f5a82 [project @ 2007-07-23 22:05:29 by dbateman]
dbateman
parents: 6670
diff changeset
3562 rat_format = false;
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
3563 bank_format = false;
3608
ccfafa1d8510 [project @ 2000-03-15 08:47:35 by jwe]
jwe
parents: 3568
diff changeset
3564 hex_format = 0;
1309
c0187e1c02f9 [project @ 1995-06-25 04:00:46 by jwe]
jwe
parents: 1282
diff changeset
3565 bit_format = 0;
2387
be4616e36133 [project @ 1996-10-12 18:45:13 by jwe]
jwe
parents: 2317
diff changeset
3566 print_e = false;
4509
9ec494b3eb5f [project @ 2003-09-11 19:08:25 by jwe]
jwe
parents: 4431
diff changeset
3567 print_g = false;
10741
38bdcbb58df7 Add engineering formats. eg 'fomat short eng' (Feature Request #30163)
David Bateman <dbateman@free.fr>
parents: 10706
diff changeset
3568 print_eng = false;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3569 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3570
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3571 static std::string format_string ("short");
24782
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
3572
0eb41237424e more templates for pr-output.cc functions
John W. Eaton <jwe@octave.org>
parents: 24781
diff changeset
3573 static inline void
1755
3a9462b655f1 [project @ 1996-01-22 04:47:22 by jwe]
jwe
parents: 1742
diff changeset
3574 set_format_style (int argc, const string_vector& argv)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3575 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3576 if (--argc == 0)
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3577 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3578 // Special case of no options, reset to default values
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3579 init_format_state ();
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3580 set_output_prec (5);
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3581 format_string = "short";
25107
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
3582 Vcompact_format = false;
27499
2545345f8bd9 Set format to lowercase when called with no arguments.
Rik <rik@octave.org>
parents: 27491
diff changeset
3583 uppercase_format = false;
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3584 return;
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3585 }
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3586
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3587 int idx = 1;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3588 std::string format;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3589
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3590 octave::unwind_protect frame;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3591
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3592 frame.protect_var (bank_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3593 frame.protect_var (bit_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3594 frame.protect_var (free_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3595 frame.protect_var (hex_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3596 frame.protect_var (plus_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3597 frame.protect_var (plus_format_chars);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3598 frame.protect_var (rat_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3599 frame.protect_var (print_e);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3600 frame.protect_var (print_eng);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3601 frame.protect_var (print_g);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3602 frame.protect_var (format_string);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3603 frame.protect_var (Vcompact_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3604 frame.protect_var (uppercase_format);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3605 int prec = output_precision ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3606 frame.add ([prec] (void) { set_output_prec (prec); });
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3607
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3608 format = format_string; // Initialize with existing value
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3609 while (argc-- > 0)
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3610 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3611 std::string arg = argv[idx++];
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3612 std::transform (arg.begin (), arg.end (), arg.begin (), tolower);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3613
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3614 if (arg == "short")
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3615 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3616 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3617 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3618 if (argc > 0)
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3619 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3620 arg = argv[idx];
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3621 if (arg == "e")
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3622 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3623 print_e = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3624 format.append (arg);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3625 argc--; idx++;
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3626 }
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3627 else if (arg == "g")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3628 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3629 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3630 print_g = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3631 format.append (arg);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3632 argc--; idx++;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3633 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3634 else if (arg == "eng")
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3635 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3636 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3637 print_eng = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3638 format.append (arg);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3639 argc--; idx++;
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3640 }
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3641 }
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3642 set_output_prec (5);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3643 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3644 else if (arg == "shorte")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3645 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3646 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3647 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3648 print_e = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3649 set_output_prec (5);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3650 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3651 else if (arg == "shortg")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3652 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3653 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3654 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3655 print_g = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3656 set_output_prec (5);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3657 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3658 else if (arg == "shorteng")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3659 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3660 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3661 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3662 print_eng = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3663 set_output_prec (5);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3664 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3665 else if (arg == "long")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3666 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3667 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3668 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3669 if (argc > 0)
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3670 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3671 arg = argv[idx];
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3672
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3673 if (arg == "e")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3674 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3675 print_e = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3676 format.append (arg);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3677 argc--; idx++;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3678 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3679 else if (arg == "g")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3680 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3681 print_g = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3682 format.append (arg);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3683 argc--; idx++;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3684 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3685 else if (arg == "eng")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3686 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3687 print_eng = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3688 format.append (arg);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3689 argc--; idx++;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3690 }
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3691 }
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3692 set_output_prec (16);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3693 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3694 else if (arg == "longe")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3695 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3696 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3697 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3698 print_e = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3699 set_output_prec (16);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3700 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3701 else if (arg == "longg")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3702 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3703 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3704 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3705 print_g = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3706 set_output_prec (16);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3707 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3708 else if (arg == "longeng")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3709 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3710 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3711 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3712 print_eng = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3713 set_output_prec (16);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3714 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3715 else if (arg == "hex")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3716 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3717 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3718 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3719 hex_format = 1;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3720 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3721 else if (arg == "native-hex")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3722 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3723 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3724 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3725 hex_format = 2;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3726 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3727 else if (arg == "bit")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3728 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3729 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3730 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3731 bit_format = 1;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3732 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3733 else if (arg == "native-bit")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3734 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3735 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3736 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3737 bit_format = 2;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3738 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3739 else if (arg == "+" || arg == "plus")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3740 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3741 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3742 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3743 plus_format = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3744 if (argc > 0)
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3745 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3746 arg = argv[idx];
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3747
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3748 if (arg.length () == 3)
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3749 {
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3750 plus_format_chars = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3751 format.append (arg);
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3752 argc--; idx++;
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3753 }
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3754 else
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3755 plus_format_chars = "+- ";
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3756 }
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3757 else
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3758 plus_format_chars = "+- ";
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3759 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3760 else if (arg == "rat")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3761 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3762 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3763 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3764 rat_format = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3765 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3766 else if (arg == "bank")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3767 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3768 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3769 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3770 bank_format = true;
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3771 }
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3772 else if (arg == "free")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3773 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3774 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3775 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3776 free_format = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3777 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3778 else if (arg == "none")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3779 {
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3780 format = arg;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3781 init_format_state ();
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3782 free_format = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3783 }
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3784 else if (arg == "compact")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3785 Vcompact_format = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3786 else if (arg == "loose")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3787 Vcompact_format = false;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3788 else if (arg == "lowercase")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3789 uppercase_format = false;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3790 else if (arg == "uppercase")
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3791 uppercase_format = true;
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3792 else
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3793 error ("format: unrecognized format state '%s'", arg.c_str ());
27500
1ef42010c53b Allow multiple arguments to format().
Rik <rik@octave.org>
parents: 27499
diff changeset
3794 }
18735
28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 18676
diff changeset
3795
28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 18676
diff changeset
3796 format_string = format;
27518
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3797
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3798 // If successful, discard unwind state information
25479159213b Don't change anything if format() fails during parsing of multiple arguments.
Rik <rik@octave.org>
parents: 27500
diff changeset
3799 frame.discard ();
1
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3800 }
78fd87e624cb [project @ 1993-08-08 01:13:40 by jwe]
jwe
parents:
diff changeset
3801
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3802 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
3803 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
3804 @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
3805 @deftypefnx {} {} format options
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3806 @deftypefnx {} {[@var{format}, @var{formatspacing}, @var{uppercase}] =} format
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3807 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
3808 normal echoing mechanism.
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3809
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3810 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
3811 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
3812 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
3813 @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
3814
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3815 By default, Octave displays 5 significant digits in a human readable form
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3816 (option @samp{short}, option @samp{lowercase}, and option @samp{loose} format
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3817 for matrices). If @code{format} is invoked without any options, this default
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3818 format is restored.
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3819
27521
37f9eb2c05e0 doc: improve format() docstring and NEWS announcement.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 27518
diff changeset
3820 Valid format options for floating point numbers are listed in the following
37f9eb2c05e0 doc: improve format() docstring and NEWS announcement.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 27518
diff changeset
3821 table.
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3822
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3823 @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
3824 @item short
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3825 Fixed point format with 5 significant figures (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
3826
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3827 @item long
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3828 Fixed point format with 16 significant figures.
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3829
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3830 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
3831 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
3832
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3833 @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
3834 @itemx long e
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3835 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
3836 and an exponent (power of 10). The mantissa has 5 significant digits in the
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3837 short format. In the long format, double values are displayed with 16
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3838 significant digits and single values are displayed with 8. For example,
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3839 with the @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
3840
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3841 @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
3842 @itemx long g
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3843 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
3844 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
3845 @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
3846
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3847 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3848 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3849 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3850
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3851 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
3852 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
3853 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
3854 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
3855 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
3856 @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
3857 @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
3858
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3859 @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
3860 @itemx long eng
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3861 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
3862 engineering format, where the exponent is divisible by 3. For example, with
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3863 the @samp{short eng} format, @code{10 * pi} is displayed as @code{31.416e+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
3864
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3865 @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
3866 @itemx none
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3867 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
3868 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
3869 @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
3870 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
3871 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
3872 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
3873 @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
3874 @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
3875
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3876 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
3877 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
3878
24771
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169).
Rik <rik@octave.org>
parents: 24770
diff changeset
3879 @table @asis
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169).
Rik <rik@octave.org>
parents: 24770
diff changeset
3880 @item @qcode{"+"}
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169).
Rik <rik@octave.org>
parents: 24770
diff changeset
3881 @itemx @qcode{"+"} @qcode{"@var{chars}"}
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169).
Rik <rik@octave.org>
parents: 24770
diff changeset
3882 @itemx @code{plus}
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169).
Rik <rik@octave.org>
parents: 24770
diff changeset
3883 @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
3884 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
3885 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
3886 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
3887 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
3888 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
3889
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3890 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
3891 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
3892 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
3893 @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
3894
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3895 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3896 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3897 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3898
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3899 +.-
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3900 -.+
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3901 @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
3902 @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
3903
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3904 @item bank
24771
d277debe9c2f doc: Update format() documentation for "free", "+", "bank" formats (bug #53169).
Rik <rik@octave.org>
parents: 24770
diff changeset
3905 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
3906 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
3907 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
3908
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3909 @item native-hex
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3910 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
3911 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
3912 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
3913 @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
3914
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3915 @item hex
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3916 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
3917 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
3918
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3919 @item native-bit
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3920 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
3921 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
3922
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3923 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3924 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3925 01000000000010010010000111111011
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3926 01010100010001000010110100011000
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3927 @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
3928 @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
3929
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3930 (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
3931 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
3932 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
3933
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3934 @item bit
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3935 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
3936 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
3937
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3938 @item rat
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3939 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
3940 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
3941 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
3942 @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
3943
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3944 The following two options affect the display of scientific and hex notations.
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3945
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3946 @table @code
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3947 @item lowercase (default)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3948 Use a lowercase @samp{e} for the exponent character in scientific notation and
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3949 lowercase @samp{a-f} for the hex digits representing 10-15.
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3950
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3951 @item uppercase
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3952 Use an uppercase @samp{E} for the exponent character in scientific notation and
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3953 uppercase @samp{A-F} for the hex digits representing 10-15.
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3954 @end table
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3955
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3956 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
3957
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3958 @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
3959 @item compact
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3960 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
3961 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
3962
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3963 @item loose (default)
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3964 Insert blank lines above and below column number labels and between matrices to
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3965 produce a more readable output with less 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
3966 @end table
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3967
27522
3912e3a74e31 doc: Use "rightmost" to describe how format() behaves with multiple arguments.
Rik <rik@octave.org>
parents: 27521
diff changeset
3968 If @code{format} is called with multiple competing options, the rightmost one
27521
37f9eb2c05e0 doc: improve format() docstring and NEWS announcement.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 27518
diff changeset
3969 is used. In case of an error the format remains unchanged.
37f9eb2c05e0 doc: improve format() docstring and NEWS announcement.
Kai T. Ohlhus <k.ohlhus@gmail.com>
parents: 27518
diff changeset
3970
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3971 If called with one to three output arguments, and no inputs, return the current
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3972 format, format spacing, and uppercase preference.
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3973
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
3974 @seealso{fixed_point_format, output_precision, split_long_rows, print_empty_dimensions, rats}
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
3975 @end deftypefn */)
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 453
diff changeset
3976 {
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3977 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
3978
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3979 int nargin = args.length ();
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3980
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3981 if (nargout == 0)
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3982 {
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3983 int argc = nargin + 1;
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3984
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3985 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
3986
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3987 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
3988 }
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3989 else
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3990 {
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3991 if (nargin > 0)
25107
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
3992 warning ("format: cannot query and set format at the same time, ignoring set operation");
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
3993
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3994 if (nargout >= 3)
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3995 retval(2) = (uppercase_format ? "uppercase" : "lowercase");
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
3996
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
3997 if (nargout >= 2)
23450
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)".
Rik <rik@octave.org>
parents: 23433
diff changeset
3998 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
3999
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4000 retval(0) = format_string;
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4001 }
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4002
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4003 return retval;
529
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 453
diff changeset
4004 }
7ea224e713cd [project @ 1994-07-20 18:54:27 by jwe]
jwe
parents: 453
diff changeset
4005
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4006 /*
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4007 %!test
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
4008 %! [old_fmt, old_spacing, old_uppercase] = format ();
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4009 %! unwind_protect
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4010 %! ## Test one of the formats
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
4011 %! format long e;
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
4012 %! format uppercase;
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4013 %! str = disp (pi);
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
4014 %! assert (str, "3.141592653589793E+00\n");
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
4015 %! str = disp (single (pi));
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
4016 %! assert (str, "3.1415927E+00\n");
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4017 %! new_fmt = format ();
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
4018 %! assert (new_fmt, "longe");
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4019 %! ## Test resetting format
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4020 %! format compact;
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4021 %! [~, new_spacing] = format ();
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4022 %! assert (new_spacing, "compact");
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4023 %! format;
27499
2545345f8bd9 Set format to lowercase when called with no arguments.
Rik <rik@octave.org>
parents: 27491
diff changeset
4024 %! [new_fmt, new_spacing, new_case] = format ();
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4025 %! assert (new_fmt, "short");
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4026 %! assert (new_spacing, "loose");
27499
2545345f8bd9 Set format to lowercase when called with no arguments.
Rik <rik@octave.org>
parents: 27491
diff changeset
4027 %! assert (new_case, "lowercase");
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4028 %! unwind_protect_cleanup
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4029 %! format (old_fmt);
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4030 %! format (old_spacing);
27491
bea2823affa4 Add new options "uppercase", "lowercase" to format() command.
Rik <rik@octave.org>
parents: 27483
diff changeset
4031 %! format (old_uppercase);
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4032 %! end_unwind_protect
25107
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4033
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4034 %!test <*53427>
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4035 %! [old_fmt, old_spacing] = format ();
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4036 %! unwind_protect
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4037 %! format; # reset format to short and loose
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4038 %! format compact; # set compact format
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4039 %! format long; # set long format
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4040 %! [fmt, spacing] = format ();
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4041 %! assert (fmt, "long");
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4042 %! assert (spacing, "compact");
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4043 %! unwind_protect_cleanup
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4044 %! format (old_fmt);
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4045 %! format (old_spacing);
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4046 %! end_unwind_protect
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4047
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4048 ## Test input validation
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4049 %!test
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4050 %! fail ("fmt = format ('long')", "warning", "cannot query and set format");
13cd142c3f88 Don't reset compact/loose spacing when changing numerical format (Bug #53427).
Rik <rik@octave.org>
parents: 25054
diff changeset
4051
22881
f84aa17075d4 Add Octave-only query mode for format command to find status.
Rik <rik@octave.org>
parents: 22868
diff changeset
4052 */
18735
28eab2d84190 Add callbacks for root properties format and formatspacing (bug #42135).
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 18676
diff changeset
4053
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4054 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
4055 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
4056 @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
4057 @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
4058 @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
4059 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
4060 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
4061
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4062 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
4063 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
4064 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
4065
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4066 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4067 @group
26205
cf037b842a9f doc: Clarify example code in fixed_point_format documentation (bug #55208).
Rik <rik@octave.org>
parents: 26111
diff changeset
4068 fixed_point_format (true)
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4069 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
4070 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4071
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4072 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
4073
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4074 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
4075 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
4076 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
4077 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
4078 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
4079 @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
4080 @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
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 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4083 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
4084 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
4085 @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
4086
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4087 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
4088 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
4089 The original variable value is restored when exiting the function.
24784
4d945f2e5914 eliminate output_max_field width; limit output precision (bug #53167)
John W. Eaton <jwe@octave.org>
parents: 24782
diff changeset
4090 @seealso{format, output_precision}
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4091 @end deftypefn */)
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4092 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4093 return SET_INTERNAL_VARIABLE (fixed_point_format);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4094 }
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4095
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4096 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
4097 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
4098 @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
4099 @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
4100 @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
4101 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
4102 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
4103
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4104 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
4105
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4106 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4107 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
4108 @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
4109
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4110 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4111 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
4112
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4113 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4114 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
4115 @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
4116
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4117 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
4118 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
4119 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
4120 @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
4121 @end deftypefn */)
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4122 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4123 return SET_INTERNAL_VARIABLE (print_empty_dimensions);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4124 }
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4125
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4126 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
4127 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
4128 @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
4129 @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
4130 @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
4131 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
4132 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
4133
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4134 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
4135 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
4136 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
4137 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
4138
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4139 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4140 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4141 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
4142 ans =
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4143
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4144 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
4145
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4146 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
4147 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
4148
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4149 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
4150
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4151 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
4152 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
4153 @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
4154 @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
4155
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21942
diff changeset
4156 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
4157 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
4158 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
4159 @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
4160 @end deftypefn */)
5794
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4161 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4162 return SET_INTERNAL_VARIABLE (split_long_rows);
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe]
jwe
parents: 5775
diff changeset
4163 }