Mercurial > hg > octave-jordi
view liboctave/chMatrix.cc @ 13756:6dfebfa334cb
allow negative data log plots with OpenGL+FLTK graphics (bug #34232)
* mx-inlines.cc (mx_inline_any_positive): New function.
* lo-mappers.h (xpositive_sign (double), xpositive_sign (float)):
New functions.
* fNDArray.h, fNDArray.cc (FloatNDArray::any_element_is_positive):
New function.
* fMatrix.h, fMatrix.cc (FloatMatrix::any_element_is_positive):
New function.
* dNDArray.h, dNDArray.cc (NDArray::any_element_is_positive):
New function.
* dMatrix.h, dMatrix.cc (Matrix::any_element_is_positive):
New function.
* graphics.h.in (log_scaler::do_neg_scale): New function.
(log_scaler::scale (const Matrix&) const,
log_scaler::scale (const NDArray&) const): Call do_neg_scale if no
array elements are positive.
* graphics.cc (axes::properties::get_axis_limits): Omit zero from
positive values for log plots. Correctly widen range for all negative
log plots.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 26 Oct 2011 14:19:54 -0400 |
parents | 0c86ae6f7c34 |
children | 4faef552363d |
line wrap: on
line source
// Matrix manipulations. /* Copyright (C) 1995-2011 John W. Eaton Copyright (C) 2010 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cstring> #include <iostream> #include <string> #include "lo-error.h" #include "str-vec.h" #include "mx-base.h" #include "mx-inlines.cc" #include "mx-op-defs.h" // charMatrix class. charMatrix::charMatrix (char c) : Array<char> () { octave_idx_type nc = 1; octave_idx_type nr = 1; resize (nr, nc); elem (0, 0) = c; } charMatrix::charMatrix (const char *s) : Array<char> () { octave_idx_type nc = s ? strlen (s) : 0; octave_idx_type nr = s && nc > 0 ? 1 : 0; resize (nr, nc); for (octave_idx_type i = 0; i < nc; i++) elem (0, i) = s[i]; } charMatrix::charMatrix (const std::string& s) : Array<char> () { octave_idx_type nc = s.length (); octave_idx_type nr = nc > 0 ? 1 : 0; resize (nr, nc); for (octave_idx_type i = 0; i < nc; i++) elem (0, i) = s[i]; } charMatrix::charMatrix (const string_vector& s, char fill_value) : Array<char> (dim_vector (s.length (), s.max_length ()), fill_value) { octave_idx_type nr = rows (); for (octave_idx_type i = 0; i < nr; i++) { const std::string si = s(i); octave_idx_type nc = si.length (); for (octave_idx_type j = 0; j < nc; j++) elem (i, j) = si[j]; } } bool charMatrix::operator == (const charMatrix& a) const { if (rows () != a.rows () || cols () != a.cols ()) return 0; return mx_inline_equal (length (), data (), a.data ()); } bool charMatrix::operator != (const charMatrix& a) const { return !(*this == a); } charMatrix& charMatrix::insert (const char *s, octave_idx_type r, octave_idx_type c) { if (s) { octave_idx_type s_len = strlen (s); if (r < 0 || r >= rows () || c < 0 || c + s_len - 1 > cols ()) { (*current_liboctave_error_handler) ("range error for insert"); return *this; } for (octave_idx_type i = 0; i < s_len; i++) elem (r, c+i) = s[i]; } return *this; } charMatrix& charMatrix::insert (const charMatrix& a, octave_idx_type r, octave_idx_type c) { Array<char>::insert (a, r, c); return *this; } std::string charMatrix::row_as_string (octave_idx_type r, bool strip_ws) const { std::string retval; octave_idx_type nr = rows (); octave_idx_type nc = cols (); if (r == 0 && nr == 0 && nc == 0) return retval; if (r < 0 || r >= nr) { (*current_liboctave_error_handler) ("range error for row_as_string"); return retval; } retval.resize (nc, '\0'); for (octave_idx_type i = 0; i < nc; i++) retval[i] = elem (r, i); if (strip_ws) { while (--nc >= 0) { char c = retval[nc]; if (c && c != ' ') break; } retval.resize (nc+1); } return retval; } charMatrix charMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const { if (r1 > r2) { octave_idx_type tmp = r1; r1 = r2; r2 = tmp; } if (c1 > c2) { octave_idx_type tmp = c1; c1 = c2; c2 = tmp; } octave_idx_type new_r = r2 - r1 + 1; octave_idx_type new_c = c2 - c1 + 1; charMatrix result (new_r, new_c); for (octave_idx_type j = 0; j < new_c; j++) for (octave_idx_type i = 0; i < new_r; i++) result.elem (i, j) = elem (r1+i, c1+j); return result; } charMatrix charMatrix::diag (octave_idx_type k) const { return Array<char>::diag (k); } // FIXME Do these really belong here? Maybe they should be // in a base class? boolMatrix charMatrix::all (int dim) const { return do_mx_red_op<bool, char> (*this, dim, mx_inline_all); } boolMatrix charMatrix::any (int dim) const { return do_mx_red_op<bool, char> (*this, dim, mx_inline_any); } MS_CMP_OPS (charMatrix, char) MS_BOOL_OPS (charMatrix, char) SM_CMP_OPS (char, charMatrix) SM_BOOL_OPS (char, charMatrix) MM_CMP_OPS (charMatrix, charMatrix) MM_BOOL_OPS (charMatrix, charMatrix)