Comment: | Further modifications. Now works on rcPPP -- next jobs: add identification to ppp_nlin_sim create real-time ppp_nlin_run |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/master | trunk |
Files: | files | file ages | folders |
SHA3-256: |
3f62cd4a52e5aa6065db409366d39d5d |
User & Date: | gawthrop@users.sourceforge.net on 2001-05-26 18:36:43 |
Other Links: | branch diff | manifest | tags |
2001-05-30
| ||
19:57:08 | Fixes to sensitivity components for non-linear PPP check-in: 795053893c user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
2001-05-26
| ||
18:36:43 |
Further modifications. Now works on rcPPP -- next jobs: add identification to ppp_nlin_sim create real-time ppp_nlin_run check-in: 3f62cd4a52 user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
15:46:38 | Updated to account for new nonlinear ppp check-in: 6632bcb60e user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
Modified mttroot/mtt/bin/mtt from [56e4bd9cb2] to [7d4b078005].
︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | + + + + | # Copyright (C) 2001 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## Revision 1.310 2001/05/08 08:30:12 gawthrop ## Added line to reverse the x^y --> pow(x,y) in default _simp file to ## prettyfy LaTeX ## ## Revision 1.309 2001/04/28 03:15:03 geraint ## Fixed comment (interfered with "mtt help representations"). ## ## Revision 1.308 2001/04/25 22:17:45 geraint ## Fixed icd.txt2 dependency. ## ## Revision 1.307 2001/04/15 21:15:41 geraint |
︙ | |||
2620 2621 2622 2623 2624 2625 2626 | 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 | - + - - + + - + - - - - + + + + + + + + | $1_ode.p $1_odeo.p $1_logic.p mtt_m2p $1_ode2odes.m $integration_method $stdin endif $1_ode2odes.c: $1_ode2odes.p mtt_p2c $info_switch $1 ode2odes |
︙ |
Modified mttroot/mtt/bin/trans/mtt_header from [63911c75bc] to [f2723c0fc8].
︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | + + + | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.33 2001/05/26 15:46:38 gawthrop ## Updated to account for new nonlinear ppp ## ## Revision 1.32 2001/05/24 07:42:12 gawthrop ## Included and updated the missing tf_r2m ## ## Revision 1.31 2001/04/03 14:49:42 gawthrop ## Revised to incorporate new ssim (sensitivity simulation) ## representation (m only just now). ## |
︙ | |||
283 284 285 286 287 288 289 290 291 292 293 294 295 296 | 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 | + + + + + + + | states=no; inputs=no; parameters=yes; output=mttx args=mttpar declarestates=yes ;; sim) states=no; inputs=no; parameters=no; output='y,x' args='x0,par,simpar,u' ;; ssim) states=no; inputs=no; parameters=no; output='y,y_par,x' args='x0,par,simpar,u,index' ;; |
︙ |
Modified mttroot/mtt/lib/control/PPP/ppp_nlin_sim.m from [7a76a326ac] to [8be58fd40d].
︙ | |||
20 21 22 23 24 25 26 | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | - - + + - + - - + + - + - - - - | ## Names s_system_name = sprintf("s%s", system_name); ## System details -- defines simulation within ol interval par = eval(sprintf("%s_numpar;", system_name)); |
︙ | |||
152 153 154 155 156 157 158 | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | - - - - - - - + + | pars(i_ppp(:,1)) = U; # Put final value of U into the parameter vector else Error = []; endif opt_time = time-tick; printf("Optimisation %i took %i iterations and %2.2f sec\n", i, \ length(Error), opt_time); |
︙ |
Modified mttroot/mtt/lib/examples/Control/PPP/Nonlinear/rcPPP/Figures.m from [df50e03584] to [0d87023b1f].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 | + + + - - - + + + - - + - - - - - + + + + + - - + - - - - - + + + + - + + - + + + + + + + + + + + + + - + + - + - + - - - + + + + + + + - + - + + - + - + - + - + - - - - + + + + - - - + + + - + - - - - - + + + + | ## Figures.m ## Makes figures for the rc_PPP exasmple. ## $Log$ ## Revision 1.2 2000/05/17 17:02:58 peterg ## Fixed documentation ## ## Revision 1.1 2000/05/17 09:14:37 peterg ## Initial revision ## system_name = "rcPPP"; ## Uncomment the following the first time ## (Or do ./Make rcPPP in this directory) ## MTT stuff for the system simulation ##system("Make rcPPP"); |
Modified mttroot/mtt/lib/examples/Control/PPP/Nonlinear/rcPPP/Make from [e246f48d9d] to [37eadad62c].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | + + + + + + + + - + + + - + + + + + - - - - - + + + + + - - - - - + + + + + + + - - - + + + | #!/bin/sh ## Makes the files needed for Figures.m ## Copyright (C) 2000 by Peter J. Gawthrop sys=$1 if [ -z "$2" ]; then code=oct else code=$2 fi if [ -z "$1" ]; then |
Modified mttroot/mtt/lib/examples/Control/PPP/Nonlinear/rcPPP/rcPPP_numpar.txt from [622bfa4d7a] to [e921254017].
1 2 3 4 5 6 7 8 9 10 11 12 13 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | + + + - - + + + - - | # -*-octave-*- Put Emacs into octave-mode # Numerical parameter file (rcPPP_numpar.txt) # Generated by MTT at Tue Apr 18 18:53:40 BST 2000 # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% Version control history # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # %% $Id$ # %% $Log$ # %% Revision 1.1 2000/12/28 17:31:27 peterg # %% To RCS # %% # %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% # Parameters c = 1.0; # CS,rcPPP |
Modified mttroot/mtt/lib/examples/Control/PPP/Nonlinear/rcPPP/srcPPP_lbl.txt from [4b14133500] to [bea2eabf2a].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | + + + | %% Label file for system srcPPP (srcPPP_lbl.txt) %SUMMARY srcPPP %DESCRIPTION % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% Version control history % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % %% $Id$ % %% $Log$ % %% Revision 1.1 2000/12/28 17:31:27 peterg % %% To RCS % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Port aliases % Argument aliases %ALIAS $1 ppp_1 |
︙ | |||
30 31 32 33 34 35 36 | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | + - - + + - + - + | %% Each line should be of one of the following forms: % a comment (ie starting with %) % component-name cr_name arg1,arg2,..argn % blank % ---- Component labels ---- % Component type Ae |
Modified mttroot/mtt/lib/examples/Control/PPP/Nonlinear/rcPPP/srcPPP_numpar.txt from [ab280343fb] to [00ff26769b].
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | - + - - - + - - - - - + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + + |
|
Modified mttroot/mtt/lib/examples/Control/PPP/Nonlinear/rcPPP/srcPPP_simpar.txt from [8ad9573e20] to [370b8dff18].
1 2 3 4 5 6 7 8 9 10 11 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | + + + - - + + + | # -*-octave-*- Put Emacs into octave-mode # Simulation parameters for system srcPPP (srcPPP_simpar.txt) # Generated by MTT on Fri Apr 14 17:43:36 BST 2000. ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.1 2000/12/28 17:31:27 peterg ## To RCS ## ############################################################### |