From: Paul K. <pki...@us...> - 2004-07-25 06:09:21
|
Update of /cvsroot/octave/octave-forge/main/time In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21152 Modified Files: datenum.m datevec.m Log Message: Update copyright notice to PD. Index: datenum.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/time/datenum.m,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- datenum.m 25 Jul 2004 06:02:56 -0000 1.6 +++ datenum.m 25 Jul 2004 06:09:12 -0000 1.7 @@ -25,7 +25,8 @@ ## @seealso{date,clock,now,datestr,datevec,calendar,weekday} ## @end deftypefn -## Paul Kienzle +## Algorithm: Peter Baum (http://vsg.cape.com/~pbaum/date/date0.htm) +## Author: Paul Kienzle ## This program is granted to the public domain. function n = datenum(Y,M,D,h,m,s) @@ -58,7 +59,6 @@ M(M<1) = 1; ## For compatibility. Otherwise allow negative months. - ## Based on Peter Baum (http://vsg.cape.com/~pbaum/date/date0.htm) ## Set start of year to March by moving Jan. and Feb. to previous year. ## Correct for months > 12 by moving to subsequent years. z = Y + fix((M-14)/12); Index: datevec.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/time/datevec.m,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- datevec.m 25 Jul 2004 05:24:53 -0000 1.2 +++ datevec.m 25 Jul 2004 06:09:12 -0000 1.3 @@ -1,19 +1,3 @@ -## Copyright (C) 2000 Paul Kienzle -## -## 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 2 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, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - ## -*- texinfo -*- ## @deftypefn {Function File} {V} datevec(date) ## @deftypefnx {Function File} {[Y,M,D,h,m,s] =} datevec(date) @@ -41,6 +25,10 @@ ## @seealso{date,clock,now,datestr,datenum,calendar,weekday} ## @end deftypefn +## Algorithm: Peter Baum (http://vsg.cape.com/~pbaum/date/date0.htm) +## Author: Paul Kienzle +## This program is granted to the public domain. + function [Y,M,D,h,m,s] = datevec(date,P) if nargin == 0 || nargin > 2 @@ -63,7 +51,6 @@ error("datevec: doesn't handle strings yet"); endif - ## From Peter Baum (http://vsg.cape.com/~pbaum/date/date0.htm) ## Move day 0 from midnight -0001-12-31 to midnight 0001-3-1 z = floor(date) - 60; ## Calculate number of centuries; K1=0.25 is to avoid rounding problems. |