Overview
Comment: | Updating with locally modified version.
rc, rc2 and Clutch work flawlessly; abg.m is identical whether or not -ibg is used. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | origin/master | trunk |
Files: | files | file ages | folders |
SHA3-256: |
0be332b4d1372ba94e9ab559de892acb |
User & Date: | geraint@users.sourceforge.net on 2004-07-21 22:55:43 |
Other Links: | branch diff | manifest | tags |
Context
2004-07-22
| ||
13:18:02 | Minor typo in error message. check-in: 0b3302dd94 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
2004-07-21
| ||
22:55:43 |
Updating with locally modified version.
rc, rc2 and Clutch work flawlessly; abg.m is identical whether or not -ibg is used. | |
2004-07-19
| ||
22:22:25 | Fixed initialisation of ColumnVectors for -oct. check-in: 0c0ea183a1 user: geraint@users.sourceforge.net tags: origin/master, trunk | |
Changes
Modified mttroot/mtt/bin/trans/m/ibg2abg.m from [1ac4c95a71] to [6044ec8ba8].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | ################################ ## create component structure ## ################################ ## loop over each bond in ibg.m file 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; | > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ################################ ## create component structure ## ################################ ## loop over each bond in ibg.m file for [bond, bond_name] = bonds ## get the bond number 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; |
︙ | ︙ | |||
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 | > | | | | | > | > > > > | | | | | | | | | | | > > > > > > > | 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 | 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 ## copy data to object structure (objects) eval(sprintf("objects.%s.%s.type = '%s';", head_comp_or_port, head_name, head_type)); eval(sprintf("objects.%s.%s.type = '%s';", tail_comp_or_port, tail_name, tail_type)); eval(sprintf("objects.%s.%s.bond%i = head;", head_comp_or_port, head_name, i)); eval(sprintf("objects.%s.%s.bond%i = tail;", tail_comp_or_port, tail_name, i)); endfor disp("--finished extracting data from ibg.m --") objects ## object structure: ## ## objects ## comp ## %s (name) ## type ## bond%i ## label ## port ## %s (name) ## type ## bond%i ## label ## ## "comp" contains components, subsystems and external SS ## "port" contains internal SS:[...] #################################################### ## count number of vector bonds on each component ## #################################################### if (struct_contains(objects, "comp")) for [comp, comp_name] = objects.comp n = size(struct_elements(comp))(1) - 1; eval(sprintf("objects.comp.%s.n_bonds = %i;", comp_name, n)); endfor endif if (struct_contains(objects, "port")) for [port, port_name] = objects.port n = size(struct_elements(port))(1) - 1; eval(sprintf("objects.port.%s.n_bonds = %i;", port_name, n)); endfor endif disp("-- finished counting number of bonds on components --") objects ## objects ## comp ## %s (name) ## type ## n_bonds ## bond%i ## label ## port ## %s (name) ## type ## n_bonds ## bond%i ## label ######################################################## ## ensure labels exist on all ports of each component ## ######################################################## if (struct_contains(objects, "comp")) for [comp, comp_name] = objects.comp if (strcmp(comp.type, "0") | strcmp(comp.type, "1")) ## convert type if (strcmp(comp.type, "0")) comp.type = "zero"; elseif (strcmp(comp.type, "1")) comp.type = "one"; endif ## component is a junction n_named_ports = 0; ## get labelled ports for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) if (! exist("bond.label")) |
︙ | ︙ | |||
172 173 174 175 176 177 178 | bond.label = mtt_strip_name(bond.label); endif endif eval(sprintf("comp.%s = bond;", bond_name)); endfor endif | | | | | | | | | | | | | | | | | 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 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 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | bond.label = mtt_strip_name(bond.label); endif endif eval(sprintf("comp.%s = bond;", bond_name)); endfor endif eval(sprintf("objects.comp.%s = comp;", comp_name)); endfor endif #################### ## expand aliases ## #################### if (struct_contains(objects, "comp")) for [comp, comp_name] = objects.comp if ((! strcmp(comp.type, "zero")) & (! strcmp(comp.type, "one"))) alias = eval(sprintf("%s_alias", comp.type)); if (is_struct(alias)) for [bond, bond_name] = comp if (struct_contains(alias, "bond.label")) 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("objects.%s = comp;", comp_name)); endif endfor endif disp("-- finished expanding aliases --") objects ## objects ## comp ## %s (name) ## type ## n_bonds ## bond%i ## label ## port ## %s (name) ## type ## n_bonds ## bond%i ## label ########################################## ## create sub-bonds according to labels ## ########################################## if (struct_contains(objects, "comp")) for [comp, comp_name] = objects.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("objects.comp.%s = comp;", comp_name)); endfor endif if (struct_contains(objects, "port")) for [port, port_name] = objects.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("objects.port.%s = port;", port_name)); endfor endif disp("-- finished creating sub-bonds --") objects ## objects ## comp ## %s (name) ## type ## n_bonds ## bond%i ## label ## subbond%i |
︙ | ︙ | |||
307 308 309 310 311 312 313 | tail_comp_or_port = "port"; tail_name = mtt_strip_name(tail_name); else tail_comp_or_port = "comp"; endif ## create strings to reference each component | | | | 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 | tail_comp_or_port = "port"; tail_name = mtt_strip_name(tail_name); else tail_comp_or_port = "comp"; endif ## create strings to reference each component head_str = sprintf("objects.%s.%s.bond%i", head_comp_or_port, head_name, i) tail_str = sprintf("objects.%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; |
︙ | ︙ | |||
361 362 363 364 365 366 367 | eval(sprintf("causality(%i,2) = 0;", unique_bond_number)); endif endfor endfor disp("-- finished assigning unique numbers to bonds --") | | | | 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 | eval(sprintf("causality(%i,2) = 0;", unique_bond_number)); endif endfor endfor disp("-- finished assigning unique numbers to bonds --") objects ## objects ## comp ## %s (name) ## type ## n_bonds ## bond%i ## label ## subbond%i |
︙ | ︙ | |||
390 391 392 393 394 395 396 | disp("-- finished writing bonds matrix --") ################################# ## map component data to cmp.m ## ################################# ## count number of components | | | | | | | | | 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | disp("-- finished writing bonds matrix --") ################################# ## map component data to cmp.m ## ################################# ## count number of components if (struct_contains(objects, "comp")) n_comps = size(struct_elements(objects.comp), 1) else n_comps = 0; endif ## count number of internal ports if (struct_contains(objects, "port")) n_ports = size(struct_elements(objects.port), 1) else n_ports = 0; endif ## read data from _cmp.m for cmp = 1:(n_comps + n_ports) [this_type, this_name] = eval(sprintf("%s_cmp(%i)", name, cmp)); ## 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("objects.%s.%s.index = cmp;", comp_or_port, this_name)); endfor disp("-- finished getting component indices from cmp.m --") objects ## objects ## comp ## %s (name) ## type ## n_bonds ## bond%i ## label ## subbond%i |
︙ | ︙ | |||
443 444 445 446 447 448 449 | ## index ## index ########################## ## write n_vector_bonds ## ########################## | | | | | | | > > > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ## index ## index ########################## ## write n_vector_bonds ## ########################## if (struct_contains(objects, "comp")) for [comp, comp_name] = objects.comp n_vector_bonds(comp.index,1) = comp.n_bonds; endfor endif disp("-- finished writing n_vector_bonds --") n_vector_bonds ########################################### ## Write connections matrix (components) ## ########################################### if (struct_contains(objects, "comp")) n_comps = size(struct_elements(objects.comp))(1); else n_comps = 0; endif components = zeros(n_comps, max(n_vector_bonds)); if (struct_contains(objects, "comp")) for [comp, comp_name] = objects.comp ## get portlist for component if exist([comp.type, '_cause']) == 0 eval(sprintf("ABG = %s_abg;", comp.type)); if struct_contains(ABG, "portlist") port_list = ABG.portlist; else error(sprintf("Component %s has no ports", comp.type)); endif else port_list = comp_ports(comp.type, comp.n_bonds) endif ## but do what with it? endfor endif disp("-- finished getting port_list --") if (struct_contains(objects, "comp")) for [comp, comp_name] = objects.comp counter = 0; for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) if (strcmp(bond.other_end_type, "SS")) for [sub_bond, sub_bond_name] = bond if (index(sub_bond_name, "subbond") == 1) components(comp.index, ++counter) = sub_bond.index endif endfor endif endif endfor for [bond, bond_name] = comp if (index(bond_name, "bond") == 1) if (!strcmp(bond.other_end_type, "SS")) for [sub_bond, sub_bond_name] = bond if (index(sub_bond_name, "subbond") == 1) components(comp.index, ++counter) = sub_bond.index endif endfor endif endif endfor endfor endif if (struct_contains(objects, "port")) for [port, port_name] = objects.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 |