Changes In Branch origin/numerical-algebraic-solution Through [3eb0acafb0] Excluding Merge-Ins
This is equivalent to a diff from 100c579558 to 3eb0acafb0
2001-06-25
| ||
23:28:29 | Generic mtt_rate and mtt_output - allows method independent calls. check-in: 984f0c191d user: geraint@users.sourceforge.net tags: origin/numerical-algebraic-solution, trunk | |
2001-06-05
| ||
03:37:15 | *** empty log message *** check-in: 3eb0acafb0 user: geraint@users.sourceforge.net tags: origin/numerical-algebraic-solution, trunk | |
03:20:40 | added -ae option to select algebraic equation solution method. check-in: 6e5926c3aa user: geraint@users.sourceforge.net tags: origin/numerical-algebraic-solution, trunk | |
2001-05-01
| ||
14:16:06 | New P+D controller for collocated use and effort output check-in: bb4060a00e user: gawthrop@users.sourceforge.net tags: origin/master, trunk | |
2001-04-30
| ||
03:02:53 | Created branch numerical-algebraic-solution check-in: e96b3471d0 user: gawthrop@users.sourceforge.net tags: origin/numerical-algebraic-solution, trunk | |
03:02:52 | Stripped template stuff. check-in: 100c579558 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
2001-04-28
| ||
03:38:36 | Refined selection of matching patterns - checks for exact match. check-in: 9b7ef81b4b user: geraint@users.sourceforge.net tags: origin/master, trunk | |
Deleted CVSROOT/checkoutlist version [3854d49239].
|
| < < < < < < < < < < < < < |
Deleted CVSROOT/commitinfo version [85654ac9a8].
|
| < < < < < < < < < < < < < < < |
Deleted CVSROOT/config version [28e7a42550].
|
| < < < < < < < < < < < |
Deleted CVSROOT/cvswrappers version [9d41597c29].
|
| < < < < < < < < < < < < < < < < < < < < < < < |
Deleted CVSROOT/editinfo version [dfa5fb459c].
|
| < < < < < < < < < < < < < < < < < < < < < |
Deleted CVSROOT/loginfo version [4503d4cd47].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted CVSROOT/modules version [84b74e5335].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted CVSROOT/notify version [2a5259e3c5].
|
| < < < < < < < < < < < < |
Deleted CVSROOT/rcsinfo version [c276b88ba1].
|
| < < < < < < < < < < < < < |
Deleted CVSROOT/taginfo version [364dad5373].
|
| < < < < < < < < < < < < < < < < < < < < |
Deleted CVSROOT/verifymsg version [cbc796537d].
|
| < < < < < < < < < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/checkoutlist version [3854d49239].
|
| < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/commitinfo version [85654ac9a8].
|
| < < < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/config version [28e7a42550].
|
| < < < < < < < < < < < |
Deleted mttroot/CVSROOT/cvswrappers version [9d41597c29].
|
| < < < < < < < < < < < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/editinfo version [dfa5fb459c].
|
| < < < < < < < < < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/loginfo version [4503d4cd47].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/modules version [84b74e5335].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/notify version [2a5259e3c5].
|
| < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/rcsinfo version [c276b88ba1].
|
| < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/taginfo version [364dad5373].
|
| < < < < < < < < < < < < < < < < < < < < |
Deleted mttroot/CVSROOT/verifymsg version [cbc796537d].
|
| < < < < < < < < < < < < < < < < < < < < < |
Modified mttroot/mtt/bin/mtt from [10150b1995] to [af07966fc8].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | # Copyright (C) 2001 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## Revision 1.308 2001/04/25 22:17:45 geraint ## Fixed icd.txt2 dependency. ## ## Revision 1.307 2001/04/15 21:15:41 geraint ## Added interface definition rep: _ICD.(txt|c|cc|m). ## ## Revision 1.305 2001/04/11 09:44:26 gawthrop | > > > > > > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | # Copyright (C) 2001 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ ## Revision 1.309.2.1 2001/05/04 04:07:24 geraint ## Numerical solution of algebraic equations. ## sys_ae.cc written for unsolved inputs. ## Solution of equations using hybrd from MINPACK (as used by Octave fsolve). ## ## 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 ## Added interface definition rep: _ICD.(txt|c|cc|m). ## ## Revision 1.305 2001/04/11 09:44:26 gawthrop |
︙ | ︙ | |||
1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 | # Default not verbose verbose=' -s' # Default integration method integration_method=implicit; # Default no info info_switch='' # Default use m, not oct files m='m'; # Default use ps files | > > > | 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 | # Default not verbose verbose=' -s' # Default integration method integration_method=implicit; # Default algebraic equation solver algebraic_solver=Reduce_Solver; # Default no info info_switch='' # Default use m, not oct files m='m'; # Default use ps files |
︙ | ︙ | |||
1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 | integration_method=rk4; mtt_switches="$mtt_switches rk4"; ;; *) echo $1 is an unknown integration method - use euler, rk4 or implicit; exit;; esac;; -s ) mtt_switches="$mtt_switches $1"; sensitivity=sensitivity ;; -ss ) mtt_switches="$mtt_switches $1"; steadystate_computation=yes ;; -d ) | > > > > > > > > > > > > > > > > > > > > > > > | 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 | integration_method=rk4; mtt_switches="$mtt_switches rk4"; ;; *) echo $1 is an unknown integration method - use euler, rk4 or implicit; exit;; esac;; -ae ) mtt_switches="$mtt_switches $1"; case $2 in fsolve | hybrd) mtt_switches="$mtt_switches $2"; algebraic_solver=Hybrd_Solver; shift; ;; hooke) mtt_switches="$mtt_switches $2"; algebraic_solver=HJ_Solver; shift; ;; reduce) mtt_switches="$mtt_switches $2"; algebraic_solver=Reduce_Solver; Solve='-A'; shift; ;; *) echo $1 is an unknown solver - use hybrd, hooke or reduce; exit;; esac;; -s ) mtt_switches="$mtt_switches $1"; sensitivity=sensitivity ;; -ss ) mtt_switches="$mtt_switches $1"; steadystate_computation=yes ;; -d ) |
︙ | ︙ | |||
1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 | echo ' -I prints more information' echo ' -abg start at abg.m representation' echo ' -c c-code generation' echo ' -d <dir> use directory <dir>' echo ' -dc Maximise derivative (not integral) causality' echo ' -dc Maximise derivative (not integral) causality' echo ' -i <implicit|euler|rk4> Use implicit, euler or rk4 integration' echo ' -o ode is same as dae' echo ' -oct use oct files in place of m files where appropriate' echo ' -opt optimise code generation' echo ' -p print environment variables' echo ' -partition partition hierachical system' echo ' -pdf generate pdf in place of ps' echo ' -r reset time stamp on representation' | > | 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 | echo ' -I prints more information' echo ' -abg start at abg.m representation' echo ' -c c-code generation' echo ' -d <dir> use directory <dir>' echo ' -dc Maximise derivative (not integral) causality' echo ' -dc Maximise derivative (not integral) causality' echo ' -i <implicit|euler|rk4> Use implicit, euler or rk4 integration' echo ' -ae <reduce|hybrd|hooke> Solve algebraic equations with Reduce, hybrd (fsolve) or "Hooke and Jeeves"' echo ' -o ode is same as dae' echo ' -oct use oct files in place of m files where appropriate' echo ' -opt optimise code generation' echo ' -p print environment variables' echo ' -partition partition hierachical system' echo ' -pdf generate pdf in place of ps' echo ' -r reset time stamp on representation' |
︙ | ︙ | |||
1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 | rm -f *_csex.cc *_numpar.cc *_smxa.cc *_state.cc rm -f *_ode.cc *_odeo.cc rm -f *_logic.m *_logic.cc *_logic.oct rm -f *_state.m *_state.cc *_state.oct rm -f *_ode2odes.* *.dat2 MTT.core rm -f *_modpar.txt *_modpar.r rm -f *_ICD.txt *_ICD.c *_ICD.cc *_ICD.m rm -fR *_rep MTT_work exit fi # Clean up named system if [ "$2" = "Clean" ] && [ "$3" = "" ]; then echo 'Removing all generated files for system ' $1 | > | 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 | rm -f *_csex.cc *_numpar.cc *_smxa.cc *_state.cc rm -f *_ode.cc *_odeo.cc rm -f *_logic.m *_logic.cc *_logic.oct rm -f *_state.m *_state.cc *_state.oct rm -f *_ode2odes.* *.dat2 MTT.core rm -f *_modpar.txt *_modpar.r rm -f *_ICD.txt *_ICD.c *_ICD.cc *_ICD.m rm -f *_ae.r *_ae.m *_ae.cc *_ae.oct rm -fR *_rep MTT_work exit fi # Clean up named system if [ "$2" = "Clean" ] && [ "$3" = "" ]; then echo 'Removing all generated files for system ' $1 |
︙ | ︙ | |||
1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 | rm -f $1_csex.cc $1_numpar.cc $1_smxa.cc $1_state.cc rm -f $1_ode.cc $1_odeo.cc rm -f $1_logic.m $1_logic.cc $1_logic.oct rm -f $1_state.m $1_state.cc $1_state.oct rm -f $1_ode2odes.* $1.dat2 rm -f $1_modpar.txt $1_modpar.r rm -f $1_ICD.txt $1_ICD.c $1_ICD.cc $1_ICD.m rm -fR $1_rep MTT_work exit fi if [ "$2" = "rep" ]; then documenttype=article # See if we are making a book -- ie representation rep on a directory | > | 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 | rm -f $1_csex.cc $1_numpar.cc $1_smxa.cc $1_state.cc rm -f $1_ode.cc $1_odeo.cc rm -f $1_logic.m $1_logic.cc $1_logic.oct rm -f $1_state.m $1_state.cc $1_state.oct rm -f $1_ode2odes.* $1.dat2 rm -f $1_modpar.txt $1_modpar.r rm -f $1_ICD.txt $1_ICD.c $1_ICD.cc $1_ICD.m rm -f $1_ae.r $1_ae.m $1_ae.cc $1_ae.oct rm -fR $1_rep MTT_work exit fi if [ "$2" = "rep" ]; then documenttype=article # See if we are making a book -- ie representation rep on a directory |
︙ | ︙ | |||
1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 | .PRECIOUS: %.cc # Don't let mtt delete them $1_%.cc: $1_%.m mtt_m2cc.sh $1 \$* cat mtt_%.cc: ${MTT_LIB}/cc/mtt_%.cc cp ${MTT_LIB}/cc/mtt_\$*.cc mtt_\$*.cc ## .o files .PRECIOUS: $1_%.o $1_%.o: $1_%.cc $1_def.h $1_sympar.h $1_cr.h echo Compiling $1_\$*.cc ${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_CXXINCS} -c $< -DSTANDALONE .PRECIOUS: mtt_%.o | > > > | 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 | .PRECIOUS: %.cc # Don't let mtt delete them $1_%.cc: $1_%.m mtt_m2cc.sh $1 \$* cat mtt_%.cc: ${MTT_LIB}/cc/mtt_%.cc cp ${MTT_LIB}/cc/mtt_\$*.cc mtt_\$*.cc mtt_%.hh: ${MTT_LIB}/cc/mtt_%.hh cp ${MTT_LIB}/cc/mtt_\$*.hh mtt_\$*.hh ## .o files .PRECIOUS: $1_%.o $1_%.o: $1_%.cc $1_def.h $1_sympar.h $1_cr.h echo Compiling $1_\$*.cc ${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_CXXINCS} -c $< -DSTANDALONE .PRECIOUS: mtt_%.o |
︙ | ︙ | |||
2190 2191 2192 2193 2194 2195 2196 | else mtt_update $1 logic endif # Dummy target FORCE: | | | | | | 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 | else mtt_update $1 logic endif # Dummy target FORCE: $1_ode2odes_common.m : $1_ae.m $1_input.m $1_logic.m $1_numpar.m $1_simpar.m $1_state.m @echo > /dev/null $1_ode2odes_common.cc : $1_ae.cc $1_input.cc $1_logic.cc $1_numpar.cc $1_simpar.cc $1_state.cc @echo > /dev/null $1_ode2odes_common.o : $1_ae.o $1_input.o $1_logic.o $1_numpar.o $1_simpar.o $1_state.o @echo "Creating $1_ode2odes_common.o" ar -cr \$@ \$^ $1_ode2odes_common.oct : $1_ae.oct $1_input.oct $1_logic.oct $1_numpar.oct $1_simpar.oct $1_state.oct @echo > /dev/null $1_ode2odes_euler.m $1_ode2odes_rk4.m : $1_ode.m $1_odeo.m @echo > /dev/null $1_ode2odes_euler.cc $1_ode2odes_rk4.cc : $1_ode.cc $1_odeo.cc @echo > /dev/null $1_ode2odes_euler.o $1_ode2odes_rk4.o : $1_ode.o $1_odeo.o mtt_euler.o |
︙ | ︙ | |||
2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 | @echo > /dev/null $1_ode2odes_implicit.o : $1_cseo.o $1_csex.o $1_smxa.o $1_smxax.o mtt_implicit.o @echo "Creating $1_ode2odes_implicit.o" ar -cr \$@ \$^ $1_ode2odes_implicit.oct: $1_cseo.oct $1_csex.oct $1_smxa.oct $1_smxax.oct mtt_implicit.oct @echo > /dev/null #SUMMARY numpar numerical parameter declaration (m) $1_numpar.m: $1_numpar.txt $1_sympars.txt mtt_txt2m $1 numpar #SUMMARY numpar numerical parameter declaration (c) #SUMMARY numpar numerical parameter declaration (view) | > > > > > | 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 | @echo > /dev/null $1_ode2odes_implicit.o : $1_cseo.o $1_csex.o $1_smxa.o $1_smxax.o mtt_implicit.o @echo "Creating $1_ode2odes_implicit.o" ar -cr \$@ \$^ $1_ode2odes_implicit.oct: $1_cseo.oct $1_csex.oct $1_smxa.oct $1_smxax.oct mtt_implicit.oct @echo > /dev/null mtt_Solver.cc: mtt_Solver.hh $1_ode2odes_${algebraic_solver}.cc: mtt_Solver.cc mtt_${algebraic_solver}.hh mtt_${algebraic_solver}.cc $1_ode2odes_${algebraic_solver}.o: mtt_Solver.o mtt_${algebraic_solver}.o @echo "Creating $1_ode2odes_${algebraic_solver}.o" ar -cr \$@ \$^ #SUMMARY numpar numerical parameter declaration (m) $1_numpar.m: $1_numpar.txt $1_sympars.txt mtt_txt2m $1 numpar #SUMMARY numpar numerical parameter declaration (c) #SUMMARY numpar numerical parameter declaration (view) |
︙ | ︙ | |||
2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 | $1_dae.m: $1_def.r $1_dae.r $1_sympars.txt dae_r2m $1; matlab_tidy $1_dae.m; matlab_tidy $1_daeo.m $1_dae.c: $1_def.r $1_dae.r $1_sympar.r dae_r2c $1; c_tidy $1_dae.c $1_dae.tex: $1_dae.r $1_simp.r dae_r2tex $partition $1; latex_tidy $1_dae.tex #SUMMARY cse constrained-state equations (r) #SUMMARY cse* constrained-state equations (m) #SUMMARY cse* constrained-state equations (oct) #SUMMARY cse constrained-state equations (tex) #SUMMARY cse* constrained-state equations (view) #SUMMARY cse constrained-state equations (ps) | > > > > > > > > > | 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 | $1_dae.m: $1_def.r $1_dae.r $1_sympars.txt dae_r2m $1; matlab_tidy $1_dae.m; matlab_tidy $1_daeo.m $1_dae.c: $1_def.r $1_dae.r $1_sympar.r dae_r2c $1; c_tidy $1_dae.c $1_dae.tex: $1_dae.r $1_simp.r dae_r2tex $partition $1; latex_tidy $1_dae.tex #SUMMARY ae algebraic equations - unknown inputs (r) #SUMMARY ae algebraic equations - unknown inputs (m) #SUMMARY ae algebraic equations - unknown inputs (cc) $1_ae.r: $1_cse.r touch $1_ae.r $1_ae.m: $1_ae.r mtt_r2m $1 ae #SUMMARY cse constrained-state equations (r) #SUMMARY cse* constrained-state equations (m) #SUMMARY cse* constrained-state equations (oct) #SUMMARY cse constrained-state equations (tex) #SUMMARY cse* constrained-state equations (view) #SUMMARY cse constrained-state equations (ps) |
︙ | ︙ | |||
2513 2514 2515 2516 2517 2518 2519 | $1_smxa.m $1_smxax.m\ $1_simpar.m $1_numpar.m $1_state.m $1_input.m \ $1_csex.m $1_cseo.m $1_logic.m ifeq ($using_oct,yes) touch $1_ode2odes.m # Create a dummy which wont' be used mtt $mtt_switches -q -u $1 ode2odes oct else | | | | | | | | | 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 | $1_smxa.m $1_smxax.m\ $1_simpar.m $1_numpar.m $1_state.m $1_input.m \ $1_csex.m $1_cseo.m $1_logic.m ifeq ($using_oct,yes) touch $1_ode2odes.m # Create a dummy which wont' be used mtt $mtt_switches -q -u $1 ode2odes oct else make_ode2odes $1 m $integration_method $algebraic_solver endif endif ifneq ($integration_method,implicit) $1_ode2odes.m : $1_def.r $1_sympars.txt\ $1_simpar.m $1_numpar.m $1_state.m $1_input.m \ $1_ode.m $1_odeo.m $1_logic.m ifeq ($using_oct,yes) echo "*** Warning: Shouldn't be here! Creating dummy $1_ode2odes.m" touch $1_ode2odes.m # Create a dummy which wont' be used mtt $mtt_switches -q -u $1 ode2odes oct else make_ode2odes $1 m $integration_method $algebraic_solver endif endif #SUMMARY ode2odes Simulation function (m) #SUMMARY ode2odes Simulation function (cc) #SUMMARY ode2odes Simulation function (oct) #SUMMARY ode2odes Simulation function (exe) $1_ode2odes.exe: $1_def.h $1_sympar.h\ $1_ode2odes.o $1_ode2odes_common.o $1_ode2odes_${integration_method}.o $1_ode2odes_${algebraic_solver}.o echo Creating $1_ode2odes.exe ${MTT_CXX} ${MTT_CXXFLAGS} -o $1_ode2odes.exe\ $1_ode2odes.o $1_ode2odes_common.o $1_ode2odes_${integration_method}.o $1_ode2odes_${algebraic_solver}.o\ ${MTT_LDFLAGS} ${MTT_CXXLIBS} $1_ode2odes.o: $1_ode2odes.cc $1_ode2odes_common.o $1_ode2odes_${integration_method}.o $1_ode2odes_${algebraic_solver}.o echo Creating $1_ode2odes.o ${MTT_CXX} ${MTT_CXXFLAGS} ${MTT_CXXINCS} -c $1_ode2odes.cc -DSTANDALONE $1_ode2odes.oct: $1_ode2odes.cc $1_ode2odes_common.oct $1_ode2odes_${integration_method}.oct touch $1_ode2odes.m echo Creating $1_ode2odes.oct $MKOCTFILE $1_ode2odes.cc $1_ode2odes.cc: $1_def.r $1_sympars.txt\ $1_ode2odes_common.m $1_ode2odes_common.cc\ $1_ode2odes_${integration_method}.m $1_ode2odes_${integration_method}.cc mtt_Solver.cc mtt_${algebraic_solver}.cc mtt_${algebraic_solver}.hh touch $1_ode2odes.m make_ode2odes $1 cc $integration_method $algebraic_solver #Conversion of m to p to c #SUMMARY ode ordinary differential equations (c) #SUMMARY ode ordinary differential equations (p) #SUMMARY state state declaration (c) #SUMMARY state state declaration (p) $1_simpar.p : $1_def.r $1_simpar.m |
︙ | ︙ |
Modified mttroot/mtt/bin/trans/cse2ode_r from [b0e0e060b2] to [6fa8ee5ed3].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | # Copyright (c) P.J.Gawthrop, 1991, 1994. ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.2 1997/01/06 21:17:10 peterg ## Removed: OFF Exp; OFF GCD; ## ## Revision 1.1 1996/08/25 10:05:45 peter ## Initial revision ## ############################################################### | > > > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | # Copyright (c) P.J.Gawthrop, 1991, 1994. ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.1 2000/12/28 12:21:31 peterg ## Put under RCS ## ## Revision 1.2 1997/01/06 21:17:10 peterg ## Removed: OFF Exp; OFF GCD; ## ## Revision 1.1 1996/08/25 10:05:45 peter ## Initial revision ## ############################################################### |
︙ | ︙ | |||
43 44 45 46 47 48 49 50 51 52 53 54 55 56 | in "$1_def.r"; %Read the substitution file in "$1_subs.r"; %Read the constrained-state equations file in "$1_cse.r"; IF MTTNx>0 THEN IF MTTNz>0 THEN MTTdXX := MTTE^(-1)*MTTEdX ELSE MTTdXX := MTTEdX; | > > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | in "$1_def.r"; %Read the substitution file in "$1_subs.r"; %Read the constrained-state equations file in "$1_cse.r"; %Read the algebraic equations file in "$1_ae.r"; IF MTTNx>0 THEN IF MTTNz>0 THEN MTTdXX := MTTE^(-1)*MTTEdX ELSE MTTdXX := MTTEdX; |
︙ | ︙ |
Modified mttroot/mtt/bin/trans/dae2cse_r from [2f584317f5] to [7e2f3c3197].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | # Copyright (c) P.J.Gawthrop 1991, 1992, 1994. ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.14.2.1 2001/03/19 00:29:08 geraint ## Parse switches (-A) before calling def2write_r. ## Update $1_def.* instead of removing. ## ## Revision 1.14 2000/12/28 12:24:35 peterg ## *** empty log message *** ## | > > > > > > > > > > > | 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 | # Copyright (c) P.J.Gawthrop 1991, 1992, 1994. ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.15.2.2 2001/05/05 20:50:16 geraint ## Fixed errors when MTTNx=0. ## ## Revision 1.15.2.1 2001/05/04 04:07:24 geraint ## Numerical solution of algebraic equations. ## sys_ae.cc written for unsolved inputs. ## Solution of equations using hybrd from MINPACK (as used by Octave fsolve). ## ## Revision 1.15 2001/03/19 02:28:52 geraint ## Branch merge: merging-ode2odes-exe back to MAIN. ## ## Revision 1.14.2.1 2001/03/19 00:29:08 geraint ## Parse switches (-A) before calling def2write_r. ## Update $1_def.* instead of removing. ## ## Revision 1.14 2000/12/28 12:24:35 peterg ## *** empty log message *** ## |
︙ | ︙ | |||
279 280 281 282 283 284 285 | BEGIN MTT_sol_i := first(MTT_sol); MTT_sol := rest(MTT_sol); set(lhs(MTT_sol_i),rhs(MTT_sol_i)); END; % No algebraic variables left! MTTNYz := 0; | | > > > > > > > > > > > > > | | > > > | | | 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 | BEGIN MTT_sol_i := first(MTT_sol); MTT_sol := rest(MTT_sol); set(lhs(MTT_sol_i),rhs(MTT_sol_i)); END; % No algebraic variables left! MTTNYz := 0; END; % IF MTTNyz>0 and $solve OUT "$1_ae.r"; IF (MTTNyz>0) THEN % not $solve (or perhaps solution failed?) BEGIN WRITE "MATRIX MTTyz(",MTTNyz,",1)"; WRITE "%File: $1_ae.r"; FOR i := 1:MTTNyz DO WRITE "MTTyz(",i,",1) := ",MTTyz(i,1); END; % if MTTNyz>0 (and !$solve) WRITE ";END;"; SHUT "$1_ae.r"; % Create the matrix declarations OUT "$1_cse.r1"; write "%"; IF (MTTNx > 0) THEN BEGIN write "MATRIX MTTEdx(", MTTNx, ",", 1, ")$"; write "MATRIX MTTE(", MTTNx, ",", MTTNx, ")$"; END; SHUT "$1_cse.r1"; OUT "$1_csex.r1"; write "%File:$1_csex.r1"; IF (MTTNx > 0) THEN write "MATRIX MTTEdx(", MTTNx, ",", 1, ")$"; SHUT "$1_csex.r1"; IF MTTNy>0 THEN BEGIN OUT "$1_cseo.r1"; write "MATRIX MTTY(", MTTNy, ",", 1, ")$"; SHUT "$1_cseo.r1"; END; %%Create the _cse.r file OUT "$1_cse.r2"; write "%File: $1_cse.r"; in ("$1_cse_write.r"); |
︙ | ︙ |
Modified mttroot/mtt/bin/trans/def2write_r from [7008801453] to [9917137f0f].
︙ | ︙ | |||
9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.6 2000/11/29 20:48:53 peterg ## Zapped unnecessary Npar creation ## ## Revision 1.5 2000/11/09 10:12:24 peterg ## Removed debugging line ## ## Revision 1.4 2000/10/14 16:19:54 peterg | > > > > > | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.7 2001/04/11 09:44:26 gawthrop ## Fixed cc and c problems to do with pow(x,y) and integers ## mtt/lib/reduce/fix_c.r is included in rdae2dae and cse2smx_lang for ## -c, -cc and -oct options ## ## Revision 1.6 2000/11/29 20:48:53 peterg ## Zapped unnecessary Npar creation ## ## Revision 1.5 2000/11/09 10:12:24 peterg ## Removed debugging line ## ## Revision 1.4 2000/10/14 16:19:54 peterg |
︙ | ︙ | |||
76 77 78 79 80 81 82 | ;; ode) matrices='dX' ns="$Nx" ms="1" ;; odeo) | | | | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | ;; ode) matrices='dX' ns="$Nx" ms="1" ;; odeo) matrices='Y' ns="$Ny" ms="1 1" ;; sm) matrices='A B C D' ns="$Nx $Nx $Ny $Ny" ms="$Nx $Nu $Nx $Nu" ;; |
︙ | ︙ |
Modified mttroot/mtt/bin/trans/m/args2arg.m from [88e206959b] to [b6ee5ada28].
︙ | ︙ | |||
24 25 26 27 28 29 30 31 | % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Field separator if nargin<3 FS = ';'; end; | > > > > > > > > > > > > > > > > > > > > > > | 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 | % %% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Field separator if nargin<3 FS = ';'; end; arg = ''; if strcmp(args, '')==0 L = length(args); args_count = 0; for i=1:n arg_count = 0; arg = ''; if args_count == L break; end; while args_count < L args_count = args_count+1; arg_count = arg_count+1; ch = str2ch(args,args_count); if ch==FS break; end; arg = [arg ch]; end; end; end; |
Modified mttroot/mtt/bin/trans/make_ode2odes from [a0ec3f6c8d] to [a0a317a4de].
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.56 2001/03/30 15:13:58 gawthrop ## Rationalised simulation modes to each return mtt_data ## ## Revision 1.55 2001/03/27 13:21:59 geraint ## Octave version compatibility for save_ascii_data(_for_plotting). ## ## Revision 1.54 2001/03/27 01:14:27 geraint | > > > > > > > > > | 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 | #! /bin/sh ###################################### ##### Model Transformation Tools ##### ###################################### ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.57.2.1 2001/05/04 04:07:24 geraint ## Numerical solution of algebraic equations. ## sys_ae.cc written for unsolved inputs. ## Solution of equations using hybrd from MINPACK (as used by Octave fsolve). ## ## Revision 1.57 2001/04/01 03:38:54 geraint ## Reset row to zero after write to file, ready for subsequent runs. ## Eliminates SIGSEGV in Octave when _ode2odes called multiple times. ## ## Revision 1.56 2001/03/30 15:13:58 gawthrop ## Rationalised simulation modes to each return mtt_data ## ## Revision 1.55 2001/03/27 13:21:59 geraint ## Octave version compatibility for save_ascii_data(_for_plotting). ## ## Revision 1.54 2001/03/27 01:14:27 geraint |
︙ | ︙ | |||
217 218 219 220 221 222 223 224 225 226 227 228 229 230 | filename=${sys}_ode2odes.${lang} if [ -n "$3" ]; then method=$3 else method=implicit fi echo Creating $filename with $method integration method # Find system constants Nx=`mtt_getsize $sys x` # States Nu=`mtt_getsize $sys u` # Inputs Ny=`mtt_getsize $sys y` # Inputs | > > > > > > | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | filename=${sys}_ode2odes.${lang} if [ -n "$3" ]; then method=$3 else method=implicit fi if [ -n "$4" ]; then algebraic_solver=$4 else algebraic_solver="Reduce_Solver" fi echo Creating $filename with $method integration method # Find system constants Nx=`mtt_getsize $sys x` # States Nu=`mtt_getsize $sys u` # Inputs Ny=`mtt_getsize $sys y` # Inputs |
︙ | ︙ | |||
340 341 342 343 344 345 346 | feval_header=parse.h save_ascii_data_function=save_ascii_data_for_plotting ;; esac cat <<EOF > $filename #include <octave/oct.h> | | | | > > > > > > > > | 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 | feval_header=parse.h save_ascii_data_function=save_ascii_data_for_plotting ;; esac cat <<EOF > $filename #include <octave/oct.h> #include <octave/load-save.h> #include <octave/lo-mappers.h> #include <octave/ov-struct.h> #include <octave/variables.h> #ifndef STANDALONE #include <octave/${feval_header}> #endif #include "${sys}_def.h" #include "${sys}_sympar.h" #ifdef STANDALONE #include <csignal> #include <fstream> #include "mtt_${algebraic_solver}.hh" extern ColumnVector F${sys}_ae ( ColumnVector &x, ColumnVector &u, const double &t, ColumnVector &par); extern ColumnVector F${sys}_input ( ColumnVector &x, ColumnVector &y, const double &t, ColumnVector &par); |
︙ | ︙ | |||
426 427 428 429 430 431 432 | ColumnVector &u, const double &t, ColumnVector &par); EOF fi cat <<EOF >> $filename | | > > > > > > > > | > > > > > > > > | 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 | ColumnVector &u, const double &t, ColumnVector &par); EOF fi cat <<EOF >> $filename void set_signal_handlers (void); #endif // STANDALONE inline ColumnVector mtt_input (ColumnVector &x, ColumnVector &y, const double &t, ColumnVector &par) { #ifdef STANDALONE static ColumnVector u (MTTNU); static ColumnVector ui (MTTNYZ); static ColumnVector U (MTTNU+MTTNYZ); static ${algebraic_solver} ae(F${sys}_ae,MTTNPAR,MTTNU,MTTNX,MTTNY,MTTNYZ); u = F${sys}_input (x, y, t, par); if (MTTNYZ == 0) { return u; } else { return ae.solve(x,u,t,par); } #else static octave_value_list args, f; args (0) = octave_value (x); args (1) = octave_value (y); args (2) = octave_value (t); args (3) = octave_value (par); f = feval ("${sys}_input", args, 1); |
︙ | ︙ | |||
657 658 659 660 661 662 663 | ostream &file = cout) { static Matrix data; static int row; if (dump_data) { | > > | | > | 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 | ostream &file = cout) { static Matrix data; static int row; if (dump_data) { if (row > 0) { Matrix written_data = data.extract (0, 0, row-1, data.cols ()-1); $save_ascii_data_function (file, written_data, "MTT_data"); } return; } const int nx = x.length (), ny = y.length (); register int col = 0; if (0 == row) |
︙ | ︙ | |||
696 697 698 699 700 701 702 | #ifdef STANDALONE void dump_data (ostream &file) { ColumnVector null (0.0); mtt_write (0.0, null, null, 0, true, file); } | < < | | 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 | #ifdef STANDALONE void dump_data (ostream &file) { ColumnVector null (0.0); mtt_write (0.0, null, null, 0, true, file); } void handle_signal (int signum) { // handle some signals to ensure data is written. cerr << "# Writing data to MTT.core (signal " << signum << ")" << endl; ofstream corefile ("MTT.core"); dump_data (corefile); switch (signum) { case SIGFPE: // Intel chips do not raise SIGFPE for DIVZERO :-( // raise (SIGABRT); break; case SIGINT: break; case SIGQUIT: signal (SIGQUIT, SIG_DFL); raise (SIGQUIT); break; |
︙ | ︙ |
Modified mttroot/mtt/bin/trans/mtt_header from [6a295989c6] to [c460ed9eaf].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.30 2001/03/30 15:13:58 gawthrop ## Rationalised simulation modes to each return mtt_data ## ## Revision 1.29 2001/03/27 13:10:23 geraint ## Improved determination of Octave version. ## ## Revision 1.28 2001/02/17 03:48:17 geraint | > > > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.31 2001/04/03 14:49:42 gawthrop ## Revised to incorporate new ssim (sensitivity simulation) ## representation (m only just now). ## ## Revision 1.30 2001/03/30 15:13:58 gawthrop ## Rationalised simulation modes to each return mtt_data ## ## Revision 1.29 2001/03/27 13:10:23 geraint ## Improved determination of Octave version. ## ## Revision 1.28 2001/02/17 03:48:17 geraint |
︙ | ︙ | |||
160 161 162 163 164 165 166 167 168 169 170 171 172 173 | # Representation-specific stuff eqnargs='mttx,mttu,mttt,mttpar' inputeqnargs='mttx,mtty,mttt,mttpar' case $rep in cse) states=yes; inputs=yes; parameters=yes; output='mttdx,mtte' args=$eqnargs ;; | > > > > > > > | 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 | # Representation-specific stuff eqnargs='mttx,mttu,mttt,mttpar' inputeqnargs='mttx,mtty,mttt,mttpar' case $rep in ae) states=yes; inputs=yes; parameters=yes; output=mttyz; args=$eqnargs; ;; cse) states=yes; inputs=yes; parameters=yes; output='mttdx,mtte' args=$eqnargs ;; |
︙ | ︙ | |||
201 202 203 204 205 206 207 208 209 210 211 212 213 214 | states=no; parameters=no; declareinputs=no; else states=yes; parameters=yes; declareinputs=yes fi ;; logic) states=no; inputs=no; parameters=yes; output=mttopen | > | 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 | states=no; parameters=no; declareinputs=no; else states=yes; parameters=yes; declareinputs=yes declarestates=yes fi ;; logic) states=no; inputs=no; parameters=yes; output=mttopen |
︙ | ︙ | |||
469 470 471 472 473 474 475 476 477 478 479 480 481 482 | $Lc Inputs $Rc EOF N=`n2m 1 $Nu` for i in $N; do echo $constant_declaration 'mttu'$i' = mttu('$i$minusone');' done fi if [ "$declareinputs" = "yes" ]; then declare_vars input fi if [ "$declaredummies" = "yes" ]; then | > > > > > > > > > | 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 | $Lc Inputs $Rc EOF N=`n2m 1 $Nu` for i in $N; do echo $constant_declaration 'mttu'$i' = mttu('$i$minusone');' done cat <<EOF $Lc Unknown Inputs $Rc EOF Ni=`n2m 1 $Nyz` for i in $Ni; do echo $constant_declaration 'mttui'$i' = mttu('$Nu+$i$minusone');' done fi if [ "$declareinputs" = "yes" ]; then declare_vars input fi if [ "$declaredummies" = "yes" ]; then |
︙ | ︙ | |||
525 526 527 528 529 530 531 532 533 534 535 536 537 538 | arg_type="Octave_map" arg_size=""; ;; mttu) arg_type="ColumnVector" arg_size="(MTTNU)" ;; mtty) arg_type="ColumnVector" arg_size="(MTTNY)" ;; mttt) arg_type="const double" arg_size="" | > > > > | 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 | arg_type="Octave_map" arg_size=""; ;; mttu) arg_type="ColumnVector" arg_size="(MTTNU)" ;; mttyz) arg_type="ColumnVector" arg_size="(MTTNYZ)" ;; mtty) arg_type="ColumnVector" arg_size="(MTTNY)" ;; mttt) arg_type="const double" arg_size="" |
︙ | ︙ |
Modified mttroot/mtt/bin/trans/mtt_r2m from [2c1a02abfa] to [41d69599dd].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.26 2000/11/27 11:52:10 peterg ## Changed some greps to be case insensitive ## ## Revision 1.25 2000/10/14 08:50:07 peterg ## Use new mtt_header ## ## Revision 1.24 2000/10/11 09:07:53 peterg | > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | # Copyright (C) 2000 by Peter J. Gawthrop ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ ## Revision 1.27 2001/02/08 00:39:56 geraint ## Removed clear from code generated by: mtt -c -i euler -o ## ## Revision 1.26 2000/11/27 11:52:10 peterg ## Changed some greps to be case insensitive ## ## Revision 1.25 2000/10/14 08:50:07 peterg ## Use new mtt_header ## ## Revision 1.24 2000/10/11 09:07:53 peterg |
︙ | ︙ | |||
130 131 132 133 134 135 136 | echo Creating $out # Remove the old log file rm -f mtt_r2m.log #Header case $rep in | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | echo Creating $out # Remove the old log file rm -f mtt_r2m.log #Header case $rep in ae|csex|cseo|ode|odeo) vectorise=yes ;; *) esac mtt_header $1 $rep $ext > mtt_junk |
︙ | ︙ |
Modified mttroot/mtt/cc/include/useful-functions.hh from [61119a71b8] to [652bf845ed].
1 2 3 4 5 6 7 8 | #define pi 3.14159 // Predefine pi #ifndef HAVE_USEFUL_FUNCTIONS_HH #define HAVE_USEFUL_FUNCTIONS_HH #ifndef __cplusplus #define inline /* strip */ | < < < | | | | | 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 | #define pi 3.14159 // Predefine pi #ifndef HAVE_USEFUL_FUNCTIONS_HH #define HAVE_USEFUL_FUNCTIONS_HH #ifndef __cplusplus #define inline /* strip */ #endif // ! __cplusplus static inline double max (const double x1, const double x2) { return static_cast<double>((x1 >= x2) ? x1 : (x1 < x2) ? x2 : 0); } static inline double min (const double x1, const double x2) { return static_cast<double>((x1 <= x2) ? x1 : (x1 > x2) ? x2 : 0); } static inline double nonsingular (const double x) { return static_cast<double>((x == 0) ? 1.0e-30 : x); } static inline double sign (const double x) { return static_cast<double>((x > 0) ? +1 : (x < 0) ? -1 : 0); } // Octave functions #ifdef __cplusplus |
︙ | ︙ |
Added mttroot/mtt/lib/cc/mtt_HJ_Solver.hh version [da2fe34a04].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include "mtt_Solver.hh" class HJ_Solver : public Solver { // http://www.netlib.org/opt/hooke.c // Hooke and Jeeves solution public: HJ_Solver (sys_ae ae, const int npar, const int nu, const int nx, const int ny, const int nyz) : Solver (ae,npar,nu,nx,ny,nyz) { static_ptr = this; VARS = nyz; }; static double f (double tryUi[], int nyz); protected: void Solve (void); double best_nearby (double delta[], double point[], double prevbest, int nvars); int hooke (int nvars, // MTTNYZ double startpt[], // user's initial guess double endpt[], // result double rho = 0.05, // geometric shrink factor double epsilon = 1e-3, // end value stepsize int itermax = 5000); // max # iterations private: int VARS; public: static HJ_Solver *static_ptr; }; |
Added mttroot/mtt/lib/cc/mtt_Hybrd_Solver.cc version [e965430e5f].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include "mtt_Hybrd_Solver.hh" // http://www.netlib.org/minpack/hybrd.f // used by Octave's fsolve Hybrd_Solver *Hybrd_Solver::static_ptr; ColumnVector Hybrd_Solver::f_hybrd (const ColumnVector &tryUi) { Hybrd_Solver::static_ptr->_yz = Hybrd_Solver::static_ptr->eval(tryUi); return Hybrd_Solver::static_ptr->_yz; } void Hybrd_Solver::Solve (void) { int info; static int input_errors; static int user_errors; static int convergences; static int progress_errors; static int limit_errors; static int unknown_errors; NLFunc fcn(&Hybrd_Solver::f_hybrd); NLEqn eqn(Solver::_ui,fcn); // eqn.set_tolerance(0.01); Solver::_ui = eqn.solve(info); switch (info) { case 1: convergences++; break; case -2: input_errors++; break; case -1: user_errors++; break; case 3: progress_errors++; break; case 4: // if (abs(eval(_ui).max()) > 1.0e-6) limit_errors++; // else // convergences++; break; default: unknown_errors++; break; } if (1 != info) { cerr << "input (" << input_errors << ") " << " user (" << user_errors << ") " << " converge (" << convergences << ") " << " progress (" << progress_errors << ") " << " limit (" << limit_errors << ")" << " unknown (" << unknown_errors << ")" << " (max error = " << abs(eval(_ui).max()) << ")" << endl; } } |
Added mttroot/mtt/lib/cc/mtt_Hybrd_Solver.hh version [79adf97ac2].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include "mtt_Solver.hh" #include <octave/NLEqn.h> class Hybrd_Solver : public Solver { // http://www.netlib.org/minpack/hybrd.f // used by Octave's fsolve public: Hybrd_Solver (sys_ae ae, const int npar, const int nu, const int nx, const int ny, const int nyz) : Solver (ae,npar,nu,nx,ny,nyz) { static_ptr = this; } static ColumnVector f_hybrd (const ColumnVector &tryUi); protected: void Solve (void); public: static Hybrd_Solver *static_ptr; }; |
Added mttroot/mtt/lib/cc/mtt_Reduce_Solver.cc version [55dcc109c3].
> > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 | #include "mtt_Reduce_Solver.hh" void Reduce_Solver::Solve (void) { cerr << "Error:" << " Symbolic solution of equations failed during model build" << endl << " Try using one of the other algebraic solution methods" << endl; } |
Added mttroot/mtt/lib/cc/mtt_Reduce_Solver.hh version [b44a93cb60].
> > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include "mtt_Solver.hh" class Reduce_Solver : public Solver { // Dummy class // This will not be used unless the Reduce solver has failed earlier // in the model build process public: Reduce_Solver (sys_ae ae, const int npar, const int nu, const int nx, const int ny, const int nyz) : Solver (ae,npar,nu,nx,ny,nyz) { ; }; void Solve (void); }; |
Added mttroot/mtt/lib/cc/mtt_Solver.cc version [d33ce07dea].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #include "mtt_Solver.hh" Solver::Solver (sys_ae ae, const int npar, const int nu, const int nx, const int ny, const int nyz) { _ae = ae; _np = npar; _nu = nu; _nx = nx; _ny = ny; _nyz = nyz; _uui = ColumnVector (_nu+_nyz); }; ColumnVector Solver::solve (const ColumnVector &x, const ColumnVector &u, const double &t, const ColumnVector &par) { _x = x; _uui.insert(u,0); _t = t; _par = par; _ui = ColumnVector(_nyz,0.2); Solve (); _uui.insert(_ui,_nu); return _uui; } ColumnVector Solver::eval (const ColumnVector &ui) { _uui.insert(ui,_nu); return _ae (_x, _uui, _t, _par); } |
Added mttroot/mtt/lib/cc/mtt_Solver.hh version [d701ed61c9].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #ifndef MTT_SOLVER #define MTT_SOLVER #include <cmath> #include <cstdlib> #include <iostream> #include <octave/oct.h> class Solver { typedef ColumnVector (*sys_ae) // pointer to F${sys}_ae function (ColumnVector &,ColumnVector &,const double &t,ColumnVector &); public: Solver (sys_ae ae, const int npar, const int nu, const int nx, const int ny, const int nyz); ColumnVector solve (const ColumnVector &x, const ColumnVector &u, const double &t, const ColumnVector &par); ColumnVector eval (const ColumnVector &ui); protected: virtual void Solve (void) = 0; protected: ColumnVector _x; ColumnVector _uui; double _t; ColumnVector _par; ColumnVector _ui; ColumnVector _yz; int _nu; int _np; int _nx; int _ny; int _nyz; sys_ae _ae; }; #endif // MTT_SOLVER |