Mercurial > forge
changeset 12622:c3df6726a661 octave-forge
changes to respond to Carnë Draug's review of sparsersb dated 20150521@18:22 (ticket #172).
| author | michelemartone |
|---|---|
| date | Fri, 29 May 2015 21:12:32 +0000 |
| parents | 1e2a304857c5 |
| children | 8156ed4094df |
| files | main/sparsersb/DESCRIPTION main/sparsersb/INDEX main/sparsersb/PKG_ADD main/sparsersb/bin/demo_sparsersb.m main/sparsersb/bin/lsbench.m main/sparsersb/bin/obench.m main/sparsersb/bin/octavebench.m main/sparsersb/bin/ufsolve.m main/sparsersb/inst/matlabbench.m main/sparsersb/inst/sparsersbbench.m main/sparsersb/inst/sparsersbtester.m main/sparsersb/src/sparsersb.cc |
| diffstat | 12 files changed, 133 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/main/sparsersb/DESCRIPTION Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/DESCRIPTION Fri May 29 21:12:32 2015 +0000 @@ -6,6 +6,6 @@ Title: Interface to the librsb package implementing the RSB sparse matrix format. Description: Interface to the librsb package implementing the RSB sparse matrix format. Depends: octave (>= 4.0.0) -License: GPL version 3 or later +License: GPLv3+ Url: http://librsb.sourceforge.net/ Categories: Sparse Matrix Computations
--- a/main/sparsersb/INDEX Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/INDEX Fri May 29 21:12:32 2015 +0000 @@ -1,4 +1,3 @@ sparsersb >> Interface to the librsb package implementing the RSB sparse matrix format. - sparsersb Support sparsersb
--- a/main/sparsersb/PKG_ADD Wed May 20 12:25:45 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -autoload ("sparsersb", fullfile (fileparts (mfilename ("fullpath")), "sparsersb.oct"));
--- a/main/sparsersb/bin/demo_sparsersb.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/bin/demo_sparsersb.m Fri May 29 21:12:32 2015 +0000 @@ -1,2 +1,19 @@ +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# + # This documentation is yet to be written. disp "This demo is to be written"
--- a/main/sparsersb/bin/lsbench.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/bin/lsbench.m Fri May 29 21:12:32 2015 +0000 @@ -1,3 +1,19 @@ +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# # # Linear Solvers benchmarks using sparsersb. #
--- a/main/sparsersb/bin/obench.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/bin/obench.m Fri May 29 21:12:32 2015 +0000 @@ -1,3 +1,19 @@ +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# 1; # This is a script # once complete, this program will benchmark our matrix implementation against octave's cmt="#";
--- a/main/sparsersb/bin/octavebench.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/bin/octavebench.m Fri May 29 21:12:32 2015 +0000 @@ -1,4 +1,20 @@ #!/usr/bin/octave -q +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# 1; # This is a script # a benchmark program for octave/matlab # TODO: fix output format
--- a/main/sparsersb/bin/ufsolve.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/bin/ufsolve.m Fri May 29 21:12:32 2015 +0000 @@ -1,3 +1,19 @@ +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# # # This program shall attempt solution of a problem saved in the MATLAB format as for the University of Florida collection. #
--- a/main/sparsersb/inst/matlabbench.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/inst/matlabbench.m Fri May 29 21:12:32 2015 +0000 @@ -1,3 +1,19 @@ +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# # Undocumented # function mbench(fname) function matlabbench(fname)
--- a/main/sparsersb/inst/sparsersbbench.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/inst/sparsersbbench.m Fri May 29 21:12:32 2015 +0000 @@ -1,4 +1,20 @@ #!/usr/bin/octave -q +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# # TODO: document this file's functions so they get installed and are properly usable. # TODO: sprand should not be used in a consistent way
--- a/main/sparsersb/inst/sparsersbtester.m Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/inst/sparsersbtester.m Fri May 29 21:12:32 2015 +0000 @@ -1,4 +1,20 @@ #!/usr/bin/octave -q +# +# Copyright (C) 2011-2015 Michele Martone <michelemartone _AT_ users.sourceforge.net> +# +# This program 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. +# +# This program 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 this program; if not, see <http://www.gnu.org/licenses/>. +# # # A comparative tester for sparsersb. #
--- a/main/sparsersb/src/sparsersb.cc Wed May 20 12:25:45 2015 +0000 +++ b/main/sparsersb/src/sparsersb.cc Fri May 29 21:12:32 2015 +0000 @@ -15,6 +15,9 @@ along with this program; if not, see <http://www.gnu.org/licenses/>. */ +// PKG_ADD: autoload ("sparsersb", fullfile (fileparts (mfilename ("fullpath")), "sparsersb.oct")); +// PKG_DEL: autoload ("sparsersb", fullfile (fileparts (mfilename ("fullpath")), "sparsersb.oct", "remove")); + /* * TODO wishlist (patches are welcome!): * adapt to when octave_idx_type is 64 bit long