Mercurial > hg > octave-lyh
view liboctave/array/Array-fC.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) 1994-2012 John W. Eaton Copyright (C) 2009 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 // Instantiate Arrays of FloatComplex values. #include "oct-cmplx.h" #include "lo-mappers.h" #include "Array.h" #include "Array.cc" #include "oct-sort.cc" template <> inline bool sort_isnan<FloatComplex> (const FloatComplex& x) { return xisnan (x); } static bool nan_ascending_compare (const FloatComplex& x, const FloatComplex& y) { return (xisnan (y) ? ! xisnan (x) : ((std::abs (x) < std::abs (x)) || ((std::abs (x) == std::abs (x)) && (arg (x) < arg (x))))); } static bool nan_descending_compare (const FloatComplex& x, const FloatComplex& y) { return (xisnan (x) ? ! xisnan (y) : ((std::abs (x) > std::abs (x)) || ((std::abs (x) == std::abs (x)) && (arg (x) > arg (x))))); } Array<FloatComplex>::compare_fcn_type safe_comparator (sortmode mode, const Array<FloatComplex>& a, bool allow_chk) { Array<FloatComplex>::compare_fcn_type result = 0; if (allow_chk) { octave_idx_type k = 0; for (; k < a.numel () && ! xisnan (a(k)); k++) ; if (k == a.numel ()) { if (mode == ASCENDING) result = octave_sort<FloatComplex>::ascending_compare; else if (mode == DESCENDING) result = octave_sort<FloatComplex>::descending_compare; } } if (! result) { if (mode == ASCENDING) result = nan_ascending_compare; else if (mode == DESCENDING) result = nan_descending_compare; } return result; } INSTANTIATE_ARRAY_SORT (FloatComplex); INSTANTIATE_ARRAY (FloatComplex, OCTAVE_API); template OCTAVE_API std::ostream& operator << (std::ostream&, const Array<FloatComplex>&); #include "DiagArray2.h" #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<FloatComplex>;