Overview
Comment: | rc2 now works. Clutch plot is upside down !? |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/master | trunk |
Files: | files | file ages | folders |
SHA3-256: |
c4ef9d98abc408796f6d2d6143fbbf7f |
User & Date: | geraint@users.sourceforge.net on 2003-04-13 14:59:18 |
Other Links: | branch diff | manifest | tags |
Context
2003-04-17
| ||
20:07:33 | Added rule to create _sese.m check-in: 5fdf656744 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
2003-04-13
| ||
14:59:18 | rc2 now works. Clutch plot is upside down !? check-in: c4ef9d98ab user: geraint@users.sourceforge.net tags: origin/master, trunk | |
14:22:37 |
"mtt -ibg rc odeso view" now works! Still some remaining issues, particularly ports/aliasing. check-in: 6b0982c6b8 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
Changes
Modified mttroot/mtt/bin/trans/m/ibg2abg.m from [7d20a69f04] to [8d7790c91d].
︙ | ︙ | |||
14 15 16 17 18 19 20 | for [bond, bond_name] = bonds i = str2num(split(bond_name, "bond")(2,:)); ## populate "head" and "tail" structures ## then copy the contents to an overall structure ## track (signed) vector bond number within each component | | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | for [bond, bond_name] = bonds i = str2num(split(bond_name, "bond")(2,:)); ## populate "head" and "tail" structures ## then copy the contents to an overall structure ## track (signed) vector bond number within each component head.index = +i; tail.index = -i; ## extract type of component at each end head_type = deblank(split(bond.head.component, ":")(1,:)); tail_type = deblank(split(bond.tail.component, ":")(1,:)); ## extract name of component at each end head_name = deblank(split(bond.head.component, ":")(2,:)); |
︙ | ︙ | |||
44 45 46 47 48 49 50 | if (strcmp(tail_type, "SS") & (index(tail_name, "[") == 1)) tail_comp_or_port = "port"; tail_name = mtt_strip_name(tail_name); else tail_comp_or_port = "comp"; endif | | | | | > > > | | > > > | 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 | if (strcmp(tail_type, "SS") & (index(tail_name, "[") == 1)) tail_comp_or_port = "port"; tail_name = mtt_strip_name(tail_name); else tail_comp_or_port = "comp"; endif eval(sprintf("comp_s.%s.%s.type = '%s';", head_comp_or_port, head_name, head_type)); eval(sprintf("comp_s.%s.%s.type = '%s';", tail_comp_or_port, tail_name, tail_type)); eval(sprintf("comp_s.%s.%s.bond%i = head;", head_comp_or_port, head_name, i)); eval(sprintf("comp_s.%s.%s.bond%i = tail;", tail_comp_or_port, tail_name, i)); endfor disp("--finished extracting data from ibg.m --") comp_s ## comp_s ## comp ## %s (name) ## type ## bond%i ## label ## port ## %s (name) ## type ## bond%i ## label #################################################### ## count number of vector bonds on each component ## #################################################### if (struct_contains(comp_s, "comp")) for [comp, comp_name] = comp_s.comp n = size(struct_elements(comp))(1) - 1; eval(sprintf("comp_s.comp.%s.n_bonds = %i;", comp_name, n)); endfor endif if (struct_contains(comp_s, "port")) for [port, port_name] = comp_s.port n = size(struct_elements(port))(1) - 1; eval(sprintf("comp_s.port.%s.n_bonds = %i;", port_name, n)); endfor endif disp("-- finished counting number of bonds on components --") comp_s ## comp_s ## comp ## %s (name) ## type ## n_bonds ## bond%i |
︙ | ︙ | |||
123 124 125 126 127 128 129 | bond.label = "[]"; endif if (! strcmp(bond.label, "[]")) n_named_ports += 1; port_label = bond.label; endif endif | | | | | | | 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | bond.label = "[]"; endif if (! strcmp(bond.label, "[]")) n_named_ports += 1; port_label = bond.label; endif endif eval(sprintf("comp.%s = bond;", bond_name)); endfor ## attach labels to unlabelled ports if (n_named_ports == 0) for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) bond.label = "in"; endif eval(sprintf("comp.%s = bond;", bond_name)); endfor elseif (n_named_ports == 1) mtt_info(sprintf("Defaulting all ports on junction %s to %s", \ comp_name, port_label), infofile); for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) bond.label = port_label; endif eval(sprintf("comp.%s = bond;", bond_name)); endfor elseif (n_named_ports != bond.n_bonds) mtt_error(sprintf("Junction must have 0,1 or %i port labels", \ n_bonds), errorfile); endif else ## component is not a junction for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) if (strcmp(bond.label, "[]")) if (bond.index > 0) bond.label = "in"; else bond.label = "out"; endif else bond.label = mtt_strip_name(bond.label); endif endif eval(sprintf("comp.%s = bond;", bond_name)); endfor endif eval(sprintf("comp_s.comp.%s = comp;", comp_name)); endfor endif #################### ## expand aliases ## #################### |
︙ | ︙ | |||
188 189 190 191 192 193 194 | old_name = bond.label; new_name = eval(sprintf("alias.%s", old_name)); bond.label = new_name; mtt_info(sprintf("Aliasing [%s] on %s (%s) to [%s]", old_name, comp_name, comp.type, new_name), infofile); endif | | | > > > | 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | old_name = bond.label; new_name = eval(sprintf("alias.%s", old_name)); bond.label = new_name; mtt_info(sprintf("Aliasing [%s] on %s (%s) to [%s]", old_name, comp_name, comp.type, new_name), infofile); endif eval(sprintf("comp.%s = bond;", bond_name)); endfor endif eval(sprintf("comp_s.%s = comp;", comp_name)); endif endfor endif disp("-- finished expanding aliases --") comp_s ## comp_s ## comp ## %s (name) ## type ## n_bonds ## bond%i |
︙ | ︙ | |||
220 221 222 223 224 225 226 | if (struct_contains(comp_s, "comp")) for [comp, comp_name] = comp_s.comp for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) [sub_bonds, n_sub_bonds] = split_port(bond.label); for i = 1:n_sub_bonds | | | | | | | < < < | < < < | | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | if (struct_contains(comp_s, "comp")) for [comp, comp_name] = comp_s.comp for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) [sub_bonds, n_sub_bonds] = split_port(bond.label); for i = 1:n_sub_bonds eval(sprintf("bond.subbond%i.label = '%s';", i, deblank(sub_bonds(i,:)))) endfor endif eval(sprintf("comp.%s = bond;", bond_name)); endfor eval(sprintf("comp_s.comp.%s = comp;", comp_name)); endfor endif if (struct_contains(comp_s, "port")) for [port, port_name] = comp_s.port for [bond, bond_name] = port if (index(bond_name, "bond") == 1) [sub_bonds, n_sub_bonds] = split_port(bond.label); for i = 1:n_sub_bonds eval(sprintf("bond.subbond%i.label = '%s';", i, deblank(sub_bonds(i,:)))); endfor endif eval(sprintf("port.%s = bond;", bond_name)); endfor eval(sprintf("comp_s.port.%s = port;", port_name)); endfor endif disp("-- finished creating sub-bonds --") comp_s ## comp_s ## comp ## %s (name) ## type ## n_bonds ## bond%i |
︙ | ︙ | |||
305 306 307 308 309 310 311 | tail_name = mtt_strip_name(tail_name); else tail_comp_or_port = "comp"; endif ## create strings to reference each component head_str = sprintf("comp_s.%s.%s.bond%i", | | | | | | | | | | | | | < | > | > > > > | 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 | tail_name = mtt_strip_name(tail_name); else tail_comp_or_port = "comp"; endif ## create strings to reference each component head_str = sprintf("comp_s.%s.%s.bond%i", head_comp_or_port, head_name, i) tail_str = sprintf("comp_s.%s.%s.bond%i", tail_comp_or_port, tail_name, i) head_bond = eval(head_str); tail_bond = eval(tail_str); ## check compatible sizes head.n_subs = size(struct_elements(head_bond))(1) - 2; tail.n_subs = size(struct_elements(tail_bond))(1) - 2; if (head.n_subs != tail.n_subs) mtt_error(sprintf("Vector ports %s and %s are not compatible", head_bond.label, tail_bond.label), errorfile); elseif (head.n_subs > 1) mtt_info(sprintf("Vector port %s matches %s", head_bond.label, tail_bond.label), infofile); endif ## assign bond number for i = 1:head.n_subs ++unique_bond_number; eval(sprintf("%s.subbond%i.index = +%i;", head_str, i, unique_bond_number)); eval(sprintf("%s.subbond%i.index = -%i;", tail_str, i, unique_bond_number)); ## write causality for bond if (strcmp(bond.causality.effort, "head")) eval(sprintf("causality(%i,1) = +1;", unique_bond_number)); elseif (strcmp(bond.causality.effort, "tail")) eval(sprintf("causality(%i,1) = -1;", unique_bond_number)); else eval(sprintf("causality(%i,1) = 0;", unique_bond_number)); endif if (strcmp(bond.causality.flow, "head")) eval(sprintf("causality(%i,2) = -1;", unique_bond_number)); elseif (strcmp(bond.causality.flow, "tail")) eval(sprintf("causality(%i,2) = +1;", unique_bond_number)); else eval(sprintf("causality(%i,2) = 0;", unique_bond_number)); endif endfor endfor disp("-- finished assigning unique numbers to bonds --") comp_s ## comp_s ## comp ## %s (name) ## type ## n_bonds ## bond%i ## label ## subbond%i ## index ## port ## %s (name) ## type ## n_bonds ## bond%i ## label ## subbond%i ## index ## causality matrix is called "bonds" bonds = causality disp("-- finished writing bonds matrix --") ################################# ## map component data to cmp.m ## ################################# ## count number of components if (struct_contains(comp_s, "comp")) n_comps = size(struct_elements(comp_s.comp), 1) |
︙ | ︙ | |||
400 401 402 403 404 405 406 | ## determine if internal port (and fix name) or subsystem if (strcmp(this_type, "SS") & (index(this_name, "[") == 1)) comp_or_port = "port"; this_name = mtt_strip_name(this_name) else comp_or_port = "comp"; endif | | > > > | 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 | ## determine if internal port (and fix name) or subsystem if (strcmp(this_type, "SS") & (index(this_name, "[") == 1)) comp_or_port = "port"; this_name = mtt_strip_name(this_name) else comp_or_port = "comp"; endif eval(sprintf("comp_s.%s.%s.index = cmp;", comp_or_port, this_name)); endfor disp("-- finished getting component indices from cmp.m --") comp_s ## comp_s ## comp ## %s (name) ## type ## n_bonds ## bond%i |
︙ | ︙ | |||
432 433 434 435 436 437 438 439 440 441 442 443 444 445 | ########################## if (struct_contains(comp_s, "comp")) for [comp, comp_name] = comp_s.comp n_vector_bonds(comp.index) = comp.n_bonds; endfor endif ########################################### ## Write connections matrix (components) ## ########################################### if (struct_contains(comp_s, "comp")) n_comps = size(struct_elements(comp_s.comp))(1); | > > > | 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 | ########################## if (struct_contains(comp_s, "comp")) for [comp, comp_name] = comp_s.comp n_vector_bonds(comp.index) = comp.n_bonds; endfor endif disp("-- finished writing n_vector_bonds --") n_vector_bonds ########################################### ## Write connections matrix (components) ## ########################################### if (struct_contains(comp_s, "comp")) n_comps = size(struct_elements(comp_s.comp))(1); |
︙ | ︙ | |||
467 468 469 470 471 472 473 | if (struct_contains(comp_s, "port")) for [port, port_name] = comp_s.port counter = 0; for [bond, bond_name] = port if (index(bond_name, "bond") == 1) for [sub_bond, sub_bond_name] = bond if (index(sub_bond_name, "subbond") == 1) | | > > > | 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 | if (struct_contains(comp_s, "port")) for [port, port_name] = comp_s.port counter = 0; for [bond, bond_name] = port if (index(bond_name, "bond") == 1) for [sub_bond, sub_bond_name] = bond if (index(sub_bond_name, "subbond") == 1) components(port.index, ++counter) = sub_bond.index; endif endfor endif endfor endfor endif disp("-- finished writing components matrix --") components endfunction |