Mercurial > hg > octave-lyh
view liboctave/array/Array-b.cc @ 17136:f72ffae1fcc3
delaunay.m: Fixed matlab compatibility and input check for single matrix (bug #39644)
* scripts/geometry/delaunay.m: check for equal size of X and Y, check for 2 column single matrix input, added 2 tests for these two changes
author | Andreas Weber <andreas.weber@hs-offenburg.de> |
---|---|
date | Thu, 01 Aug 2013 15:16:14 +0200 |
parents | 648dabbb4c6b |
children |
line wrap: on
line source
/* Copyright (C) 1996-2012 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>;