GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-13 12:19:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged in rmlarsen/eigen (pull request PR-597)

Browse Source 
Change licensing of OrderingMethods/Amd.h and SparseCholesky/SimplicialCholesky_impl.h from LGPL to MPL2.

Approved-by: Gael Guennebaud <g.gael@free.fr>
This commit is contained in:
Rasmus Larsen 2019-02-25 17:02:16 +00:00
commit 2ca1e73239
2 changed files with 14 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Eigen/src/OrderingMethods/Amd.h
View File

@ -2,32 +2,22 @@
// for linear algebra. // for linear algebra.
// //
// Copyright (C) 2010 Gael Guennebaud <gael.guennebaud@inria.fr> // Copyright (C) 2010 Gael Guennebaud <gael.guennebaud@inria.fr>
//
// This Source Code Form is subject to the terms of the Mozilla
// Public License v. 2.0. If a copy of the MPL was not distributed
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
/* /*
NOTE: this routine has been adapted from the CSparse library: NOTE: this routine has been adapted from the CSparse library:
Copyright (c) 2006, Timothy A. Davis. Copyright (c) 2006, Timothy A. Davis.
http://www.suitesparse.com http://www.suitesparse.com
CSparse is free software; you can redistribute it and/or The author of CSparse, Timothy A. Davis., has executed a license with Google LLC
modify it under the terms of the GNU Lesser General Public to permit distribution of this code and derivative works as part of Eigen under
License as published by the Free Software Foundation; either the Mozilla Public License v. 2.0, as stated at the top of this file.
version 2.1 of the License, or (at your option) any later version.
CSparse 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this Module; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../Core/util/NonMPL2.h"
#ifndef EIGEN_SPARSE_AMD_H #ifndef EIGEN_SPARSE_AMD_H
#define EIGEN_SPARSE_AMD_H #define EIGEN_SPARSE_AMD_H

39
Eigen/src/SparseCholesky/SimplicialCholesky_impl.h
View File

@ -2,46 +2,21 @@
// for linear algebra. // for linear algebra.
// //
// Copyright (C) 2008-2012 Gael Guennebaud <gael.guennebaud@inria.fr> // Copyright (C) 2008-2012 Gael Guennebaud <gael.guennebaud@inria.fr>
//
// This Source Code Form is subject to the terms of the Mozilla
// Public License v. 2.0. If a copy of the MPL was not distributed
// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
/* /*
NOTE: these functions have been adapted from the LDL library: NOTE: these functions have been adapted from the LDL library:
LDL Copyright (c) 2005 by Timothy A. Davis. All Rights Reserved. LDL Copyright (c) 2005 by Timothy A. Davis. All Rights Reserved.
LDL License: The author of LDL, Timothy A. Davis., has executed a license with Google LLC
to permit distribution of this code and derivative works as part of Eigen under
Your use or distribution of LDL or any modified version of the Mozilla Public License v. 2.0, as stated at the top of this file.
LDL implies that you agree to this License.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
Permission is hereby granted to use or copy this program under the
terms of the GNU LGPL, provided that the Copyright, this License,
and the Availability of the original version is retained on all copies.
User documentation of any code that uses this code or any modified
version of this code must cite the Copyright, this License, the
Availability note, and "Used by permission." Permission to modify
the code and to distribute modified code is granted, provided the
Copyright, this License, and the Availability note are retained,
and a notice that the code was modified is included.
*/ */
#include "../Core/util/NonMPL2.h"
#ifndef EIGEN_SIMPLICIAL_CHOLESKY_IMPL_H #ifndef EIGEN_SIMPLICIAL_CHOLESKY_IMPL_H
#define EIGEN_SIMPLICIAL_CHOLESKY_IMPL_H #define EIGEN_SIMPLICIAL_CHOLESKY_IMPL_H