Mercurial > octave
view liboctave/array/boolSparse.cc @ 27918:b442ec6dda5c
use centralized file for copyright info for individual contributors
* COPYRIGHT.md: New file.
* In most other files, use "Copyright (C) YYYY-YYYY The Octave Project
Developers" instead of tracking individual names in separate source
files. The motivation is to reduce the effort required to update the
notices each year.
Until now, the Octave source files contained copyright notices that
list individual contributors. I adopted these file-scope copyright
notices because that is what everyone was doing 30 years ago in the
days before distributed version control systems. But now, with many
contributors and modern version control systems, having these
file-scope copyright notices causes trouble when we update copyright
years or refactor code.
Over time, the file-scope copyright notices may become outdated as new
contributions are made or code is moved from one file to
another. Sometimes people contribute significant patches but do not
add a line claiming copyright. Other times, people add a copyright
notice for their contribution but then a later refactoring moves part
or all of their contribution to another file and the notice is not
moved with the code. As a practical matter, moving such notices is
difficult -- determining what parts are due to a particular
contributor requires a time-consuming search through the project
history. Even managing the yearly update of copyright years is
problematic. We have some contributors who are no longer
living. Should we update the copyright dates for their contributions
when we release new versions? Probably not, but we do still want to
claim copyright for the project as a whole.
To minimize the difficulty of maintaining the copyright notices, I
would like to change Octave's sources to use what is described here:
https://softwarefreedom.org/resources/2012/ManagingCopyrightInformation.html
in the section "Maintaining centralized copyright notices":
The centralized notice approach consolidates all copyright
notices in a single location, usually a top-level file.
This file should contain all of the copyright notices
provided project contributors, unless the contribution was
clearly insignificant. It may also credit -- without a copyright
notice -- anyone who helped with the project but did not
contribute code or other copyrighted material.
This approach captures less information about contributions
within individual files, recognizing that the DVCS is better
equipped to record those details. As we mentioned before, it
does have one disadvantage as compared to the file-scope
approach: if a single file is separated from the distribution,
the recipient won't see the contributors' copyright notices.
But this can be easily remedied by including a single
copyright notice in each file's header, pointing to the
top-level file:
Copyright YYYY-YYYY The Octave Project Developers
See the COPYRIGHT file at the top-level directory
of this distribution or at https://octave.org/COPYRIGHT.html.
followed by the usual GPL copyright statement.
For more background, see the discussion here:
https://lists.gnu.org/archive/html/octave-maintainers/2020-01/msg00009.html
Most files in the following directories have been skipped intentinally
in this changeset:
doc
libgui/qterminal
liboctave/external
m4
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 06 Jan 2020 15:38:17 -0500 |
parents | 00f796120a6d |
children | 1891570abac8 |
line wrap: on
line source
/* Copyright (C) 1998-2019 The Octave Project Developers See the file COPYRIGHT.md in the top-level directory of this distribution or <https://octave.org/COPYRIGHT.html/>. 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 <istream> #include <ostream> #include <vector> #include "quit.h" #include "lo-ieee.h" #include "lo-mappers.h" #include "boolSparse.h" #include "dSparse.h" #include "oct-locbuf.h" #include "Sparse-op-defs.h" // SparseBoolMatrix class. bool SparseBoolMatrix::operator == (const SparseBoolMatrix& a) const { octave_idx_type nr = rows (); octave_idx_type nc = cols (); octave_idx_type nz = nnz (); octave_idx_type nr_a = a.rows (); octave_idx_type nc_a = a.cols (); octave_idx_type nz_a = a.nnz (); if (nr != nr_a || nc != nc_a || nz != nz_a) return false; for (octave_idx_type i = 0; i < nc + 1; i++) if (cidx (i) != a.cidx (i)) return false; for (octave_idx_type i = 0; i < nz; i++) if (data (i) != a.data (i) || ridx (i) != a.ridx (i)) return false; return true; } bool SparseBoolMatrix::operator != (const SparseBoolMatrix& a) const { return !(*this == a); } SparseBoolMatrix& SparseBoolMatrix::insert (const SparseBoolMatrix& a, octave_idx_type r, octave_idx_type c) { Sparse<bool>::insert (a, r, c); return *this; } SparseBoolMatrix& SparseBoolMatrix::insert (const SparseBoolMatrix& a, const Array<octave_idx_type>& indx) { Sparse<bool>::insert (a, indx); return *this; } SparseBoolMatrix SparseBoolMatrix::concat (const SparseBoolMatrix& rb, const Array<octave_idx_type>& ra_idx) { // Don't use numel to avoid all possiblity of an overflow if (rb.rows () > 0 && rb.cols () > 0) insert (rb, ra_idx(0), ra_idx(1)); return *this; } // unary operations SparseBoolMatrix SparseBoolMatrix::operator ! (void) const { octave_idx_type nr = rows (); octave_idx_type nc = cols (); octave_idx_type nz1 = nnz (); octave_idx_type nz2 = nr*nc - nz1; SparseBoolMatrix r (nr, nc, nz2); octave_idx_type ii = 0; octave_idx_type jj = 0; r.cidx (0) = 0; for (octave_idx_type i = 0; i < nc; i++) { for (octave_idx_type j = 0; j < nr; j++) { if (jj < cidx (i+1) && ridx (jj) == j) jj++; else { r.data (ii) = true; r.ridx (ii++) = j; } } r.cidx (i+1) = ii; } return r; } // other operations // FIXME: Do these really belong here? Maybe they should be in a base class? SparseBoolMatrix SparseBoolMatrix::all (int dim) const { SPARSE_ALL_OP (dim); } SparseBoolMatrix SparseBoolMatrix::any (int dim) const { Sparse<bool> retval; octave_idx_type nr = rows (); octave_idx_type nc = cols (); octave_idx_type nz = nnz (); if (dim == -1) dim = (nr == 1 && nc != 1) ? 1 : 0; if (dim == 0) { // Result is a row vector. retval = Sparse<bool> (1, nc); retval.xcidx (0) = 0; for (octave_idx_type i = 0; i < nc; i++) retval.xcidx (i+1) = retval.xcidx (i) + (cidx (i+1) > cidx (i)); octave_idx_type new_nz = retval.xcidx (nc); retval.change_capacity (new_nz); std::fill_n (retval.ridx (), new_nz, static_cast<octave_idx_type> (0)); std::fill_n (retval.data (), new_nz, true); } else if (dim == 1) { // Result is a column vector. if (nz > nr/4) { // We can use O(nr) memory. Array<bool> tmp (dim_vector (nr, 1), false); for (octave_idx_type i = 0; i < nz; i++) tmp.xelem (ridx (i)) = true; retval = tmp; } else { Array<octave_idx_type> tmp (dim_vector (nz, 1)); std::copy_n (ridx (), nz, tmp.fortran_vec ()); retval = Sparse<bool> (Array<bool> (dim_vector (1, 1), true), idx_vector (tmp), idx_vector (static_cast<octave_idx_type> (0)), nr, 1, false); } } return retval; } SparseMatrix SparseBoolMatrix::sum (int dim) const { Sparse<double> retval; octave_idx_type nr = rows (); octave_idx_type nc = cols (); octave_idx_type nz = nnz (); if (dim == -1) dim = (nr == 1 && nc != 1) ? 1 : 0; if (dim == 0) { // Result is a row vector. retval = Sparse<double> (1, nc); for (octave_idx_type i = 0; i < nc; i++) retval.xcidx (i+1) = retval.xcidx (i) + (cidx (i+1) > cidx (i)); octave_idx_type new_nz = retval.xcidx (nc); retval.change_capacity (new_nz); std::fill_n (retval.ridx (), new_nz, static_cast<octave_idx_type> (0)); for (octave_idx_type i = 0, k = 0; i < nc; i++) { octave_idx_type c = cidx (i+1) - cidx (i); if (c > 0) retval.xdata (k++) = c; } } else if (dim == 1) { // Result is a column vector. if (nz > nr) { // We can use O(nr) memory. Array<double> tmp (dim_vector (nr, 1), 0); for (octave_idx_type i = 0; i < nz; i++) tmp.xelem (ridx (i)) += 1.0; retval = tmp; } else { Array<octave_idx_type> tmp (dim_vector (nz, 1)); std::copy_n (ridx (), nz, tmp.fortran_vec ()); retval = Sparse<double> (Array<double> (dim_vector (1, 1), 1.0), idx_vector (tmp), idx_vector (static_cast<octave_idx_type> (0)), nr, 1); } } return retval; } SparseBoolMatrix SparseBoolMatrix::diag (octave_idx_type k) const { return Sparse<bool>::diag (k); } boolMatrix SparseBoolMatrix::matrix_value (void) const { octave_idx_type nr = rows (); octave_idx_type nc = cols (); boolMatrix retval (nr, nc, false); for (octave_idx_type j = 0; j < nc; j++) for (octave_idx_type i = cidx (j); i < cidx (j+1); i++) retval.elem (ridx (i), j) = data (i); return retval; } std::ostream& operator << (std::ostream& os, const SparseBoolMatrix& a) { octave_idx_type nc = a.cols (); // add one to the printed indices to go from // zero-based to one-based arrays for (octave_idx_type j = 0; j < nc; j++) { octave_quit (); for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) os << a.ridx (i) + 1 << ' ' << j + 1 << ' ' << a.data (i) << "\n"; } return os; } std::istream& operator >> (std::istream& is, SparseBoolMatrix& a) { typedef SparseBoolMatrix::element_type elt_type; return read_sparse_matrix<elt_type> (is, a, octave_read_value<bool>); } SparseBoolMatrix SparseBoolMatrix::squeeze (void) const { return Sparse<bool>::squeeze (); } SparseBoolMatrix SparseBoolMatrix::index (const idx_vector& i, bool resize_ok) const { return Sparse<bool>::index (i, resize_ok); } SparseBoolMatrix SparseBoolMatrix::index (const idx_vector& i, const idx_vector& j, bool resize_ok) const { return Sparse<bool>::index (i, j, resize_ok); } SparseBoolMatrix SparseBoolMatrix::reshape (const dim_vector& new_dims) const { return Sparse<bool>::reshape (new_dims); } SparseBoolMatrix SparseBoolMatrix::permute (const Array<octave_idx_type>& vec, bool inv) const { return Sparse<bool>::permute (vec, inv); } SparseBoolMatrix SparseBoolMatrix::ipermute (const Array<octave_idx_type>& vec) const { return Sparse<bool>::ipermute (vec); } SPARSE_SMS_EQNE_OPS (SparseBoolMatrix, bool) SPARSE_SMS_BOOL_OPS (SparseBoolMatrix, bool) SPARSE_SSM_EQNE_OPS (bool, SparseBoolMatrix) SPARSE_SSM_BOOL_OPS (bool, SparseBoolMatrix) SPARSE_SMSM_EQNE_OPS (SparseBoolMatrix, SparseBoolMatrix) SPARSE_SMSM_BOOL_OPS (SparseBoolMatrix, SparseBoolMatrix)