[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: gnuplot changes affects octave
|
From: |
John W. Eaton |
|
Subject: |
Re: gnuplot changes affects octave |
|
Date: |
Wed, 23 Aug 2006 14:34:29 -0400 |
On 22-Aug-2006, Dmitri A. Sergatskov wrote:
| With data file that looks like that:
|
| address@hidden octave]$ cat a.dat
| 1 2
| 2 4
| nan nan
| 3 6
| 4 8
|
| With gnuplot 4.0
| plot "a.dat" w line
| plot "a.dat" using 1:2 w line
| plot "a.dat" using ($1):($2) w line
|
| all produce the same plot -- line with a break between x=2 and x=3
|
| In gnuplot 4.1 it changed:
|
| plot "a.day" w line
| gives an error message:
| gnuplot> plot "a.dat" w line
| ^
| Bad data on line 3
|
| plot "a.dat" using 1:2 w line
| plots a line w/o a break
|
| plot "a.dat" using ($1):($2) w line
| plots a line w/ a break (the same as gnuplot 4.0)
|
| So I would think the easiest change would be to get octave
| issue "pl 'file' using ($1):($2) w line" ...
OK, then how about the following change (relative to the current CVS,
so it assumes the previous patch has been applied as well)? It
eliminates the strip_nan_and_inf argument completely, allows the
gnuplot plotter to accept ($1):($2) style using clauses, and fixes the
plotting functions to emit them. The only problem I see with this is
that now we don't convert Inf to a large but finite value, so gnuplot
will simply omit any points that include Inf. Is that a problem worth
fixing? If so, then I will have to reinstate some kind of option
here so that Inf is clipped when writing the data, or have the plot
functions clip the data to be plotted (not as ugly, but would force a
copy of the data if it contains Inf values).
I've also appended the changes that are needed for Octave Forge to
handle the modification to the signature of the save_ascii function in
the octave_value class hierarchy.
jwe
liboctave/ChangeLog:
2006-08-23 John W. Eaton <address@hidden>
* dMatrix.cc, dMatrix.h (Matrix::save_ascii): Delete function and decl.
* CMatrix.cc, CMatrix.h (ComplexMatrix::save_ascii): Likewise.
scripts/ChangeLog:
2006-08-23 John W. Eaton <address@hidden>
* plot/__plt__.m: Insert using clauses for all plots.
src/ChangeLog:
2006-08-23 John W. Eaton <address@hidden>
* ov.h (octave_value::save_ascii): Delete strip_nan_and_inf arg.
* ov-base.h, ov-base.cc (octave_base_value::save_ascii): Likewise.
* ov-base-int.h, ov-base-int.cc (octave_base_int_matrix<T>::save_ascii,
octave_base_int_scalar<T>::save_ascii, ): Likewise.
* ov-base-sparse.cc, ov-base-sparse.h
(octave_base_sparse<T>::save_ascii): Likewise.
* ov-bool-mat.cc, ov-bool-mat.h (octave_bool_matrix::save_ascii):
Likewise.
* ov-bool.cc, ov-bool.h (octave_bool::save_ascii): Likewise.
* ov-cell.cc, ov-cell.h (octave_cell::save_ascii): Likewise.
* ov-complex.cc, ov-complex.h (octave_complex::save_ascii): Likewise.
* ov-fcn-handle.cc, ov-fcn-handle.h (octave_fcn_handle::save_ascii):
Likewise.
* ov-fcn-inline.cc, ov-fcn-inline.h (octave_fcn_inline::save_ascii):
Likewise.
* ov-list.cc, ov-list.h (octave_list::save_ascii): Likewise.
* ov-range.cc, ov-range.h (octave_range::save_ascii): Likewise.
* ov-scalar.cc, ov-scalar.h (octave_scalar::save_ascii): Likewise.
* ov-str-mat.cc, ov-str-mat.h (octave_char_matrix_str::save_ascii):
Likewise.
* ov-struct.cc, ov-struct.h (octave_struct::save_ascii): Likewise.
* ov-re-mat.cc, ov-re-mat.cc (octave_matrix::save_ascii): Likewise.
* ov-cx-mat.cc, ov-cx-mat.cc (octave_complex_matrix::save_ascii):
Likewise.
* ov-cx-mat.cc, ov-cx-mat.cc (octave_complex_matrix::save_ascii):
Likewise.
* ov-re-mat.cc, ov-re-mat.cc (octave_matrix::save_ascii): Likewise.
* ls-oct-ascii.cc, ls-oct-ascii.h (save_ascii_data):
Delete strip_nan_and_inf arg.
(save_ascii_data_for_plotting): Delete strip_nan_and_inf arg from
call to save_ascii_data.
* DLD-FUNCTIONS/__gnuplot_raw__.l (handle_using): Accept "(EXPR)"
as components of using clauses.
(enum _toktype): New element DOLLAR.
Accept "$" in lexer.
* ls-oct-ascii.cc (save_ascii_data): Delete arg strip_nan_and_inf.
Change all uses.
* ls-oct-ascii.h (save_three_d): Provide decl.
* load-save.h (save_ascii_data_for_plotting, save_three_d):
Delete decls.
Index: liboctave/CMatrix.cc
===================================================================
RCS file: /cvs/octave/liboctave/CMatrix.cc,v
retrieving revision 1.118
diff -u -u -r1.118 CMatrix.cc
--- liboctave/CMatrix.cc 22 Aug 2006 20:36:56 -0000 1.118
+++ liboctave/CMatrix.cc 23 Aug 2006 18:25:03 -0000
@@ -3464,82 +3464,6 @@
// i/o
-// Used when converting Inf to something that gnuplot can read.
-
-#ifndef OCT_RBV
-#define OCT_RBV DBL_MAX / 100.0
-#endif
-
-std::ostream&
-ComplexMatrix::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
-{
- if (strip_nan_and_inf)
- {
- octave_idx_type nr = rows ();
- octave_idx_type nc = columns ();
-
- for (octave_idx_type i = 0; i < nr; i++)
- {
- if (strip_nan_and_inf)
- {
- for (octave_idx_type j = 0; j < nc; j++)
- {
- Complex c = elem (i, j);
-
- if (xisnan (c))
- {
- if (strip_nan_and_inf == 1)
- goto next_row;
- else if (strip_nan_and_inf == 2)
- goto next_row_with_newline;
- }
- }
- }
-
- for (octave_idx_type j = 0; j < nc; j++)
- {
- Complex c = elem (i, j);
-
- if (strip_nan_and_inf)
- {
- double re = std::real (c);
- double im = std::imag (c);
-
- if (xisinf (re))
- re = re > 0 ? OCT_RBV : -OCT_RBV;
-
- if (xisinf (im))
- im = im > 0 ? OCT_RBV : -OCT_RBV;
-
- c = Complex (re, im);
- }
- else if (! infnan_warned && (xisnan (c) || xisinf (c)))
- {
- (*current_liboctave_warning_handler)
- ("save: Inf or NaN values may not be reloadable");
-
- infnan_warned = true;
- }
-
- octave_write_complex (os, c);
-
- os << " ";
- }
-
- next_row_with_newline:
- os << "\n";
-
- next_row:
- continue;
- }
- }
- else
- os << *this;
-
- return os;
-}
-
std::ostream&
operator << (std::ostream& os, const ComplexMatrix& a)
{
Index: liboctave/CMatrix.h
===================================================================
RCS file: /cvs/octave/liboctave/CMatrix.h,v
retrieving revision 1.58
diff -u -u -r1.58 CMatrix.h
--- liboctave/CMatrix.h 22 Aug 2006 20:36:56 -0000 1.58
+++ liboctave/CMatrix.h 23 Aug 2006 18:25:03 -0000
@@ -319,9 +319,6 @@
// i/o
- std::ostream& save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
-
friend std::ostream& operator << (std::ostream& os, const ComplexMatrix& a);
friend std::istream& operator >> (std::istream& is, ComplexMatrix& a);
Index: liboctave/dMatrix.cc
===================================================================
RCS file: /cvs/octave/liboctave/dMatrix.cc,v
retrieving revision 1.125
diff -u -u -r1.125 dMatrix.cc
--- liboctave/dMatrix.cc 22 Aug 2006 20:36:57 -0000 1.125
+++ liboctave/dMatrix.cc 23 Aug 2006 18:25:04 -0000
@@ -2851,74 +2851,6 @@
return result;
}
-// Used when converting Inf to something that gnuplot can read.
-
-#ifndef OCT_RBV
-#define OCT_RBV DBL_MAX / 100.0
-#endif
-
-std::ostream&
-Matrix::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
-{
- if (strip_nan_and_inf)
- {
- octave_idx_type nr = rows ();
- octave_idx_type nc = columns ();
-
- for (octave_idx_type i = 0; i < nr; i++)
- {
- if (strip_nan_and_inf)
- {
- for (octave_idx_type j = 0; j < nc; j++)
- {
- double d = elem (i, j);
-
- if (xisnan (d))
- {
- if (strip_nan_and_inf == 1)
- goto next_row;
- else if (strip_nan_and_inf == 2)
- goto next_row_with_newline;
- }
- }
- }
-
- for (octave_idx_type j = 0; j < nc; j++)
- {
- double d = elem (i, j);
-
- if (strip_nan_and_inf)
- {
- if (xisinf (d))
- d = d > 0 ? OCT_RBV : -OCT_RBV;
- }
- else if (! infnan_warned && (xisnan (d) || xisinf (d)))
- {
- (*current_liboctave_warning_handler)
- ("save: Inf or NaN values may not be reloadable");
-
- infnan_warned = true;
- }
-
- octave_write_double (os, d);
-
- os << " ";
- }
-
- next_row_with_newline:
- os << "\n";
-
- next_row:
- continue;
- }
- }
- else
- os << *this;
-
- return os;
-}
-
std::ostream&
operator << (std::ostream& os, const Matrix& a)
{
Index: liboctave/dMatrix.h
===================================================================
RCS file: /cvs/octave/liboctave/dMatrix.h,v
retrieving revision 1.65
diff -u -u -r1.65 dMatrix.h
--- liboctave/dMatrix.h 22 Aug 2006 20:36:57 -0000 1.65
+++ liboctave/dMatrix.h 23 Aug 2006 18:25:04 -0000
@@ -274,9 +274,6 @@
// i/o
- std::ostream& save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
-
friend std::ostream& operator << (std::ostream& os, const Matrix& a);
friend std::istream& operator >> (std::istream& is, Matrix& a);
Index: scripts/plot/__plt__.m
===================================================================
RCS file: /cvs/octave/scripts/plot/__plt__.m,v
retrieving revision 1.37
diff -u -u -r1.37 __plt__.m
--- scripts/plot/__plt__.m 5 Apr 2006 19:28:35 -0000 1.37
+++ scripts/plot/__plt__.m 23 Aug 2006 18:25:05 -0000
@@ -93,17 +93,19 @@
if (have_data)
if (iscell
(__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{j}))
for i = 1:length
(__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{j})
+ usingstr = make_using_clause
(__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{j}{i});
__plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__} \
- = sprintf ("%s%s
__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{%d}{%d}
%s",
+ = sprintf ("%s%s
__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{%d}{%d} %s
%s",
__plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__},
- __plot_command_sep__, j, i, fmtstr{i});
+ __plot_command_sep__, j, i, usingstr, fmtstr{i});
__plot_command_sep__ = ",\\\n";
endfor
else
+ usingstr = make_using_clause
(__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{j});
__plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__} \
- = sprintf ("%s%s
__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{%d} %s",
+ = sprintf ("%s%s
__plot_data__{__current_figure__}{__multiplot_xi__,__multiplot_yi__}{%d} %s %s",
__plot_command__{__current_figure__}{__multiplot_xi__,__multiplot_yi__},
- __plot_command_sep__, j, fmtstr);
+ __plot_command_sep__, j, usingstr, fmtstr);
__plot_command_sep__ = ",\\\n";
endif
j++;
@@ -127,4 +129,16 @@
usage (msg);
endif
-endfunction
+## endfunction
+
+function usingstr = make_using_clause (x)
+ cols = columns (x);
+ if (cols > 0)
+ usingstr = strcat (gnuplot_command_using, " ($1)");
+ for k = 2:cols
+ usingstr = sprintf ("%s:($%d)", usingstr, k);
+ endfor
+ else
+ usingstr = "";
+ endif
+## endfunction
Index: src/load-save.cc
===================================================================
RCS file: /cvs/octave/src/load-save.cc,v
retrieving revision 1.216
diff -u -u -r1.216 load-save.cc
--- src/load-save.cc 18 Aug 2006 06:06:53 -0000 1.216
+++ src/load-save.cc 23 Aug 2006 18:25:09 -0000
@@ -993,7 +993,7 @@
switch (fmt)
{
case LS_ASCII:
- save_ascii_data (os, tc, name, infnan_warned, false, global, 0);
+ save_ascii_data (os, tc, name, infnan_warned, global, 0);
break;
case LS_BINARY:
Index: src/load-save.h
===================================================================
RCS file: /cvs/octave/src/load-save.h,v
retrieving revision 1.23
diff -u -u -r1.23 load-save.h
--- src/load-save.h 18 Aug 2006 06:06:53 -0000 1.23
+++ src/load-save.h 23 Aug 2006 18:25:09 -0000
@@ -45,14 +45,6 @@
LS_UNKNOWN
};
-extern bool
-save_ascii_data_for_plotting (std::ostream& os, const octave_value& t,
- const std::string& name = std::string ());
-
-extern bool
-save_three_d (std::ostream& os, const octave_value& t,
- bool parametric = false);
-
extern void dump_octave_core (void);
extern int
Index: src/ls-oct-ascii.cc
===================================================================
RCS file: /cvs/octave/src/ls-oct-ascii.cc,v
retrieving revision 1.17
diff -u -u -r1.17 ls-oct-ascii.cc
--- src/ls-oct-ascii.cc 22 Aug 2006 20:36:57 -0000 1.17
+++ src/ls-oct-ascii.cc 23 Aug 2006 18:25:09 -0000
@@ -307,12 +307,6 @@
// flag MARK_AS_GLOBAL on stream OS in the plain text format described
// above for load_ascii_data. If NAME is empty, the name: line is not
// generated. PRECISION specifies the number of decimal digits to print.
-// If STRIP_NAN_AND_INF is 1, rows containing NaNs are deleted,
-// and Infinite values are converted to +/-OCT_RBV (A Real Big Value,
-// but not so big that gnuplot can't handle it when trying to compute
-// axis ranges, etc.). If STRIP_NAN_AND_INF is 2, rows containing
-// NaNs are converted to blank lines in the output file and infinite
-// values are converted to +/-OCT_RBV.
//
// Assumes ranges and strings cannot contain Inf or NaN values.
//
@@ -323,8 +317,7 @@
bool
save_ascii_data (std::ostream& os, const octave_value& val_arg,
const std::string& name, bool& infnan_warned,
- int strip_nan_and_inf, bool mark_as_global,
- int precision)
+ bool mark_as_global, int precision)
{
bool success = true;
@@ -344,7 +337,7 @@
long old_precision = os.precision ();
os.precision (precision);
- success = val . save_ascii (os, infnan_warned, strip_nan_and_inf);
+ success = val . save_ascii (os, infnan_warned);
os.precision (old_precision);
@@ -357,7 +350,7 @@
{
bool infnan_warned = true;
- return save_ascii_data (os, t, name, infnan_warned, 2, false, 0);
+ return save_ascii_data (os, t, name, infnan_warned, false, 0);
}
// Maybe this should be a static function in tree-plot.cc?
Index: src/ls-oct-ascii.h
===================================================================
RCS file: /cvs/octave/src/ls-oct-ascii.h,v
retrieving revision 1.9
diff -u -u -r1.9 ls-oct-ascii.h
--- src/ls-oct-ascii.h 22 Aug 2006 20:36:57 -0000 1.9
+++ src/ls-oct-ascii.h 23 Aug 2006 18:25:09 -0000
@@ -51,13 +51,16 @@
extern bool
save_ascii_data (std::ostream& os, const octave_value& val_arg,
const std::string& name, bool& infnan_warned,
- int strip_nan_and_inf, bool mark_as_global,
- int precision);
+ bool mark_as_global, int precision);
extern bool
save_ascii_data_for_plotting (std::ostream& os, const octave_value& t,
const std::string& name);
+extern bool
+save_three_d (std::ostream& os, const octave_value& t,
+ bool parametric = false);
+
// Match KEYWORD on stream IS, placing the associated value in VALUE,
// returning TRUE if successful and FALSE otherwise.
//
Index: src/ov-base-int.cc
===================================================================
RCS file: /cvs/octave/src/ov-base-int.cc,v
retrieving revision 1.11
diff -u -u -r1.11 ov-base-int.cc
--- src/ov-base-int.cc 22 Aug 2006 20:36:57 -0000 1.11
+++ src/ov-base-int.cc 23 Aug 2006 18:25:09 -0000
@@ -70,7 +70,7 @@
template <class T>
bool
-octave_base_int_matrix<T>::save_ascii (std::ostream& os, bool&, int)
+octave_base_int_matrix<T>::save_ascii (std::ostream& os, bool&)
{
dim_vector d = this->dims ();
@@ -331,7 +331,7 @@
template <class T>
bool
-octave_base_int_scalar<T>::save_ascii (std::ostream& os, bool& , int)
+octave_base_int_scalar<T>::save_ascii (std::ostream& os, bool&)
{
os << this->scalar << "\n";
return true;
Index: src/ov-base-int.h
===================================================================
RCS file: /cvs/octave/src/ov-base-int.h,v
retrieving revision 1.6
diff -u -u -r1.6 ov-base-int.h
--- src/ov-base-int.h 22 Aug 2006 20:36:57 -0000 1.6
+++ src/ov-base-int.h 23 Aug 2006 18:25:09 -0000
@@ -67,8 +67,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
@@ -109,7 +108,7 @@
// void decrement (void) { scalar -= 1; }
- bool save_ascii (std::ostream& os, bool&, int);
+ bool save_ascii (std::ostream& os, bool&);
bool load_ascii (std::istream& is);
Index: src/ov-base-sparse.cc
===================================================================
RCS file: /cvs/octave/src/ov-base-sparse.cc,v
retrieving revision 1.12
diff -u -u -r1.12 ov-base-sparse.cc
--- src/ov-base-sparse.cc 22 Aug 2006 20:36:57 -0000 1.12
+++ src/ov-base-sparse.cc 23 Aug 2006 18:25:09 -0000
@@ -295,7 +295,7 @@
template <class T>
bool
-octave_base_sparse<T>::save_ascii (std::ostream& os, bool&, int)
+octave_base_sparse<T>::save_ascii (std::ostream& os, bool&)
{
dim_vector dv = this->dims ();
Index: src/ov-base-sparse.h
===================================================================
RCS file: /cvs/octave/src/ov-base-sparse.h,v
retrieving revision 1.14
diff -u -u -r1.14 ov-base-sparse.h
--- src/ov-base-sparse.h 22 Aug 2006 20:36:57 -0000 1.14
+++ src/ov-base-sparse.h 23 Aug 2006 18:25:09 -0000
@@ -141,8 +141,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-base.cc
===================================================================
RCS file: /cvs/octave/src/ov-base.cc,v
retrieving revision 1.88
diff -u -u -r1.88 ov-base.cc
--- src/ov-base.cc 22 Aug 2006 20:36:57 -0000 1.88
+++ src/ov-base.cc 23 Aug 2006 18:25:09 -0000
@@ -815,7 +815,7 @@
}
bool
-octave_base_value::save_ascii (std::ostream&, bool&, int)
+octave_base_value::save_ascii (std::ostream&, bool&)
{
gripe_wrong_type_arg ("octave_base_value::save_ascii()", type_name ());
return false;
Index: src/ov-base.h
===================================================================
RCS file: /cvs/octave/src/ov-base.h,v
retrieving revision 1.98
diff -u -u -r1.98 ov-base.h
--- src/ov-base.h 22 Aug 2006 20:36:57 -0000 1.98
+++ src/ov-base.h 23 Aug 2006 18:25:09 -0000
@@ -414,8 +414,7 @@
virtual void print_info (std::ostream& os, const std::string& prefix) const;
- virtual bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ virtual bool save_ascii (std::ostream& os, bool& infnan_warned);
virtual bool load_ascii (std::istream& is);
Index: src/ov-bool-mat.cc
===================================================================
RCS file: /cvs/octave/src/ov-bool-mat.cc,v
retrieving revision 1.41
diff -u -u -r1.41 ov-bool-mat.cc
--- src/ov-bool-mat.cc 22 Aug 2006 20:36:57 -0000 1.41
+++ src/ov-bool-mat.cc 23 Aug 2006 18:25:09 -0000
@@ -149,8 +149,7 @@
}
bool
-octave_bool_matrix::save_ascii (std::ostream& os, bool& /* infnan_warned */,
- int /* strip_nan_and_inf */)
+octave_bool_matrix::save_ascii (std::ostream& os, bool& /* infnan_warned */)
{
dim_vector d = dims ();
if (d.length () > 2)
Index: src/ov-bool-mat.h
===================================================================
RCS file: /cvs/octave/src/ov-bool-mat.h,v
retrieving revision 1.46
diff -u -u -r1.46 ov-bool-mat.h
--- src/ov-bool-mat.h 22 Aug 2006 20:36:57 -0000 1.46
+++ src/ov-bool-mat.h 23 Aug 2006 18:25:09 -0000
@@ -164,8 +164,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-bool.cc
===================================================================
RCS file: /cvs/octave/src/ov-bool.cc,v
retrieving revision 1.31
diff -u -u -r1.31 ov-bool.cc
--- src/ov-bool.cc 22 Aug 2006 20:36:57 -0000 1.31
+++ src/ov-bool.cc 23 Aug 2006 18:25:09 -0000
@@ -133,8 +133,7 @@
}
bool
-octave_bool::save_ascii (std::ostream& os, bool& /* infnan_warned */,
- int /* strip_nan_and_inf */)
+octave_bool::save_ascii (std::ostream& os, bool& /* infnan_warned */)
{
double d = double_value ();
Index: src/ov-bool.h
===================================================================
RCS file: /cvs/octave/src/ov-bool.h,v
retrieving revision 1.37
diff -u -u -r1.37 ov-bool.h
--- src/ov-bool.h 22 Aug 2006 20:36:57 -0000 1.37
+++ src/ov-bool.h 23 Aug 2006 18:25:09 -0000
@@ -156,8 +156,7 @@
octave_value convert_to_str_internal (bool pad, bool force, char type) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-cell.cc
===================================================================
RCS file: /cvs/octave/src/ov-cell.cc,v
retrieving revision 1.71
diff -u -u -r1.71 ov-cell.cc
--- src/ov-cell.cc 22 Aug 2006 20:36:57 -0000 1.71
+++ src/ov-cell.cc 23 Aug 2006 18:25:09 -0000
@@ -433,8 +433,7 @@
#define CELL_ELT_TAG "<cell-element>"
bool
-octave_cell::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
+octave_cell::save_ascii (std::ostream& os, bool& infnan_warned)
{
dim_vector d = dims ();
if (d.length () > 2)
@@ -453,7 +452,7 @@
// Recurse to print sub-value.
bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, infnan_warned,
- strip_nan_and_inf, 0, 0);
+ false, 0);
if (! b)
return os;
@@ -476,8 +475,7 @@
// Recurse to print sub-value.
bool b = save_ascii_data (os, o_val, CELL_ELT_TAG,
- infnan_warned,
- strip_nan_and_inf, 0, 0);
+ infnan_warned, false, 0);
if (! b)
return os;
Index: src/ov-cell.h
===================================================================
RCS file: /cvs/octave/src/ov-cell.h,v
retrieving revision 1.33
diff -u -u -r1.33 ov-cell.h
--- src/ov-cell.h 22 Aug 2006 20:36:57 -0000 1.33
+++ src/ov-cell.h 23 Aug 2006 18:25:09 -0000
@@ -113,8 +113,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-complex.cc
===================================================================
RCS file: /cvs/octave/src/ov-complex.cc,v
retrieving revision 1.38
diff -u -u -r1.38 ov-complex.cc
--- src/ov-complex.cc 22 Aug 2006 20:36:57 -0000 1.38
+++ src/ov-complex.cc 23 Aug 2006 18:25:09 -0000
@@ -176,43 +176,19 @@
}
bool
-octave_complex::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
+octave_complex::save_ascii (std::ostream& os, bool& infnan_warned)
{
Complex c = complex_value ();
- if (strip_nan_and_inf)
+ if (! infnan_warned && (xisnan (c) || xisinf (c)))
{
- if (xisnan (c))
- {
- error ("only value to plot is NaN");
- return false;
- }
- else
- {
- double re = real (c);
- double im = imag (c);
-
- re = xisinf (re) ? (re > 0 ? OCT_RBV : -OCT_RBV) : re;
- im = xisinf (im) ? (im > 0 ? OCT_RBV : -OCT_RBV) : im;
-
- c = Complex (re, im);
-
- octave_write_complex (os, c);
- os << "\n";
- }
- }
- else
- {
- if (! infnan_warned && (xisnan (c) || xisinf (c)))
- {
- warning ("save: Inf or NaN values may not be reloadable");
- infnan_warned = true;
- }
-
- octave_write_complex (os, c);
- os << "\n";
+ warning ("save: Inf or NaN values may not be reloadable");
+ infnan_warned = true;
}
+
+ octave_write_complex (os, c);
+
+ os << "\n";
return true;
}
Index: src/ov-complex.h
===================================================================
RCS file: /cvs/octave/src/ov-complex.h,v
retrieving revision 1.38
diff -u -u -r1.38 ov-complex.h
--- src/ov-complex.h 22 Aug 2006 20:36:57 -0000 1.38
+++ src/ov-complex.h 23 Aug 2006 18:25:09 -0000
@@ -116,8 +116,7 @@
void decrement (void) { scalar -= 1.0; }
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-cx-mat.cc
===================================================================
RCS file: /cvs/octave/src/ov-cx-mat.cc,v
retrieving revision 1.54
diff -u -u -r1.54 ov-cx-mat.cc
--- src/ov-cx-mat.cc 22 Aug 2006 20:36:57 -0000 1.54
+++ src/ov-cx-mat.cc 23 Aug 2006 18:25:09 -0000
@@ -201,21 +201,14 @@
}
bool
-octave_complex_matrix::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
+octave_complex_matrix::save_ascii (std::ostream& os, bool& infnan_warned)
{
dim_vector d = dims ();
if (d.length () > 2)
{
ComplexNDArray tmp = complex_array_value ();
- if (strip_nan_and_inf)
- {
- warning ("save: Can not strip Inf or NaN values");
- warning ("save: Inf or NaN values may not be reloadable");
- infnan_warned = true;
- }
- else if (! infnan_warned && tmp.any_element_is_inf_or_nan ())
+ if (! infnan_warned && tmp.any_element_is_inf_or_nan ())
{
warning ("save: Inf or NaN values may not be reloadable");
infnan_warned = true;
@@ -235,9 +228,7 @@
os << "# rows: " << rows () << "\n"
<< "# columns: " << columns () << "\n";
- ComplexMatrix tmp = complex_matrix_value ();
-
- tmp.save_ascii (os, infnan_warned, strip_nan_and_inf);
+ os << complex_matrix_value ();
}
return true;
Index: src/ov-cx-mat.h
===================================================================
RCS file: /cvs/octave/src/ov-cx-mat.h,v
retrieving revision 1.43
diff -u -u -r1.43 ov-cx-mat.h
--- src/ov-cx-mat.h 22 Aug 2006 20:36:57 -0000 1.43
+++ src/ov-cx-mat.h 23 Aug 2006 18:25:09 -0000
@@ -120,8 +120,7 @@
void decrement (void) { matrix -= Complex (1.0); }
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-fcn-handle.cc
===================================================================
RCS file: /cvs/octave/src/ov-fcn-handle.cc,v
retrieving revision 1.31
diff -u -u -r1.31 ov-fcn-handle.cc
--- src/ov-fcn-handle.cc 22 Aug 2006 20:36:57 -0000 1.31
+++ src/ov-fcn-handle.cc 23 Aug 2006 18:25:09 -0000
@@ -144,7 +144,7 @@
}
bool
-octave_fcn_handle::save_ascii (std::ostream& os, bool&, int)
+octave_fcn_handle::save_ascii (std::ostream& os, bool&)
{
os << nm << "\n";
Index: src/ov-fcn-handle.h
===================================================================
RCS file: /cvs/octave/src/ov-fcn-handle.h,v
retrieving revision 1.21
diff -u -u -r1.21 ov-fcn-handle.h
--- src/ov-fcn-handle.h 22 Aug 2006 20:36:57 -0000 1.21
+++ src/ov-fcn-handle.h 23 Aug 2006 18:25:09 -0000
@@ -84,8 +84,7 @@
std::string fcn_name (void) const { return nm; }
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-fcn-inline.cc
===================================================================
RCS file: /cvs/octave/src/ov-fcn-inline.cc,v
retrieving revision 1.27
diff -u -u -r1.27 ov-fcn-inline.cc
--- src/ov-fcn-inline.cc 22 Aug 2006 20:36:57 -0000 1.27
+++ src/ov-fcn-inline.cc 23 Aug 2006 18:25:09 -0000
@@ -90,7 +90,7 @@
}
bool
-octave_fcn_inline::save_ascii (std::ostream& os, bool&, int)
+octave_fcn_inline::save_ascii (std::ostream& os, bool&)
{
os << "# nargs: " << ifargs.length () << "\n";
for (int i = 0; i < ifargs.length (); i++)
Index: src/ov-fcn-inline.h
===================================================================
RCS file: /cvs/octave/src/ov-fcn-inline.h,v
retrieving revision 1.10
diff -u -u -r1.10 ov-fcn-inline.h
--- src/ov-fcn-inline.h 22 Aug 2006 20:36:57 -0000 1.10
+++ src/ov-fcn-inline.h 23 Aug 2006 18:25:09 -0000
@@ -65,8 +65,7 @@
octave_value convert_to_str_internal (bool, bool, char) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-list.cc
===================================================================
RCS file: /cvs/octave/src/ov-list.cc,v
retrieving revision 1.55
diff -u -u -r1.55 ov-list.cc
--- src/ov-list.cc 22 Aug 2006 20:36:57 -0000 1.55
+++ src/ov-list.cc 23 Aug 2006 18:25:09 -0000
@@ -538,8 +538,7 @@
}
bool
-octave_list::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
+octave_list::save_ascii (std::ostream& os, bool& infnan_warned)
{
octave_value_list lst = list_value ();
os << "# length: " << lst.length () << "\n";
@@ -552,8 +551,8 @@
buf << "_" << i;
std::string s = buf.str ();
- bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned,
- strip_nan_and_inf, 0, 0);
+ bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned,
+ false, 0);
if (! b)
return false;
Index: src/ov-list.h
===================================================================
RCS file: /cvs/octave/src/ov-list.h,v
retrieving revision 1.30
diff -u -u -r1.30 ov-list.h
--- src/ov-list.h 22 Aug 2006 20:36:57 -0000 1.30
+++ src/ov-list.h 23 Aug 2006 18:25:09 -0000
@@ -99,8 +99,7 @@
bool print_name_tag (std::ostream& os, const std::string& name) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-range.cc
===================================================================
RCS file: /cvs/octave/src/ov-range.cc,v
retrieving revision 1.51
diff -u -u -r1.51 ov-range.cc
--- src/ov-range.cc 22 Aug 2006 20:36:57 -0000 1.51
+++ src/ov-range.cc 23 Aug 2006 18:25:09 -0000
@@ -285,8 +285,7 @@
}
bool
-octave_range::save_ascii (std::ostream& os, bool& /* infnan_warned */,
- int /* strip_nan_and_inf */)
+octave_range::save_ascii (std::ostream& os, bool& /* infnan_warned */)
{
Range r = range_value ();
double base = r.base ();
Index: src/ov-range.h
===================================================================
RCS file: /cvs/octave/src/ov-range.h,v
retrieving revision 1.58
diff -u -u -r1.58 ov-range.h
--- src/ov-range.h 22 Aug 2006 20:36:57 -0000 1.58
+++ src/ov-range.h 23 Aug 2006 18:25:10 -0000
@@ -186,8 +186,7 @@
bool print_name_tag (std::ostream& os, const std::string& name) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-re-mat.cc
===================================================================
RCS file: /cvs/octave/src/ov-re-mat.cc,v
retrieving revision 1.65
diff -u -u -r1.65 ov-re-mat.cc
--- src/ov-re-mat.cc 22 Aug 2006 20:36:57 -0000 1.65
+++ src/ov-re-mat.cc 23 Aug 2006 18:25:10 -0000
@@ -255,21 +255,15 @@
}
bool
-octave_matrix::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
+octave_matrix::save_ascii (std::ostream& os, bool& infnan_warned)
{
dim_vector d = dims ();
+
if (d.length () > 2)
{
NDArray tmp = array_value ();
- if (strip_nan_and_inf)
- {
- warning ("save: Can not strip Inf or NaN values");
- warning ("save: Inf or NaN values may not be reloadable");
- infnan_warned = true;
- }
- else if (! infnan_warned && tmp.any_element_is_inf_or_nan ())
+ if (! infnan_warned && tmp.any_element_is_inf_or_nan ())
{
warning ("save: Inf or NaN values may not be reloadable");
infnan_warned = true;
@@ -289,9 +283,7 @@
os << "# rows: " << rows () << "\n"
<< "# columns: " << columns () << "\n";
- Matrix tmp = matrix_value ();
-
- tmp.save_ascii (os, infnan_warned, strip_nan_and_inf);
+ os << matrix_value ();
}
return true;
Index: src/ov-re-mat.h
===================================================================
RCS file: /cvs/octave/src/ov-re-mat.h,v
retrieving revision 1.56
diff -u -u -r1.56 ov-re-mat.h
--- src/ov-re-mat.h 22 Aug 2006 20:36:57 -0000 1.56
+++ src/ov-re-mat.h 23 Aug 2006 18:25:10 -0000
@@ -155,8 +155,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-scalar.cc
===================================================================
RCS file: /cvs/octave/src/ov-scalar.cc,v
retrieving revision 1.37
diff -u -u -r1.37 ov-scalar.cc
--- src/ov-scalar.cc 22 Aug 2006 20:36:57 -0000 1.37
+++ src/ov-scalar.cc 23 Aug 2006 18:25:10 -0000
@@ -156,36 +156,19 @@
}
bool
-octave_scalar::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
+octave_scalar::save_ascii (std::ostream& os, bool& infnan_warned)
{
double d = double_value ();
- if (strip_nan_and_inf)
+ if (! infnan_warned && (xisnan (d) || xisinf (d)))
{
- if (xisnan (d))
- {
- error ("only value to plot is NaN");
- return false;
- }
- else
- {
- d = xisinf (d) ? (d > 0 ? OCT_RBV : -OCT_RBV) : d;
- octave_write_double (os, d);
- os << "\n";
- }
+ warning ("save: Inf or NaN values may not be reloadable");
+ infnan_warned = true;
}
- else
- {
- if (! infnan_warned && (xisnan (d) || xisinf (d)))
- {
- warning ("save: Inf or NaN values may not be reloadable");
- infnan_warned = true;
- }
- octave_write_double (os, d);
- os << "\n";
- }
+ octave_write_double (os, d);
+
+ os << "\n";
return true;
}
Index: src/ov-scalar.h
===================================================================
RCS file: /cvs/octave/src/ov-scalar.h,v
retrieving revision 1.48
diff -u -u -r1.48 ov-scalar.h
--- src/ov-scalar.h 22 Aug 2006 20:36:57 -0000 1.48
+++ src/ov-scalar.h 23 Aug 2006 18:25:10 -0000
@@ -186,8 +186,7 @@
void decrement (void) { --scalar; }
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-str-mat.cc
===================================================================
RCS file: /cvs/octave/src/ov-str-mat.cc,v
retrieving revision 1.65
diff -u -u -r1.65 ov-str-mat.cc
--- src/ov-str-mat.cc 22 Aug 2006 20:36:57 -0000 1.65
+++ src/ov-str-mat.cc 23 Aug 2006 18:25:10 -0000
@@ -269,9 +269,7 @@
}
bool
-octave_char_matrix_str::save_ascii (std::ostream& os,
- bool& /* infnan_warned */,
- int /* strip_nan_and_inf */)
+octave_char_matrix_str::save_ascii (std::ostream& os, bool& /* infnan_warned
*/)
{
dim_vector d = dims ();
if (d.length () > 2)
Index: src/ov-str-mat.h
===================================================================
RCS file: /cvs/octave/src/ov-str-mat.h,v
retrieving revision 1.48
diff -u -u -r1.48 ov-str-mat.h
--- src/ov-str-mat.h 22 Aug 2006 20:36:57 -0000 1.48
+++ src/ov-str-mat.h 23 Aug 2006 18:25:10 -0000
@@ -129,8 +129,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov-struct.cc
===================================================================
RCS file: /cvs/octave/src/ov-struct.cc,v
retrieving revision 1.76
diff -u -u -r1.76 ov-struct.cc
--- src/ov-struct.cc 22 Aug 2006 20:36:57 -0000 1.76
+++ src/ov-struct.cc 23 Aug 2006 18:25:10 -0000
@@ -1016,8 +1016,7 @@
}
bool
-octave_struct::save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
+octave_struct::save_ascii (std::ostream& os, bool& infnan_warned)
{
Octave_map m = map_value ();
os << "# length: " << m.length () << "\n";
@@ -1027,8 +1026,7 @@
{
octave_value val = map.contents (i);
- bool b = save_ascii_data (os, val, m.key (i), infnan_warned,
- strip_nan_and_inf, 0, 0);
+ bool b = save_ascii_data (os, val, m.key (i), infnan_warned, false, 0);
if (! b)
return os;
Index: src/ov-struct.h
===================================================================
RCS file: /cvs/octave/src/ov-struct.h,v
retrieving revision 1.38
diff -u -u -r1.38 ov-struct.h
--- src/ov-struct.h 22 Aug 2006 20:36:57 -0000 1.38
+++ src/ov-struct.h 23 Aug 2006 18:25:10 -0000
@@ -117,8 +117,7 @@
bool print_name_tag (std::ostream& os, const std::string& name) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: src/ov.h
===================================================================
RCS file: /cvs/octave/src/ov.h,v
retrieving revision 1.149
diff -u -u -r1.149 ov.h
--- src/ov.h 22 Aug 2006 20:36:57 -0000 1.149
+++ src/ov.h 23 Aug 2006 18:25:10 -0000
@@ -778,9 +778,8 @@
void print_info (std::ostream& os,
const std::string& prefix = std::string ()) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- int strip_nan_and_inf)
- { return rep->save_ascii (os, infnan_warned, strip_nan_and_inf); }
+ bool save_ascii (std::ostream& os, bool& infnan_warned)
+ { return rep->save_ascii (os, infnan_warned); }
bool load_ascii (std::istream& is)
{ return rep->load_ascii (is); }
Index: src/DLD-FUNCTIONS/__gnuplot_raw__.l
===================================================================
RCS file: /cvs/octave/src/DLD-FUNCTIONS/__gnuplot_raw__.l,v
retrieving revision 1.10
diff -u -u -r1.10 __gnuplot_raw__.l
--- src/DLD-FUNCTIONS/__gnuplot_raw__.l 26 May 2006 21:41:33 -0000 1.10
+++ src/DLD-FUNCTIONS/__gnuplot_raw__.l 23 Aug 2006 18:25:10 -0000
@@ -57,7 +57,7 @@
#include "defun-dld.h"
#include "file-io.h"
#include "gripes.h"
-#include "load-save.h"
+#include "ls-oct-ascii.h"
#include "parse.h"
#include "procstream.h"
#include "sighandlers.h"
@@ -76,6 +76,7 @@
SEMICOLON,
COMMA,
QUOTE,
+ DOLLAR,
IDENT,
NUMBER,
BINOP,
@@ -194,6 +195,12 @@
}
}
+"$" {
+ gpt_quote_is_transpose = false;
+ return DOLLAR;
+ }
+
+
"\"" {
return handle_string ('"');
}
@@ -577,13 +584,18 @@
{
expr_str = read_until (colon_plottok_or_end_p, tok);
- tmp_data = eval_string (expr_str, true, status);
- if (status != 0 || ! tmp_data.is_real_scalar ())
- throw gpt_parse_error ();
+ if (! expr_str.empty () && expr_str[0] == '(')
+ retstr += expr_str;
+ else
+ {
+ tmp_data = eval_string (expr_str, true, status);
+ if (status != 0 || ! tmp_data.is_real_scalar ())
+ throw gpt_parse_error ();
- std::ostringstream tmp_buf;
- tmp_data.print_raw (tmp_buf);
- retstr += tmp_buf.str ();
+ std::ostringstream tmp_buf;
+ tmp_data.print_raw (tmp_buf);
+ retstr += tmp_buf.str ();
+ }
if (tok == COLON)
retstr += ":";
Index: main/comm/src/ov-galois.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/src/ov-galois.cc,v
retrieving revision 1.2
diff -u -u -r1.2 ov-galois.cc
--- main/comm/src/ov-galois.cc 21 Aug 2006 20:18:59 -0000 1.2
+++ main/comm/src/ov-galois.cc 23 Aug 2006 18:24:41 -0000
@@ -394,8 +394,7 @@
}
bool
-octave_galois::save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf)
+octave_galois::save_ascii (std::ostream& os, bool& infnan_warned)
{
dim_vector d = dims ();
Matrix tmp = matrix_value ();
Index: main/comm/src/ov-galois.h
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/src/ov-galois.h,v
retrieving revision 1.2
diff -u -u -r1.2 ov-galois.h
--- main/comm/src/ov-galois.h 21 Aug 2006 20:18:59 -0000 1.2
+++ main/comm/src/ov-galois.h 23 Aug 2006 18:24:41 -0000
@@ -137,8 +137,7 @@
int m (void) const { return gval.m(); }
int primpoly (void) const { return gval.primpoly(); }
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: main/fixed/src/ov-fixed-complex.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed-complex.cc,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed-complex.cc
--- main/fixed/src/ov-fixed-complex.cc 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed-complex.cc 23 Aug 2006 18:24:41 -0000
@@ -270,8 +270,7 @@
}
bool
-octave_fixed_complex::save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf)
+octave_fixed_complex::save_ascii (std::ostream& os, bool& infnan_warned)
{
os << scalar.real ().getintsize () << " "
<< scalar.imag ().getintsize () << " "
Index: main/fixed/src/ov-fixed-complex.h
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed-complex.h,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed-complex.h
--- main/fixed/src/ov-fixed-complex.h 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed-complex.h 23 Aug 2006 18:24:41 -0000
@@ -149,8 +149,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: main/fixed/src/ov-fixed-cx-mat.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed-cx-mat.cc,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed-cx-mat.cc
--- main/fixed/src/ov-fixed-cx-mat.cc 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed-cx-mat.cc 23 Aug 2006 18:24:41 -0000
@@ -430,8 +430,7 @@
bool
octave_fixed_complex_matrix::save_ascii (std::ostream& os,
- bool& infnan_warned,
- bool strip_nan_and_inf)
+ bool& infnan_warned)
{
dim_vector d = dims ();
os << "# ndims: " << d.length () << "\n";
Index: main/fixed/src/ov-fixed-cx-mat.h
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed-cx-mat.h,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed-cx-mat.h
--- main/fixed/src/ov-fixed-cx-mat.h 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed-cx-mat.h 23 Aug 2006 18:24:41 -0000
@@ -129,8 +129,7 @@
void decrement (void) { matrix -= FixedPoint(1,0,1,0); }
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned)
bool load_ascii (std::istream& is);
Index: main/fixed/src/ov-fixed-mat.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed-mat.cc,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed-mat.cc
--- main/fixed/src/ov-fixed-mat.cc 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed-mat.cc 23 Aug 2006 18:24:41 -0000
@@ -418,8 +418,7 @@
}
bool
-octave_fixed_matrix::save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf)
+octave_fixed_matrix::save_ascii (std::ostream& os, bool& infnan_warned)
{
dim_vector d = dims ();
os << "# ndims: " << d.length () << "\n";
Index: main/fixed/src/ov-fixed-mat.h
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed-mat.h,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed-mat.h
--- main/fixed/src/ov-fixed-mat.h 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed-mat.h 23 Aug 2006 18:24:41 -0000
@@ -130,8 +130,7 @@
octave_value convert_to_str (bool pad = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);
Index: main/fixed/src/ov-fixed.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed.cc,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed.cc
--- main/fixed/src/ov-fixed.cc 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed.cc 23 Aug 2006 18:24:41 -0000
@@ -234,8 +234,7 @@
}
bool
-octave_fixed::save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf)
+octave_fixed::save_ascii (std::ostream& os, bool& infnan_warned)
{
os << scalar.getintsize () << " "
<< scalar.getdecsize () << " "
Index: main/fixed/src/ov-fixed.h
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/fixed/src/ov-fixed.h,v
retrieving revision 1.2
diff -u -u -r1.2 ov-fixed.h
--- main/fixed/src/ov-fixed.h 22 Aug 2006 20:15:42 -0000 1.2
+++ main/fixed/src/ov-fixed.h 23 Aug 2006 18:24:41 -0000
@@ -136,8 +136,7 @@
void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
- bool save_ascii (std::ostream& os, bool& infnan_warned,
- bool strip_nan_and_inf);
+ bool save_ascii (std::ostream& os, bool& infnan_warned);
bool load_ascii (std::istream& is);