From: <cde...@us...> - 2010-11-23 17:35:33
|
Revision: 7942 http://octave.svn.sourceforge.net/octave/?rev=7942&view=rev Author: cdemills Date: 2010-11-23 17:35:27 +0000 (Tue, 23 Nov 2010) Log Message: ----------- Removed backup junk Removed Paths: ------------- trunk/octave-forge/extra/dataframe/inst/@dataframe/find.m~ trunk/octave-forge/extra/dataframe/inst/@dataframe/le.m~ trunk/octave-forge/extra/dataframe/inst/@dataframe/lt.m~ Deleted: trunk/octave-forge/extra/dataframe/inst/@dataframe/find.m~ =================================================================== --- trunk/octave-forge/extra/dataframe/inst/@dataframe/find.m~ 2010-11-23 17:34:03 UTC (rev 7941) +++ trunk/octave-forge/extra/dataframe/inst/@dataframe/find.m~ 2010-11-23 17:35:27 UTC (rev 7942) @@ -1,29 +0,0 @@ -function varargout = find(df, varargin) - - %% Copyright (C) 2009-2010 Pascal Dupuis <Pas...@uc...> - %% - %% 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 2, 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, - %% write to the Free Software Foundation, 59 Temple Place - - %% Suite 330, Boston, MA 02111-1307, USA. - - %# - %# $Id: sin.m 7940 2010-11-23 10:51:03Z cdemills $ - %# - - resu = df_mapper(@find, df, varargin{:}); - -endfunction Deleted: trunk/octave-forge/extra/dataframe/inst/@dataframe/le.m~ =================================================================== --- trunk/octave-forge/extra/dataframe/inst/@dataframe/le.m~ 2010-11-23 17:34:03 UTC (rev 7941) +++ trunk/octave-forge/extra/dataframe/inst/@dataframe/le.m~ 2010-11-23 17:35:27 UTC (rev 7942) @@ -1,32 +0,0 @@ -function resu = eq(A, B); - - %# function resu = eq(A, B) - %# Implements the '==' operator when at least one argument is a dataframe. - - %% Copyright (C) 2009-2010 Pascal Dupuis <Pas...@uc...> - %% - %% 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 2, 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, - %% write to the Free Software Foundation, 59 Temple Place - - %% Suite 330, Boston, MA 02111-1307, USA. - - %# - %# $Id: minus.m 7892 2010-10-29 07:14:29Z cdemills $ - %# - - resu = cell2mat(df_func(@eq, A, B)); - -endfunction Deleted: trunk/octave-forge/extra/dataframe/inst/@dataframe/lt.m~ =================================================================== --- trunk/octave-forge/extra/dataframe/inst/@dataframe/lt.m~ 2010-11-23 17:34:03 UTC (rev 7941) +++ trunk/octave-forge/extra/dataframe/inst/@dataframe/lt.m~ 2010-11-23 17:35:27 UTC (rev 7942) @@ -1,59 +0,0 @@ -function resu = lt(A, B); - - %# function resu = minus(A, B) - %# Implements the '<' operator when at least one argument is a dataframe. - - %% Copyright (C) 2009-2010 Pascal Dupuis <Pas...@uc...> - %% - %% 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 2, 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, - %% write to the Free Software Foundation, 59 Temple Place - - %% Suite 330, Boston, MA 02111-1307, USA. - - %# - %# $Id: minus.m 7892 2010-10-29 07:14:29Z cdemills $ - %# - - [A, B] = df_basecomp(A, B); - - if isa(B, 'dataframe') - if !isa(A, 'dataframe'), - if isscalar(A) - resu = cellfun(@(x) lt(A, x), B._data, "UniformOutput", false); - elseif ismatrix(A), - resu = cellfun(@(x, y) lt(x, y), num2cell(A, 1), B._data, \ - "UniformOutput", false); - else - error("Operator < not implemented"); - endif - else - resu = cellfun(@(x, y) lt(x, y), A._data, B._data, \ - "UniformOutput", false); - endif - else - if isscalar(B), - resu = cellfun(@(x) lt(x, B), A._data, "UniformOutput", false); - elseif ismatrix(B), - resu = cellfun(@(x, y) lt(x, y), A._data, num2cell(B, 1), \ - "UniformOutput", false); - else - error("Operator < not implemented"); - endif - endif - - resu = cell2mat(resu); - -endfunction This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |