Overview
Comment: | Reduced number of matrix operations during .oct simulation data write |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/master | trunk |
Files: | files | file ages | folders |
SHA3-256: |
c2e73d2c5778982d1188ff5015b8140b |
User & Date: | geraint@users.sourceforge.net on 2001-02-11 05:25:53 |
Other Links: | branch diff | manifest | tags |
Context
2001-02-11
| ||
07:08:59 | Static declarations of octave_value_lists: small .exe speed improvement check-in: f58032ca4b user: geraint@users.sourceforge.net tags: origin/master, trunk | |
05:25:53 | Reduced number of matrix operations during .oct simulation data write check-in: c2e73d2c57 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
2001-02-09
| ||
02:56:46 |
Translate some binary operators Allows use of ! in logic.txt check-in: 9745aba946 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
Changes
Modified mttroot/mtt/bin/trans/make_ode2odes from [24f28d603b] to [741904c6e9].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | #! /bin/sh ###################################### ##### Model Transformation Tools ##### ###################################### ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.45 2001/02/05 04:32:35 geraint ## Octave version 2.1.x compatability and #ifdef statements for standalone rep ## ## Revision 1.46 2001/01/08 06:21:59 geraint ## #ifdef STANDALONE stuff ## ## Revision 1.45 2001/01/07 01:25:49 geraint | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | #! /bin/sh ###################################### ##### Model Transformation Tools ##### ###################################### ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.46 2001/02/05 08:32:31 geraint ## typo ## ## Revision 1.45 2001/02/05 04:32:35 geraint ## Octave version 2.1.x compatability and #ifdef statements for standalone rep ## ## Revision 1.46 2001/01/08 06:21:59 geraint ## #ifdef STANDALONE stuff ## ## Revision 1.45 2001/01/07 01:25:49 geraint |
︙ | ︙ | |||
267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | cat <<EOF > $filename #include <octave/oct.h> #include <octave/${feval_header}> #include <octave/ov-struct.h> #include <octave/oct-map.h> #include <octave/lo-mappers.h> #include "${sys}_def.h" #include "${sys}_sympar.h" #ifdef STANDALONE #define DECLARE(name) extern octave_value_list F##name (const octave_value_list &, int); DECLARE(mtt_euler) DECLARE(mtt_implicit) | > < | > | > > | > | > > < | | | | | | | | | | | | | | | > | > > | | | 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 | cat <<EOF > $filename #include <octave/oct.h> #include <octave/${feval_header}> #include <octave/ov-struct.h> #include <octave/oct-map.h> #include <octave/lo-mappers.h> #include <octave/variables.h> #include "${sys}_def.h" #include "${sys}_sympar.h" #ifdef STANDALONE #define DECLARE(name) extern octave_value_list F##name (const octave_value_list &, int); DECLARE(mtt_euler) DECLARE(mtt_implicit) DECLARE(${sys}_${ode}) DECLARE(${sys}_${odeo}) DECLARE(${sys}_input) DECLARE(${sys}_numpar) DECLARE(${sys}_simpar) DECLARE(${sys}_smxa) DECLARE(${sys}_smxax) DECLARE(${sys}_state) DECLARE(${sys}_logic) #endif // STANDALONE inline ColumnVector mtt_${ode} (const ColumnVector &x, const ColumnVector &u, const double &t, const ColumnVector &par) { octave_value_list args, f; args (0) = octave_value (x); args (1) = octave_value (u); args (2) = octave_value (t); args (3) = octave_value (par); #ifdef STANDALONE f = F${sys}_${ode} (args, 1); #else f = feval ("${sys}_${ode}", args, 1); #endif return f(0).${vector_value} (); } inline ColumnVector mtt_${odeo} (const ColumnVector &x, const ColumnVector &u, const double &t, const ColumnVector &par) { octave_value_list args, f; args (0) = octave_value (x); args (1) = octave_value (u); args (2) = octave_value (t); args (3) = octave_value (par); #ifdef STANDALONE f = F${sys}_${odeo} (args, 1); #else f = feval ("${sys}_${odeo}", args, 1); #endif return f(0).${vector_value} (); } inline ColumnVector mtt_implicit (const ColumnVector &x, const ColumnVector &dx, const Matrix &AA, const ColumnVector &AAx, const double &ddt, const int &nx, const ColumnVector &open_switches) { octave_value_list args, f; args (0) = octave_value (x); args (1) = octave_value (dx); args (2) = octave_value (AA); args (3) = octave_value (AAx); args (4) = octave_value (ddt); args (5) = octave_value ((double)nx); args (6) = octave_value (open_switches); #ifdef STANDALONE f = Fmtt_implicit (args, 1); #else f = feval ("mtt_implicit", args, 1); #endif return f(0).${vector_value} (); } inline ColumnVector mtt_euler (const ColumnVector &x, const ColumnVector &dx, const double &ddt, const int &nx, const ColumnVector &open_switches) { octave_value_list args, f; args (0) = octave_value (x); args (1) = octave_value (dx); args (2) = octave_value (ddt); args (3) = octave_value ((double)nx); args (4) = octave_value (open_switches); #ifdef STANDALONE f = Fmtt_euler (args, 1); #else f = feval ("mtt_euler", args, 1); #endif return f(0).${vector_value} (); } inline ColumnVector mtt_input (const ColumnVector &x, const ColumnVector &y, const double &t, const ColumnVector &par) { octave_value_list args; args (0) = octave_value (x); args (1) = octave_value (y); args (2) = octave_value (t); args (3) = octave_value (par); octave_value_list f; #ifdef STANDALONE f = F${sys}_input (args, 1); #else f = feval ("${sys}_input", args, 1); #endif return f(0).${vector_value} (); } inline ColumnVector mtt_numpar (void) { octave_value_list args; octave_value_list f; #ifdef STANDALONE f = F${sys}_numpar (args, 1); #else f = feval ("${sys}_numpar", args, 1); #endif return f(0).${vector_value} (); } inline Octave_map mtt_simpar (void) { octave_value_list args; Octave_map f; #ifdef STANDALONE f["first"] = F${sys}_simpar (args, 1)(0).map_value ()["first"]; f["dt"] = F${sys}_simpar (args, 1)(0).map_value ()["dt"]; |
︙ | ︙ | |||
423 424 425 426 427 428 429 | f["wmax"] = feval ("${sys}_simpar", args, 1)(0).map_value ()["wmax"]; f["wsteps"] = feval ("${sys}_simpar", args, 1)(0).map_value ()["wsteps"]; f["input"] = feval ("${sys}_simpar", args, 1)(0).map_value ()["input"]; #endif return (f); } | | > | > > | > | > > | | | > | > > | > | > > > > > > > | > > | > > > > > > | > | > < > | < > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > > > > > > | | | | < < < < | | | | | | < < < < | | | | | | < < < < | | | | | | < < < < | | | | | < < < | | | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 | f["wmax"] = feval ("${sys}_simpar", args, 1)(0).map_value ()["wmax"]; f["wsteps"] = feval ("${sys}_simpar", args, 1)(0).map_value ()["wsteps"]; f["input"] = feval ("${sys}_simpar", args, 1)(0).map_value ()["input"]; #endif return (f); } inline Matrix mtt_smxa (const ColumnVector &x, const ColumnVector &u, const double &t, const ColumnVector &par) { octave_value_list args; args (0) = octave_value (x); args (1) = octave_value (u); args (2) = octave_value (t); args (3) = octave_value (par); octave_value_list f; #ifdef STANDALONE f = F${sys}_smxa (args, 1); #else f = feval ("${sys}_smxa", args, 1); #endif return f(0).matrix_value (); } inline ColumnVector mtt_smxax (const ColumnVector &x, const ColumnVector &u, const double &t, const ColumnVector &par) { octave_value_list args; args (0) = octave_value (x); args (1) = octave_value (u); args (2) = octave_value (t); args (3) = octave_value (par); octave_value_list f; #ifdef STANDALONE f = F${sys}_smxax (args, 1); #else f = feval ("${sys}_smxax", args, 1); #endif return f(0).${vector_value} (); } inline ColumnVector mtt_state (const ColumnVector &x) { octave_value_list args; args (0) = octave_value (x); octave_value_list f; #ifdef STANDALONE f = F${sys}_state (args, 1); #else f = feval ("${sys}_state", args, 1); #endif return f(0).${vector_value} (); } inline ColumnVector mtt_logic (const ColumnVector &x, const ColumnVector &u, const double &t, const ColumnVector &par) { octave_value_list args; args (0) = octave_value (x); args (1) = octave_value (u); args (2) = octave_value (t); args (3) = octave_value (par); octave_value_list f; #ifdef STANDALONE f = F${sys}_logic (args, 1); #else f = feval ("${sys}_logic", args, 1); #endif return f(0).${vector_value} (); } inline void mtt_write (const double &t, const ColumnVector &x, const ColumnVector &y, const int &nrows) { static Matrix data; static int row; const int nx = x.length (), ny = y.length (); register int col = 0; if (0 == row) data = Matrix (nrows, 1+ny+1+nx, 0.0); data (row, col) = t; for (register int i = 0; i < ny; i++) data (row, ++col) = y (i); data (row, ++col) = t; for (register int i = 0; i < nx; i++) data (row, ++col) = x (i); row++; if (nrows == row) #ifdef STANDALONE cout << data; #else // ! STANDALONE set_global_value ("MTT_data", data); #endif } DEFUN_DLD (${sys}_ode2odes, args, , "Octave ode2odes representation of system Usage: ${sys}_ode2odes (x, par, simpar) ") { octave_value_list retval; ColumnVector x; ColumnVector par; Octave_map simpar; double first = 0.0, dt = 0.0, last = 0.0, stepfactor = 0.0; int nargin = args.length (); switch (nargin) { case 3: first = args (2).map_value ()["first"].double_value (); dt = args (2).map_value ()["dt"].double_value (); last = args (2).map_value ()["last"].double_value (); stepfactor = args (2).map_value ()["stepfactor"].double_value (); par = args (1).${vector_value} (); x = args (0).${vector_value} (); break; case 2: first = mtt_simpar ()["first"].double_value (); dt = mtt_simpar ()["dt"].double_value (); last = mtt_simpar ()["last"].double_value (); stepfactor = mtt_simpar ()["stepfactor"].double_value (); par = args (1).${vector_value} (); x = args (0).${vector_value} (); break; case 1: first = mtt_simpar ()["first"].double_value (); dt = mtt_simpar ()["dt"].double_value (); last = mtt_simpar ()["last"].double_value (); stepfactor = mtt_simpar ()["stepfactor"].double_value (); par = mtt_numpar (); x = args (0).${vector_value} (); break; case 0: first = mtt_simpar ()["first"].double_value (); dt = mtt_simpar ()["dt"].double_value (); last = mtt_simpar ()["last"].double_value (); stepfactor = mtt_simpar ()["stepfactor"].double_value (); par = mtt_numpar (); x = mtt_state (par); break; default: usage("${sys}_ode2odes (x par simpar)", nargin); error("aborting."); } ColumnVector dx (MTTNX); ColumnVector u (MTTNU); ColumnVector y (MTTNY); Matrix AA (MTTNX, MTTNX); ColumnVector AAx (MTTNX); ColumnVector open_switches (MTTNX); register double t = 0.0; const double ddt = dt / stepfactor; const int ilast = static_cast<int> (round ((last - first) / ddt)) + 1; const int nrows = static_cast<int> (round ((last - first) / dt)) + 1; for (register int j = 0, i = 1; i <= ilast; i++) { y = mtt_${odeo} (x, u, t, par); u = mtt_input (x, y, t, par); if (0 == j) { mtt_write (t, x, y, nrows); } dx = mtt_${ode} (x, u, t, par); EOF if [ "$method" = "implicit" ]; then cat <<EOF >> $filename AA = mtt_smxa (x, u, ddt, par); AAx = mtt_smxax (x, u, ddt, par); EOF fi ## Common stuff cat <<EOF >> $filename open_switches = mtt_logic (x, u, t, par); x = $algorithm; t += ddt; j++; j = (j == static_cast<int> (stepfactor)) ? 0 : j; } retval (0) = octave_value (y); retval (1) = octave_value (x); retval (2) = octave_value (t); return (retval); } |
︙ | ︙ |
Deleted mttroot/mtt/lib/cc/mtt_write.cc version [726e26819d].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |