Mercurial > hg > octave-nkf
annotate liboctave/system/oct-time.h @ 20811:a22d8a2eb0e5
fix adaptive strategy in ode solvers.
* script/ode/ode45.m: remove unused option OutputSave
* script/ode/private/integrate_adaptive.m: rewrite algorithm
to be more compatible.
* script/ode/private/runge_kutta_45_dorpri.m: use kahan summation
for time increment.
| author | Carlo de Falco <carlo.defalco@polimi.it> |
|---|---|
| date | Sun, 11 Oct 2015 18:44:58 +0200 |
| parents | 4197fc428c7d |
| children |
| rev | line source |
|---|---|
| 3253 | 1 /* |
| 2 | |
|
19898
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
3 Copyright (C) 1999-2015 John W. Eaton |
| 3253 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 3253 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 3253 | 20 |
| 21 */ | |
| 22 | |
|
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
23 #if !defined (octave_oct_time_h) |
|
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
24 #define octave_oct_time_h 1 |
| 3253 | 25 |
|
10240
fa7b5751730c
use gnulib time, sys_time, and sys_times modules
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
26 #include <ctime> |
| 3253 | 27 #include <string> |
| 28 | |
| 7231 | 29 #include "lo-math.h" |
| 3253 | 30 |
| 31 class octave_base_tm; | |
| 32 | |
| 33 class | |
| 6108 | 34 OCTAVE_API |
| 3253 | 35 octave_time |
| 36 { | |
| 37 public: | |
| 38 | |
| 39 octave_time (void) | |
| 40 : ot_unix_time (0), ot_usec (0) { stamp (); } | |
| 41 | |
| 3255 | 42 octave_time (time_t t) |
| 43 : ot_unix_time (t), ot_usec (0) { } | |
| 44 | |
|
9748
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
45 octave_time (time_t t, int us) |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
46 : ot_unix_time (t), ot_usec () |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
47 { |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
48 int rem, extra; |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
49 |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
50 if (us >= 0) |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
51 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
52 rem = us % 1000000; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
53 extra = (us - rem) / 1000000; |
|
9748
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
54 } |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
55 else |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
56 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
57 us = -us; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
58 rem = us % 1000000; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
59 extra = - (1 + (us - rem) / 1000000); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
60 rem = 1000000 - us % 1000000; |
|
9748
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
61 } |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
62 |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
63 ot_usec = rem; |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
64 ot_unix_time += extra; |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
65 } |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
66 |
| 3253 | 67 octave_time (double d) |
| 3255 | 68 : ot_unix_time (static_cast<time_t> (d)), ot_usec (0) |
| 3253 | 69 { |
| 70 double ip; | |
|
10458
9684b3c3b417
Revert modf usage now that cmath is back.
David Grundberg <davidg@cs.umu.se>
parents:
10447
diff
changeset
|
71 ot_usec = static_cast<int> (std::modf (d, &ip) * 1e6); |
| 3253 | 72 } |
| 73 | |
| 74 octave_time (const octave_base_tm& tm); | |
| 75 | |
| 76 octave_time (const octave_time& ot) | |
| 77 : ot_unix_time (ot.ot_unix_time), ot_usec (ot.ot_usec) { } | |
| 78 | |
| 79 octave_time& operator = (const octave_time& ot) | |
| 80 { | |
| 81 if (this != &ot) | |
| 82 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
83 ot_unix_time = ot.ot_unix_time; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
84 ot_usec = ot.ot_usec; |
| 3253 | 85 } |
| 86 | |
| 87 return *this; | |
| 88 } | |
| 89 | |
| 90 ~octave_time (void) { } | |
| 91 | |
| 92 void stamp (void); | |
| 93 | |
| 7065 | 94 double double_value (void) const { return ot_unix_time + ot_usec / 1e6; } |
| 3253 | 95 |
| 96 time_t unix_time (void) const { return ot_unix_time; } | |
| 97 | |
| 98 int usec (void) const { return ot_usec; } | |
| 99 | |
| 3504 | 100 std::string ctime (void) const; |
| 3255 | 101 |
| 3253 | 102 private: |
| 103 | |
| 104 // Seconds since the epoch. | |
| 105 time_t ot_unix_time; | |
| 106 | |
| 107 // Additional microseconds. | |
| 108 int ot_usec; | |
| 109 }; | |
| 110 | |
| 3255 | 111 inline bool |
| 112 operator == (const octave_time& t1, const octave_time& t2) | |
| 113 { | |
| 114 return (t1.unix_time () == t2.unix_time () && t1.usec () == t2.usec ()); | |
| 115 } | |
| 116 | |
| 117 inline bool | |
| 118 operator != (const octave_time& t1, const octave_time& t2) | |
| 119 { | |
| 120 return ! (t1 == t2); | |
| 121 } | |
| 122 | |
| 123 inline bool | |
| 124 operator < (const octave_time& t1, const octave_time& t2) | |
| 125 { | |
| 126 if (t1.unix_time () < t2.unix_time ()) | |
| 127 return true; | |
| 128 else if (t1.unix_time () > t2.unix_time ()) | |
| 129 return false; | |
| 130 else if (t1.usec () < t2.usec ()) | |
| 131 return true; | |
| 132 else | |
| 133 return false; | |
| 134 } | |
| 135 | |
| 136 inline bool | |
| 137 operator <= (const octave_time& t1, const octave_time& t2) | |
| 138 { | |
| 139 return (t1 < t2 || t1 == t2); | |
| 140 } | |
| 141 | |
| 142 inline bool | |
| 143 operator > (const octave_time& t1, const octave_time& t2) | |
| 144 { | |
| 145 if (t1.unix_time () > t2.unix_time ()) | |
| 146 return true; | |
| 147 else if (t1.unix_time () < t2.unix_time ()) | |
| 148 return false; | |
| 149 else if (t1.usec () > t2.usec ()) | |
| 150 return true; | |
| 151 else | |
| 152 return false; | |
| 153 } | |
| 154 | |
| 155 inline bool | |
| 156 operator >= (const octave_time& t1, const octave_time& t2) | |
| 157 { | |
| 158 return (t1 > t2 || t1 == t2); | |
| 159 } | |
| 160 | |
|
9748
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
161 inline octave_time |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
162 operator + (const octave_time& t1, const octave_time& t2) |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
163 { |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
164 return octave_time (t1.unix_time () + t2.unix_time (), |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
165 t1.usec () + t2.usec ()); |
|
9748
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
166 } |
|
d6b2b708b6b0
load-path: compare directory timestamps with tolerance
John W. Eaton <jwe@octave.org>
parents:
7231
diff
changeset
|
167 |
| 3253 | 168 class |
| 6108 | 169 OCTAVE_API |
| 3253 | 170 octave_base_tm |
| 171 { | |
| 172 public: | |
| 173 | |
| 174 octave_base_tm (void) | |
| 175 : tm_usec (0), tm_sec (0), tm_min (0), tm_hour (0), | |
| 176 tm_mday (0), tm_mon (0), tm_year (0), tm_wday (0), | |
|
13974
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
177 tm_yday (0), tm_isdst (0), tm_gmtoff (0), tm_zone ("unknown") |
| 3253 | 178 { } |
| 179 | |
| 180 octave_base_tm (const octave_base_tm& tm) | |
| 181 : tm_usec (tm.tm_usec), tm_sec (tm.tm_sec), tm_min (tm.tm_min), | |
| 182 tm_hour (tm.tm_hour), tm_mday (tm.tm_mday), tm_mon (tm.tm_mon), | |
| 183 tm_year (tm.tm_year), tm_wday (tm.tm_wday), tm_yday (tm.tm_yday), | |
|
13974
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
184 tm_isdst (tm.tm_isdst), tm_gmtoff (tm.tm_gmtoff), tm_zone (tm.tm_zone) |
| 3253 | 185 { } |
| 186 | |
| 187 octave_base_tm& operator = (const octave_base_tm& tm) | |
| 188 { | |
| 189 if (this != &tm) | |
| 190 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
191 tm_usec = tm.tm_usec; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
192 tm_sec = tm.tm_sec; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
193 tm_min = tm.tm_min; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
194 tm_hour = tm.tm_hour; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
195 tm_mday = tm.tm_mday; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
196 tm_mon = tm.tm_mon; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
197 tm_year = tm.tm_year; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
198 tm_wday = tm.tm_wday; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
199 tm_yday = tm.tm_yday; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
200 tm_isdst = tm.tm_isdst; |
|
13974
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
201 tm_gmtoff = tm.tm_gmtoff; |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10240
diff
changeset
|
202 tm_zone = tm.tm_zone; |
| 3253 | 203 } |
| 204 | |
| 205 return *this; | |
| 206 } | |
| 207 | |
| 208 virtual ~octave_base_tm (void) { } | |
| 209 | |
| 210 int usec (void) const { return tm_usec; } | |
| 211 int sec (void) const { return tm_sec; } | |
| 212 int min (void) const { return tm_min; } | |
| 213 int hour (void) const { return tm_hour; } | |
| 214 int mday (void) const { return tm_mday; } | |
| 215 int mon (void) const { return tm_mon; } | |
| 216 int year (void) const { return tm_year; } | |
| 217 int wday (void) const { return tm_wday; } | |
| 218 int yday (void) const { return tm_yday; } | |
| 219 int isdst (void) const { return tm_isdst; } | |
|
13974
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
220 long gmtoff (void) const { return tm_gmtoff; } |
| 3504 | 221 std::string zone (void) const { return tm_zone; } |
| 3253 | 222 |
| 223 octave_base_tm& usec (int v); | |
| 224 octave_base_tm& sec (int v); | |
| 225 octave_base_tm& min (int v); | |
| 226 octave_base_tm& hour (int v); | |
| 227 octave_base_tm& mday (int v); | |
| 228 octave_base_tm& mon (int v); | |
| 229 octave_base_tm& year (int v); | |
| 230 octave_base_tm& wday (int v); | |
| 231 octave_base_tm& yday (int v); | |
| 232 octave_base_tm& isdst (int v); | |
|
13974
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
233 octave_base_tm& gmtoff (long v); |
| 3504 | 234 octave_base_tm& zone (const std::string& s); |
| 3253 | 235 |
| 3504 | 236 std::string strftime (const std::string& fmt) const; |
| 3255 | 237 |
| 3504 | 238 std::string asctime (void) const |
|
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
239 { return strftime ("%a %b %d %H:%M:%S %Y\n"); } |
| 3253 | 240 |
| 241 protected: | |
| 242 | |
| 243 // Microseconds after the second (0, 999999). | |
| 244 int tm_usec; | |
| 245 | |
| 246 // Seconds after the minute (0, 61). | |
| 247 int tm_sec; | |
| 248 | |
| 249 // Minutes after the hour (0, 59). | |
| 250 int tm_min; | |
| 251 | |
| 252 // Hours since midnight (0, 23). | |
| 253 int tm_hour; | |
| 254 | |
| 255 // Day of the month (1, 31). | |
| 256 int tm_mday; | |
| 257 | |
| 258 // Months since January (0, 11). | |
| 259 int tm_mon; | |
| 260 | |
| 261 // Years since 1900. | |
| 262 int tm_year; | |
| 263 | |
| 264 // Days since Sunday (0, 6). | |
| 265 int tm_wday; | |
| 266 | |
| 267 // Days since January 1 (0, 365). | |
| 268 int tm_yday; | |
| 269 | |
| 270 // Daylight Savings Time flag. | |
| 271 int tm_isdst; | |
| 272 | |
| 273 // Time zone. | |
|
13974
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
274 long tm_gmtoff; |
|
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
275 |
|
f5bd61eb032f
handle tm_gmtoff field in struct tm
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
276 // Time zone. |
| 3504 | 277 std::string tm_zone; |
| 3253 | 278 |
| 279 void init (void *p); | |
| 280 }; | |
| 281 | |
| 282 class | |
| 6108 | 283 OCTAVE_API |
| 3253 | 284 octave_localtime : public octave_base_tm |
| 285 { | |
| 286 public: | |
| 287 | |
| 288 octave_localtime (void) | |
| 289 : octave_base_tm () { init (octave_time ()); } | |
| 290 | |
| 291 octave_localtime (const octave_time& ot) | |
| 292 : octave_base_tm () { init (ot); } | |
| 293 | |
| 294 octave_localtime (const octave_localtime& t) | |
| 295 : octave_base_tm (t) { } | |
| 296 | |
| 297 octave_localtime& operator = (const octave_localtime& t) | |
| 298 { | |
| 299 octave_base_tm::operator = (t); | |
| 300 return *this; | |
| 301 } | |
| 302 | |
| 303 ~octave_localtime (void) { } | |
| 304 | |
| 305 private: | |
| 306 | |
| 307 void init (const octave_time& ot); | |
| 308 }; | |
| 309 | |
| 310 class | |
| 6108 | 311 OCTAVE_API |
| 3253 | 312 octave_gmtime : public octave_base_tm |
| 313 { | |
| 314 public: | |
| 315 | |
| 316 octave_gmtime (void) | |
| 317 : octave_base_tm () { init (octave_time ()); } | |
| 318 | |
| 319 octave_gmtime (const octave_time& ot) | |
| 320 : octave_base_tm () { init (ot); } | |
| 321 | |
| 322 octave_gmtime& operator = (const octave_gmtime& t) | |
| 323 { | |
| 324 octave_base_tm::operator = (t); | |
| 325 return *this; | |
| 326 } | |
| 327 | |
| 328 ~octave_gmtime (void) { } | |
| 329 | |
| 330 private: | |
| 331 | |
| 332 void init (const octave_time& ot); | |
| 333 }; | |
| 334 | |
| 3465 | 335 class |
| 6108 | 336 OCTAVE_API |
| 3465 | 337 octave_strptime : public octave_base_tm |
| 338 { | |
| 339 public: | |
| 340 | |
| 3504 | 341 octave_strptime (const std::string& str, const std::string& fmt) |
|
11501
331fcc41ca23
data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10458
diff
changeset
|
342 : octave_base_tm (), nchars (0) |
|
331fcc41ca23
data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10458
diff
changeset
|
343 { |
|
331fcc41ca23
data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10458
diff
changeset
|
344 init (str, fmt); |
|
331fcc41ca23
data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10458
diff
changeset
|
345 } |
| 3465 | 346 |
| 347 octave_strptime (const octave_strptime& s) | |
|
11501
331fcc41ca23
data member initialization fixes
John W. Eaton <jwe@octave.org>
parents:
10458
diff
changeset
|
348 : octave_base_tm (s), nchars (s.nchars) { } |
| 3465 | 349 |
| 350 octave_strptime& operator = (const octave_strptime& s) | |
| 351 { | |
| 352 octave_base_tm::operator = (s); | |
| 353 nchars = s.nchars; | |
| 354 return *this; | |
| 355 } | |
| 356 | |
| 357 int characters_converted (void) const { return nchars; } | |
| 358 | |
| 359 ~octave_strptime (void) { } | |
| 360 | |
| 361 private: | |
| 362 | |
| 363 int nchars; | |
| 364 | |
| 3504 | 365 void init (const std::string& str, const std::string& fmt); |
| 3465 | 366 }; |
| 367 | |
| 3253 | 368 #endif |