Mercurial > octave

changeset 30099:58fb9432217b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: remove unused code sparse-sort.h, sparse-sort.cc. * sparse-sort.cc, sparse-sort.h: Remove files. * liboctave/util/module.mk: Remove files from build system. * Sparse.cc: Remove #include for "sparse-sort.h".
author Rik <rik@octave.org>
date Wed, 01 Sep 2021 11:44:36 -0700
parents de8ba056e8e2
children 112e70370b71
files liboctave/array/Sparse.cc liboctave/util/module.mk liboctave/util/sparse-sort.cc liboctave/util/sparse-sort.h
diffstat 4 files changed, 0 insertions(+), 128 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/Sparse.cc	Wed Sep 01 09:39:06 2021 -0700
+++ b/liboctave/array/Sparse.cc	Wed Sep 01 11:44:36 2021 -0700
@@ -46,7 +46,6 @@
 #include "oct-locbuf.h"
 
 #include "Sparse.h"
-#include "sparse-sort.h"
 #include "sparse-util.h"
 #include "oct-spparms.h"
 #include "mx-inlines.cc"
--- a/liboctave/util/module.mk	Wed Sep 01 09:39:06 2021 -0700
+++ b/liboctave/util/module.mk	Wed Sep 01 11:44:36 2021 -0700
@@ -36,7 +36,6 @@
   %reldir%/oct-string.h \
   %reldir%/pathsearch.h \
   %reldir%/singleton-cleanup.h \
-  %reldir%/sparse-sort.h \
   %reldir%/sparse-util.h \
   %reldir%/str-vec.h \
   %reldir%/unwind-prot.h \
@@ -84,7 +83,6 @@
   %reldir%/oct-string.cc \
   %reldir%/pathsearch.cc \
   %reldir%/singleton-cleanup.cc \
-  %reldir%/sparse-sort.cc \
   %reldir%/sparse-util.cc \
   %reldir%/str-vec.cc \
   %reldir%/unwind-prot.cc \
--- a/liboctave/util/sparse-sort.cc	Wed Sep 01 09:39:06 2021 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-////////////////////////////////////////////////////////////////////////
-//
-// Copyright (C) 1998-2021 The Octave Project Developers
-//
-// See the file COPYRIGHT.md in the top-level directory of this
-// distribution or <https://octave.org/copyright/>.
-//
-// 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
-// <https://www.gnu.org/licenses/>.
-//
-////////////////////////////////////////////////////////////////////////
-
-#if defined (HAVE_CONFIG_H)
-#  include "config.h"
-#endif
-
-#include <cassert>
-#include <cstring>
-
-#include "oct-sort.cc"
-#include "quit.h"
-
-#include "sparse-sort.h"
-
-// A simple class and instantiation of the octave merge sort class
-// to sort sparse data before matrix creation.  This is significantly
-// faster than using octave_qsort.
-
-bool
-octave_sparse_sidxl_comp (octave_sparse_sort_idxl *i,
-                          octave_sparse_sort_idxl *j)
-{
-  octave_idx_type tmp = i->c - j->c;
-
-  if (tmp < 0)
-    return true;
-  else if (tmp > 0)
-    return false;
-
-  return (i->r < j->r);
-}
-
-template class octave_sort<octave_sparse_sort_idxl *>;
-
-// Need to know the original order of the sorted indexes in
-// sparse assignments, and this class does that
-bool
-octave_idx_vector_comp (octave_idx_vector_sort *i,
-                        octave_idx_vector_sort *j)
-{
-  return (i->i < j->i);
-}
-
-template class octave_sort<octave_idx_vector_sort *>;
--- a/liboctave/util/sparse-sort.h	Wed Sep 01 09:39:06 2021 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-////////////////////////////////////////////////////////////////////////
-//
-// Copyright (C) 1998-2021 The Octave Project Developers
-//
-// See the file COPYRIGHT.md in the top-level directory of this
-// distribution or <https://octave.org/copyright/>.
-//
-// 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
-// <https://www.gnu.org/licenses/>.
-//
-////////////////////////////////////////////////////////////////////////
-
-#if ! defined (octave_sparse_sort_h)
-#define octave_sparse_sort_h 1
-
-#include "octave-config.h"
-
-#include "oct-sort.h"
-
-class
-octave_sparse_sort_idxl
-{
-public:
-
-  octave_idx_type r;
-  octave_idx_type c;
-  octave_idx_type idx;
-};
-
-bool octave_sparse_sidxl_comp (octave_sparse_sort_idxl *i,
-                               octave_sparse_sort_idxl *j);
-
-class
-octave_idx_vector_sort
-{
-public:
-
-  octave_idx_type i;
-  octave_idx_type idx;
-};
-
-bool octave_idx_vector_comp (octave_idx_vector_sort *i,
-                             octave_idx_vector_sort *j);
-
-#endif