Skip to content

Commit

Permalink
faster handling of datetime objects
Browse files Browse the repository at this point in the history
  • Loading branch information
@jirkacigler
jirkacigler committed Nov 28, 2012
1 parent 074274a commit 720bde9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
11 changes: 7 additions & 4 deletions DateTime.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@
methods
function this = DateTime(varargin)
if numel(varargin)==1 && isa(varargin{1},'java.util.Date')
df = java.text.SimpleDateFormat( 'yyyy-MM-dd HH:mm:ss' );
tz = java.util.TimeZone.getTimeZone ('UTC');
df.setTimeZone( tz );
this.serialDate=datenum(char(df.format(varargin{1})));
%df = java.text.SimpleDateFormat( 'yyyy-MM-dd HH:mm:ss' );
%tz = java.util.TimeZone.getTimeZone ('UTC');
%df.setTimeZone( tz );
%this.serialDate=datenum(char(df.format(varargin{1})));
sec = varargin{1}.getTime/1000;

this.serialDate=datenum(1970,1,1,0,0,sec);
%this.serialDate = datenum(char(varargin{1}.toString)) - varargin{1}.getTimezoneOffset/60/24;
%disp ( [ char(varargin{1}.toGMTString), '---' char(varargin{1}.toString ), '---', char(varargin{1}.toLocaleString )]);
%if (varargin{1}.getTimezoneOffset)~=-120
Expand Down
2 changes: 1 addition & 1 deletion Tests/Data/test_primitives/time.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Data:
B1_S_SW:
[!!timestamp '2011-03-29T18:09:20.4543750+02:00', 23.80]
[!!timestamp '2011-03-29T18:09:20.0000000+02:00', 23.80]
10 changes: 5 additions & 5 deletions Tests/Data/test_primitives/time_variants.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
canonical: !!timestamp 2001-12-15T02:59:43.1Z
iso8601: !!timestamp 2001-12-14t21:59:43.10-05:00
spaced: !!timestamp 2001-12-14 21:59:43.10 -5
canonical: !!timestamp 2001-12-15T02:59:43.0Z
iso8601: !!timestamp 2001-12-14t21:59:43.00-05:00
spaced: !!timestamp 2001-12-14 21:59:43.00 -5
date: !!timestamp 2002-12-14
matrix:
- [!!timestamp '2001-12-15T02:59:43.1Z', 1]
- [!!timestamp '2001-12-15T03:59:43.1Z', 2]
- [!!timestamp '2001-12-15T02:59:43.0Z', 1]
- [!!timestamp '2001-12-15T03:59:43.0Z', 2]

2 changes: 1 addition & 1 deletion Tests/selftest_report.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"><HTML> <HEAD><TITLE>::SELFTEST REPORT::</TITLE><STYLE> H2{color:blue} #MainTest{border: 1px blue solid;} h3,h4,h5,h6 {display: inline;} </STYLE></HEAD><BODY style="font-family:Arial, helvetica"><h1>Selftest report from:05-Oct-2012 10:08:53</h1><div id="MainTest"> <h2>test_ReadYaml</h2><div id="Test"><h3>test_ReadYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_RY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Import: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportDef: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportNonex: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Inheritance: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceLoop: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceMultiple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_TimeVariants: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Whitespaces: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_usecase_01: </h3>Passed <i></i> </div><table></table></tr></table></div><div id="MainTest"> <h2>test_WriteYaml</h2><div id="Test"><h3>test_WriteYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_WY_ComplexStructure: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_usecase_01: </h3><b style="color:red">Failed</b>, <i>Wrong values loaded</i> </div><table></table></tr></table></div></BODY></HTML>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"><HTML> <HEAD><TITLE>::SELFTEST REPORT::</TITLE><STYLE> H2{color:blue} #MainTest{border: 1px blue solid;} h3,h4,h5,h6 {display: inline;} </STYLE></HEAD><BODY style="font-family:Arial, helvetica"><h1>Selftest report from:28-Nov-2012 15:17:38</h1><div id="MainTest"> <h2>test_ReadYaml</h2><div id="Test"><h3>test_ReadYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_RY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Import: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportDef: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_ImportNonex: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Inheritance: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceLoop: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_InheritanceMultiple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_TimeVariants: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_Whitespaces: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_RY_usecase_01: </h3>Passed <i></i> </div><table></table></tr></table></div><div id="MainTest"> <h2>test_WriteYaml</h2><div id="Test"><h3>test_WriteYaml: </h3>Passed <i></i> </div><table><tr><div id="Test"><h3>test_WY_ComplexStructure: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_FloatingPoints: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Indentation: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Matrices: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_SequenceMapping: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Simple: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_Time: </h3>Passed <i></i> </div><table></table></tr><tr><div id="Test"><h3>test_WY_usecase_01: </h3><b style="color:red">Failed</b>, <i>Wrong values loaded</i> </div><table></table></tr></table></div></BODY></HTML>

0 comments on commit 720bde9

Please sign in to comment.