Mercurial > hg > octave-jordi
view liboctave/Array-b.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 | 12df7854fa7c |
children | 72c96de7a403 |
line wrap: on
line source
/* Copyright (C) 1996-2011 John W. Eaton 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 // Instantiate Arrays of bool values. #include "Array.h" #include "Array.cc" #define INLINE_ASCENDING_SORT #define INLINE_DESCENDING_SORT #include "oct-sort.cc" // Specialize bool sorting (aka stable partitioning). template<bool desc> static void do_bool_partition (bool *data, octave_idx_type nel) { octave_idx_type k = 0; for (octave_idx_type i = 0; i < nel; i++) if (data[i] == desc) data[k++] = desc; for (octave_idx_type i = k; i < nel; i++) data[i] = ! desc; } template<bool desc> static void do_bool_partition (bool *data, octave_idx_type *idx, octave_idx_type nel) { // FIXME: This is essentially a simple bucket sort. // Can it be efficiently done by std::partition? OCTAVE_LOCAL_BUFFER (octave_idx_type, jdx, nel); octave_idx_type k = 0, l = 0; for (octave_idx_type i = 0; i < nel; i++) { if (data[i] == desc) { data[k] = desc; idx[k++] = idx[i]; } else jdx[l++] = idx[i]; } for (octave_idx_type i = k; i < nel; i++) { data[i] = ! desc; idx[i] = jdx[i-k]; } } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type nel, std::less<bool>) { do_bool_partition<false> (data, nel); } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type nel, std::greater<bool>) { do_bool_partition<true> (data, nel); } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type *idx, octave_idx_type nel, std::less<bool>) { do_bool_partition<false> (data, idx, nel); } template <> template <> void octave_sort<bool>::sort (bool *data, octave_idx_type *idx, octave_idx_type nel, std::greater<bool>) { do_bool_partition<true> (data, idx, nel); } INSTANTIATE_ARRAY_SORT (bool); INSTANTIATE_ARRAY (bool, OCTAVE_API); template OCTAVE_API std::ostream& operator << (std::ostream&, const Array<bool>&); #include "DiagArray2.h" #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<bool>;