diff --git a/tests/tools/output/converter/ns2/keep_orig_ids/activityfile.tools b/tests/tools/output/converter/ns2/keep_orig_ids/activityfile.tools new file mode 100644 index 00000000000..4cc0deff26c --- /dev/null +++ b/tests/tools/output/converter/ns2/keep_orig_ids/activityfile.tools @@ -0,0 +1,6 @@ +$ns_ at 30.0 "$g(r1#2) start"; # SUMO-ID: r1#2 +$ns_ at 115.0 "$g(r1#2) stop"; # SUMO-ID: r1#2 +$ns_ at 20.0 "$g(r2) start"; # SUMO-ID: r2 +$ns_ at 105.0 "$g(r2) stop"; # SUMO-ID: r2 +$ns_ at 10.0 "$g(r1#1) start"; # SUMO-ID: r1#1 +$ns_ at 95.0 "$g(r1#1) stop"; # SUMO-ID: r1#1 diff --git a/tests/tools/output/converter/ns2/keep_orig_ids/cfg.tools b/tests/tools/output/converter/ns2/keep_orig_ids/cfg.tools new file mode 100644 index 00000000000..556ad303f7a --- /dev/null +++ b/tests/tools/output/converter/ns2/keep_orig_ids/cfg.tools @@ -0,0 +1,21 @@ +# set number of nodes +set opt(nn) 3 + +# set activity file +set opt(af) $opt(config-path) +append opt(af) /activityfile.tcl + +# set mobility file +set opt(mf) $opt(config-path) +append opt(mf) /mobilityfile.tcl + +# set start/stop time +set opt(start) 0.0 +set opt(stop) 116.0 + +# set floor size +set opt(x) 999.53 +set opt(y) 508.25 +set opt(min-x) 498.35 +set opt(min-y) 0.47 + diff --git a/tests/tools/output/converter/ns2/keep_orig_ids/errors.tools b/tests/tools/output/converter/ns2/keep_orig_ids/errors.tools new file mode 100644 index 00000000000..05c73426059 --- /dev/null +++ b/tests/tools/output/converter/ns2/keep_orig_ids/errors.tools @@ -0,0 +1 @@ +Warning: ID "r1#1" is not an integer. diff --git a/tests/tools/output/converter/ns2/keep_orig_ids/mobilityfile.tools b/tests/tools/output/converter/ns2/keep_orig_ids/mobilityfile.tools new file mode 100644 index 00000000000..81b5a2bef87 --- /dev/null +++ b/tests/tools/output/converter/ns2/keep_orig_ids/mobilityfile.tools @@ -0,0 +1,264 @@ +$node_(r1#1) set X_ 516.45 +$node_(r1#1) set Y_ 498.35 +$node_(r1#1) set Z_ 0 +$ns_ at 10.0 "$node_(r1#1) setdest 516.45 498.35 11.11" +$ns_ at 11.0 "$node_(r1#1) setdest 527.56 498.35 11.11" +$ns_ at 12.0 "$node_(r1#1) setdest 538.67 498.35 11.11" +$ns_ at 13.0 "$node_(r1#1) setdest 549.78 498.35 11.11" +$ns_ at 14.0 "$node_(r1#1) setdest 560.89 498.35 11.11" +$ns_ at 15.0 "$node_(r1#1) setdest 572.0 498.35 11.11" +$ns_ at 16.0 "$node_(r1#1) setdest 583.11 498.35 11.11" +$ns_ at 17.0 "$node_(r1#1) setdest 594.22 498.35 11.11" +$ns_ at 18.0 "$node_(r1#1) setdest 605.33 498.35 11.11" +$ns_ at 19.0 "$node_(r1#1) setdest 616.44 498.35 11.11" +$ns_ at 20.0 "$node_(r1#1) setdest 627.55 498.35 11.11" +$node_(r2) set X_ 498.35 +$node_(r2) set Y_ 483.55 +$node_(r2) set Z_ 0 +$ns_ at 20.0 "$node_(r2) setdest 498.35 483.55 11.11" +$ns_ at 21.0 "$node_(r1#1) setdest 638.66 498.35 11.11" +$ns_ at 21.0 "$node_(r2) setdest 498.35 472.44 11.11" +$ns_ at 22.0 "$node_(r1#1) setdest 649.77 498.35 11.11" +$ns_ at 22.0 "$node_(r2) setdest 498.35 461.33 11.11" +$ns_ at 23.0 "$node_(r1#1) setdest 660.88 498.35 11.11" +$ns_ at 23.0 "$node_(r2) setdest 498.35 450.22 11.11" +$ns_ at 24.0 "$node_(r1#1) setdest 671.99 498.35 11.11" +$ns_ at 24.0 "$node_(r2) setdest 498.35 439.11 11.11" +$ns_ at 25.0 "$node_(r1#1) setdest 683.1 498.35 11.11" +$ns_ at 25.0 "$node_(r2) setdest 498.35 428.0 11.11" +$ns_ at 26.0 "$node_(r1#1) setdest 694.21 498.35 11.11" +$ns_ at 26.0 "$node_(r2) setdest 498.35 416.89 11.11" +$ns_ at 27.0 "$node_(r1#1) setdest 705.32 498.35 11.11" +$ns_ at 27.0 "$node_(r2) setdest 498.35 405.78 11.11" +$ns_ at 28.0 "$node_(r1#1) setdest 716.43 498.35 11.11" +$ns_ at 28.0 "$node_(r2) setdest 498.35 394.67 11.11" +$ns_ at 29.0 "$node_(r1#1) setdest 727.54 498.35 11.11" +$ns_ at 29.0 "$node_(r2) setdest 498.35 383.56 11.11" +$ns_ at 30.0 "$node_(r1#1) setdest 738.65 498.35 11.11" +$node_(r1#2) set X_ 516.45 +$node_(r1#2) set Y_ 498.35 +$node_(r1#2) set Z_ 0 +$ns_ at 30.0 "$node_(r1#2) setdest 516.45 498.35 11.11" +$ns_ at 30.0 "$node_(r2) setdest 498.35 372.45 11.11" +$ns_ at 31.0 "$node_(r1#1) setdest 749.76 498.35 11.11" +$ns_ at 31.0 "$node_(r1#2) setdest 527.56 498.35 11.11" +$ns_ at 31.0 "$node_(r2) setdest 498.35 361.34 11.11" +$ns_ at 32.0 "$node_(r1#1) setdest 760.87 498.35 11.11" +$ns_ at 32.0 "$node_(r1#2) setdest 538.67 498.35 11.11" +$ns_ at 32.0 "$node_(r2) setdest 498.35 350.23 11.11" +$ns_ at 33.0 "$node_(r1#1) setdest 771.98 498.35 11.11" +$ns_ at 33.0 "$node_(r1#2) setdest 549.78 498.35 11.11" +$ns_ at 33.0 "$node_(r2) setdest 498.35 339.12 11.11" +$ns_ at 34.0 "$node_(r1#1) setdest 783.09 498.35 11.11" +$ns_ at 34.0 "$node_(r1#2) setdest 560.89 498.35 11.11" +$ns_ at 34.0 "$node_(r2) setdest 498.35 328.01 11.11" +$ns_ at 35.0 "$node_(r1#1) setdest 794.2 498.35 11.11" +$ns_ at 35.0 "$node_(r1#2) setdest 572.0 498.35 11.11" +$ns_ at 35.0 "$node_(r2) setdest 498.35 316.9 11.11" +$ns_ at 36.0 "$node_(r1#1) setdest 805.31 498.35 11.11" +$ns_ at 36.0 "$node_(r1#2) setdest 583.11 498.35 11.11" +$ns_ at 36.0 "$node_(r2) setdest 498.35 305.79 11.11" +$ns_ at 37.0 "$node_(r1#1) setdest 816.42 498.35 11.11" +$ns_ at 37.0 "$node_(r1#2) setdest 594.22 498.35 11.11" +$ns_ at 37.0 "$node_(r2) setdest 498.35 294.68 11.11" +$ns_ at 38.0 "$node_(r1#1) setdest 827.53 498.35 11.11" +$ns_ at 38.0 "$node_(r1#2) setdest 605.33 498.35 11.11" +$ns_ at 38.0 "$node_(r2) setdest 498.35 283.57 11.11" +$ns_ at 39.0 "$node_(r1#1) setdest 838.64 498.35 11.11" +$ns_ at 39.0 "$node_(r1#2) setdest 616.44 498.35 11.11" +$ns_ at 39.0 "$node_(r2) setdest 498.35 272.46 11.11" +$ns_ at 40.0 "$node_(r1#1) setdest 849.75 498.35 11.11" +$ns_ at 40.0 "$node_(r1#2) setdest 627.55 498.35 11.11" +$ns_ at 40.0 "$node_(r2) setdest 498.35 261.35 11.11" +$ns_ at 41.0 "$node_(r1#1) setdest 860.86 498.35 11.11" +$ns_ at 41.0 "$node_(r1#2) setdest 638.66 498.35 11.11" +$ns_ at 41.0 "$node_(r2) setdest 498.35 250.24 11.11" +$ns_ at 42.0 "$node_(r1#1) setdest 871.97 498.35 11.11" +$ns_ at 42.0 "$node_(r1#2) setdest 649.77 498.35 11.11" +$ns_ at 42.0 "$node_(r2) setdest 498.35 239.13 11.11" +$ns_ at 43.0 "$node_(r1#1) setdest 883.08 498.35 11.11" +$ns_ at 43.0 "$node_(r1#2) setdest 660.88 498.35 11.11" +$ns_ at 43.0 "$node_(r2) setdest 498.35 228.02 11.11" +$ns_ at 44.0 "$node_(r1#1) setdest 894.19 498.35 11.11" +$ns_ at 44.0 "$node_(r1#2) setdest 671.99 498.35 11.11" +$ns_ at 44.0 "$node_(r2) setdest 498.35 216.91 11.11" +$ns_ at 45.0 "$node_(r1#1) setdest 905.3 498.35 11.11" +$ns_ at 45.0 "$node_(r1#2) setdest 683.1 498.35 11.11" +$ns_ at 45.0 "$node_(r2) setdest 498.35 205.8 11.11" +$ns_ at 46.0 "$node_(r1#1) setdest 916.41 498.35 11.11" +$ns_ at 46.0 "$node_(r1#2) setdest 694.21 498.35 11.11" +$ns_ at 46.0 "$node_(r2) setdest 498.35 194.69 11.11" +$ns_ at 47.0 "$node_(r1#1) setdest 927.52 498.35 11.11" +$ns_ at 47.0 "$node_(r1#2) setdest 705.32 498.35 11.11" +$ns_ at 47.0 "$node_(r2) setdest 498.35 183.58 11.11" +$ns_ at 48.0 "$node_(r1#1) setdest 938.63 498.35 11.11" +$ns_ at 48.0 "$node_(r1#2) setdest 716.43 498.35 11.11" +$ns_ at 48.0 "$node_(r2) setdest 498.35 172.47 11.11" +$ns_ at 49.0 "$node_(r1#1) setdest 949.74 498.35 11.11" +$ns_ at 49.0 "$node_(r1#2) setdest 727.54 498.35 11.11" +$ns_ at 49.0 "$node_(r2) setdest 498.35 161.36 11.11" +$ns_ at 50.0 "$node_(r1#1) setdest 960.85 498.35 11.11" +$ns_ at 50.0 "$node_(r1#2) setdest 738.65 498.35 11.11" +$ns_ at 50.0 "$node_(r2) setdest 498.35 150.25 11.11" +$ns_ at 51.0 "$node_(r1#1) setdest 971.96 498.35 11.11" +$ns_ at 51.0 "$node_(r1#2) setdest 749.76 498.35 11.11" +$ns_ at 51.0 "$node_(r2) setdest 498.35 139.14 11.11" +$ns_ at 52.0 "$node_(r1#1) setdest 983.07 498.35 11.11" +$ns_ at 52.0 "$node_(r1#2) setdest 760.87 498.35 11.11" +$ns_ at 52.0 "$node_(r2) setdest 498.35 128.03 11.11" +$ns_ at 53.0 "$node_(r1#1) setdest 994.18 498.35 11.11" +$ns_ at 53.0 "$node_(r1#2) setdest 771.98 498.35 11.11" +$ns_ at 53.0 "$node_(r2) setdest 498.35 116.92 11.11" +$ns_ at 54.0 "$node_(r1#1) setdest 999.53 501.65 11.11" +$ns_ at 54.0 "$node_(r1#2) setdest 783.09 498.35 11.11" +$ns_ at 54.0 "$node_(r2) setdest 498.35 105.81 11.11" +$ns_ at 55.0 "$node_(r1#1) setdest 988.42 501.65 11.11" +$ns_ at 55.0 "$node_(r1#2) setdest 794.2 498.35 11.11" +$ns_ at 55.0 "$node_(r2) setdest 498.35 94.7 11.11" +$ns_ at 56.0 "$node_(r1#1) setdest 977.31 501.65 11.11" +$ns_ at 56.0 "$node_(r1#2) setdest 805.31 498.35 11.11" +$ns_ at 56.0 "$node_(r2) setdest 498.35 83.59 11.11" +$ns_ at 57.0 "$node_(r1#1) setdest 966.2 501.65 11.11" +$ns_ at 57.0 "$node_(r1#2) setdest 816.42 498.35 11.11" +$ns_ at 57.0 "$node_(r2) setdest 498.35 72.48 11.11" +$ns_ at 58.0 "$node_(r1#1) setdest 955.09 501.65 11.11" +$ns_ at 58.0 "$node_(r1#2) setdest 827.53 498.35 11.11" +$ns_ at 58.0 "$node_(r2) setdest 498.35 61.37 11.11" +$ns_ at 59.0 "$node_(r1#1) setdest 943.98 501.65 11.11" +$ns_ at 59.0 "$node_(r1#2) setdest 838.64 498.35 11.11" +$ns_ at 59.0 "$node_(r2) setdest 498.35 50.26 11.11" +$ns_ at 60.0 "$node_(r1#1) setdest 932.87 501.65 11.11" +$ns_ at 60.0 "$node_(r1#2) setdest 849.75 498.35 11.11" +$ns_ at 60.0 "$node_(r2) setdest 498.35 39.15 11.11" +$ns_ at 61.0 "$node_(r1#1) setdest 921.76 501.65 11.11" +$ns_ at 61.0 "$node_(r1#2) setdest 860.86 498.35 11.11" +$ns_ at 61.0 "$node_(r2) setdest 498.35 28.04 11.11" +$ns_ at 62.0 "$node_(r1#1) setdest 910.65 501.65 11.11" +$ns_ at 62.0 "$node_(r1#2) setdest 871.97 498.35 11.11" +$ns_ at 62.0 "$node_(r2) setdest 498.35 16.93 11.11" +$ns_ at 63.0 "$node_(r1#1) setdest 899.54 501.65 11.11" +$ns_ at 63.0 "$node_(r1#2) setdest 883.08 498.35 11.11" +$ns_ at 63.0 "$node_(r2) setdest 498.35 5.82 11.11" +$ns_ at 64.0 "$node_(r1#1) setdest 888.43 501.65 11.11" +$ns_ at 64.0 "$node_(r1#2) setdest 894.19 498.35 11.11" +$ns_ at 64.0 "$node_(r2) setdest 501.65 0.47 11.11" +$ns_ at 65.0 "$node_(r1#1) setdest 877.32 501.65 11.11" +$ns_ at 65.0 "$node_(r1#2) setdest 905.3 498.35 11.11" +$ns_ at 65.0 "$node_(r2) setdest 501.65 11.58 11.11" +$ns_ at 66.0 "$node_(r1#1) setdest 866.21 501.65 11.11" +$ns_ at 66.0 "$node_(r1#2) setdest 916.41 498.35 11.11" +$ns_ at 66.0 "$node_(r2) setdest 501.65 22.69 11.11" +$ns_ at 67.0 "$node_(r1#1) setdest 855.1 501.65 11.11" +$ns_ at 67.0 "$node_(r1#2) setdest 927.52 498.35 11.11" +$ns_ at 67.0 "$node_(r2) setdest 501.65 33.8 11.11" +$ns_ at 68.0 "$node_(r1#1) setdest 843.99 501.65 11.11" +$ns_ at 68.0 "$node_(r1#2) setdest 938.63 498.35 11.11" +$ns_ at 68.0 "$node_(r2) setdest 501.65 44.91 11.11" +$ns_ at 69.0 "$node_(r1#1) setdest 832.88 501.65 11.11" +$ns_ at 69.0 "$node_(r1#2) setdest 949.74 498.35 11.11" +$ns_ at 69.0 "$node_(r2) setdest 501.65 56.02 11.11" +$ns_ at 70.0 "$node_(r1#1) setdest 821.77 501.65 11.11" +$ns_ at 70.0 "$node_(r1#2) setdest 960.85 498.35 11.11" +$ns_ at 70.0 "$node_(r2) setdest 501.65 67.13 11.11" +$ns_ at 71.0 "$node_(r1#1) setdest 810.66 501.65 11.11" +$ns_ at 71.0 "$node_(r1#2) setdest 971.96 498.35 11.11" +$ns_ at 71.0 "$node_(r2) setdest 501.65 78.24 11.11" +$ns_ at 72.0 "$node_(r1#1) setdest 799.55 501.65 11.11" +$ns_ at 72.0 "$node_(r1#2) setdest 983.07 498.35 11.11" +$ns_ at 72.0 "$node_(r2) setdest 501.65 89.35 11.11" +$ns_ at 73.0 "$node_(r1#1) setdest 788.44 501.65 11.11" +$ns_ at 73.0 "$node_(r1#2) setdest 994.18 498.35 11.11" +$ns_ at 73.0 "$node_(r2) setdest 501.65 100.46 11.11" +$ns_ at 74.0 "$node_(r1#1) setdest 777.33 501.65 11.11" +$ns_ at 74.0 "$node_(r1#2) setdest 999.53 501.65 11.11" +$ns_ at 74.0 "$node_(r2) setdest 501.65 111.57 11.11" +$ns_ at 75.0 "$node_(r1#1) setdest 766.22 501.65 11.11" +$ns_ at 75.0 "$node_(r1#2) setdest 988.42 501.65 11.11" +$ns_ at 75.0 "$node_(r2) setdest 501.65 122.68 11.11" +$ns_ at 76.0 "$node_(r1#1) setdest 755.11 501.65 11.11" +$ns_ at 76.0 "$node_(r1#2) setdest 977.31 501.65 11.11" +$ns_ at 76.0 "$node_(r2) setdest 501.65 133.79 11.11" +$ns_ at 77.0 "$node_(r1#1) setdest 748.25 508.25 11.11" +$ns_ at 77.0 "$node_(r1#2) setdest 966.2 501.65 11.11" +$ns_ at 77.0 "$node_(r2) setdest 501.65 144.9 11.11" +$ns_ at 78.0 "$node_(r1#1) setdest 736.34 508.25 11.91" +$ns_ at 78.0 "$node_(r1#2) setdest 955.09 501.65 11.11" +$ns_ at 78.0 "$node_(r2) setdest 501.65 156.01 11.11" +$ns_ at 79.0 "$node_(r1#1) setdest 723.63 508.25 12.71" +$ns_ at 79.0 "$node_(r1#2) setdest 943.98 501.65 11.11" +$ns_ at 79.0 "$node_(r2) setdest 501.65 167.12 11.11" +$ns_ at 80.0 "$node_(r1#1) setdest 710.12 508.25 13.51" +$ns_ at 80.0 "$node_(r1#2) setdest 932.87 501.65 11.11" +$ns_ at 80.0 "$node_(r2) setdest 501.65 178.23 11.11" +$ns_ at 81.0 "$node_(r1#1) setdest 696.23 508.25 13.89" +$ns_ at 81.0 "$node_(r1#2) setdest 921.76 501.65 11.11" +$ns_ at 81.0 "$node_(r2) setdest 501.65 189.34 11.11" +$ns_ at 82.0 "$node_(r1#1) setdest 682.34 508.25 13.89" +$ns_ at 82.0 "$node_(r1#2) setdest 910.65 501.65 11.11" +$ns_ at 82.0 "$node_(r2) setdest 501.65 200.45 11.11" +$ns_ at 83.0 "$node_(r1#1) setdest 668.45 508.25 13.89" +$ns_ at 83.0 "$node_(r1#2) setdest 899.54 501.65 11.11" +$ns_ at 83.0 "$node_(r2) setdest 501.65 211.56 11.11" +$ns_ at 84.0 "$node_(r1#1) setdest 654.56 508.25 13.89" +$ns_ at 84.0 "$node_(r1#2) setdest 888.43 501.65 11.11" +$ns_ at 84.0 "$node_(r2) setdest 501.65 222.67 11.11" +$ns_ at 85.0 "$node_(r1#1) setdest 640.67 508.25 13.89" +$ns_ at 85.0 "$node_(r1#2) setdest 877.32 501.65 11.11" +$ns_ at 85.0 "$node_(r2) setdest 501.65 233.78 11.11" +$ns_ at 86.0 "$node_(r1#1) setdest 626.78 508.25 13.89" +$ns_ at 86.0 "$node_(r1#2) setdest 866.21 501.65 11.11" +$ns_ at 86.0 "$node_(r2) setdest 501.65 244.89 11.11" +$ns_ at 87.0 "$node_(r1#1) setdest 612.89 508.25 13.89" +$ns_ at 87.0 "$node_(r1#2) setdest 855.1 501.65 11.11" +$ns_ at 87.0 "$node_(r2) setdest 508.25 251.75 11.11" +$ns_ at 88.0 "$node_(r1#1) setdest 599.0 508.25 13.89" +$ns_ at 88.0 "$node_(r1#2) setdest 843.99 501.65 11.11" +$ns_ at 88.0 "$node_(r2) setdest 508.25 263.66 11.91" +$ns_ at 89.0 "$node_(r1#1) setdest 585.11 508.25 13.89" +$ns_ at 89.0 "$node_(r1#2) setdest 832.88 501.65 11.11" +$ns_ at 89.0 "$node_(r2) setdest 508.25 276.37 12.71" +$ns_ at 90.0 "$node_(r1#1) setdest 571.22 508.25 13.89" +$ns_ at 90.0 "$node_(r1#2) setdest 821.77 501.65 11.11" +$ns_ at 90.0 "$node_(r2) setdest 508.25 289.88 13.51" +$ns_ at 91.0 "$node_(r1#1) setdest 557.33 508.25 13.89" +$ns_ at 91.0 "$node_(r1#2) setdest 810.66 501.65 11.11" +$ns_ at 91.0 "$node_(r2) setdest 508.25 303.77 13.89" +$ns_ at 92.0 "$node_(r1#1) setdest 543.44 508.25 13.89" +$ns_ at 92.0 "$node_(r1#2) setdest 799.55 501.65 11.11" +$ns_ at 92.0 "$node_(r2) setdest 508.25 317.66 13.89" +$ns_ at 93.0 "$node_(r1#1) setdest 529.55 508.25 13.89" +$ns_ at 93.0 "$node_(r1#2) setdest 788.44 501.65 11.11" +$ns_ at 93.0 "$node_(r2) setdest 508.25 331.55 13.89" +$ns_ at 94.0 "$node_(r1#1) setdest 515.66 508.25 13.89" +$ns_ at 94.0 "$node_(r1#2) setdest 777.33 501.65 11.11" +$ns_ at 94.0 "$node_(r2) setdest 508.25 345.44 13.89" +$ns_ at 95.0 "$node_(r1#2) setdest 766.22 501.65 11.11" +$ns_ at 95.0 "$node_(r2) setdest 508.25 359.33 13.89" +$ns_ at 96.0 "$node_(r1#2) setdest 755.11 501.65 11.11" +$ns_ at 96.0 "$node_(r2) setdest 508.25 373.22 13.89" +$ns_ at 97.0 "$node_(r1#2) setdest 748.25 508.25 11.11" +$ns_ at 97.0 "$node_(r2) setdest 508.25 387.11 13.89" +$ns_ at 98.0 "$node_(r1#2) setdest 736.34 508.25 11.91" +$ns_ at 98.0 "$node_(r2) setdest 508.25 401.0 13.89" +$ns_ at 99.0 "$node_(r1#2) setdest 723.63 508.25 12.71" +$ns_ at 99.0 "$node_(r2) setdest 508.25 414.89 13.89" +$ns_ at 100.0 "$node_(r1#2) setdest 710.12 508.25 13.51" +$ns_ at 100.0 "$node_(r2) setdest 508.25 428.78 13.89" +$ns_ at 101.0 "$node_(r1#2) setdest 696.23 508.25 13.89" +$ns_ at 101.0 "$node_(r2) setdest 508.25 442.67 13.89" +$ns_ at 102.0 "$node_(r1#2) setdest 682.34 508.25 13.89" +$ns_ at 102.0 "$node_(r2) setdest 508.25 456.56 13.89" +$ns_ at 103.0 "$node_(r1#2) setdest 668.45 508.25 13.89" +$ns_ at 103.0 "$node_(r2) setdest 508.25 470.45 13.89" +$ns_ at 104.0 "$node_(r1#2) setdest 654.56 508.25 13.89" +$ns_ at 104.0 "$node_(r2) setdest 508.25 484.34 13.89" +$ns_ at 105.0 "$node_(r1#2) setdest 640.67 508.25 13.89" +$ns_ at 106.0 "$node_(r1#2) setdest 626.78 508.25 13.89" +$ns_ at 107.0 "$node_(r1#2) setdest 612.89 508.25 13.89" +$ns_ at 108.0 "$node_(r1#2) setdest 599.0 508.25 13.89" +$ns_ at 109.0 "$node_(r1#2) setdest 585.11 508.25 13.89" +$ns_ at 110.0 "$node_(r1#2) setdest 571.22 508.25 13.89" +$ns_ at 111.0 "$node_(r1#2) setdest 557.33 508.25 13.89" +$ns_ at 112.0 "$node_(r1#2) setdest 543.44 508.25 13.89" +$ns_ at 113.0 "$node_(r1#2) setdest 529.55 508.25 13.89" +$ns_ at 114.0 "$node_(r1#2) setdest 515.66 508.25 13.89" diff --git a/tests/tools/output/converter/ns2/keep_orig_ids/options.tools b/tests/tools/output/converter/ns2/keep_orig_ids/options.tools new file mode 100644 index 00000000000..b8a0495a0bc --- /dev/null +++ b/tests/tools/output/converter/ns2/keep_orig_ids/options.tools @@ -0,0 +1,8 @@ +-i fcd.xml -n net.net.xml +--ns2activity-output activityfile.tcl +--ns2config-output config.tcl +--ns2mobility-output mobilityfile.tcl +--orig-ids + + + diff --git a/tests/tools/output/converter/ns2/keep_orig_ids/output.tools b/tests/tools/output/converter/ns2/keep_orig_ids/output.tools new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/tools/output/converter/ns2/testsuite.tools b/tests/tools/output/converter/ns2/testsuite.tools index 96c4619aa16..b37ce77545d 100644 --- a/tests/tools/output/converter/ns2/testsuite.tools +++ b/tests/tools/output/converter/ns2/testsuite.tools @@ -3,5 +3,5 @@ mobility_only config_only all - - +# keep the original IDs (should be numeric) +keep_orig_ids diff --git a/tools/sumolib/__init__.py b/tools/sumolib/__init__.py index 4857dd6125d..f04656ef7da 100644 --- a/tools/sumolib/__init__.py +++ b/tools/sumolib/__init__.py @@ -122,8 +122,12 @@ class _Running: - a member method for returning the size - a member iterator over the stored ids """ - def __init__(self): + def __init__(self, orig_ids=False, warn=False): """Contructor""" + # whether original IDs shall be used instead of an index + self.orig_ids = orig_ids + # whether a warning for non-integer IDs shall be given + self.warn = warn # running index of assigned numerical IDs self.index = 0 # map from known IDs to assigned numerical IDs @@ -134,8 +138,17 @@ def g(self, id): If the given id is known, the numerical representation is returned, otherwise a new running number is assigned to the id and returned""" if id not in self._m: - self._m[id] = self.index - self.index += 1 + if self.orig_ids: + self._m[id] = id + if self.warn: + try: + int(id) + except: + sys.stderr.write('Warning: ID "%s" is not an integer.\n' % id) + self.warn = False + else: + self._m[id] = self.index + self.index += 1 return self._m[id] def k(self, id): diff --git a/tools/sumolib/output/convert/ns2.py b/tools/sumolib/output/convert/ns2.py index 24304bf3ef5..097e8525e6d 100644 --- a/tools/sumolib/output/convert/ns2.py +++ b/tools/sumolib/output/convert/ns2.py @@ -23,8 +23,8 @@ import sumolib.output import sumolib.net -def fcd2ns2mobility(inpFCD, outSTRM, ignored): - vIDm = sumolib._Running() +def fcd2ns2mobility(inpFCD, outSTRM, further): + vIDm = sumolib._Running(further["orig-ids"], True) begin = -1 end = None area = [None, None, None, None] diff --git a/tools/sumolib/output/convert/omnet.py b/tools/sumolib/output/convert/omnet.py index 58a9fab0e46..2e5dbac2b0b 100644 --- a/tools/sumolib/output/convert/omnet.py +++ b/tools/sumolib/output/convert/omnet.py @@ -27,7 +27,7 @@ def fcd2omnet(inpFCD, outSTRM, further): print('', file=outSTRM) print('\n' % (datetime.datetime.now(), further["app"]), file=outSTRM) print('', file=outSTRM) - vIDm = sumolib._Running() + vIDm = sumolib._Running(further["orig-ids"], True) for timestep in inpFCD: seen = set() if not timestep.vehicle: @@ -59,4 +59,4 @@ def _writeMissing(outSTRM, t, vIDm, seen): for v in toDel: vIDm.d(v) - \ No newline at end of file + diff --git a/tools/sumolib/output/convert/phem.py b/tools/sumolib/output/convert/phem.py index 2d149c25c3e..91bfb7f41a3 100644 --- a/tools/sumolib/output/convert/phem.py +++ b/tools/sumolib/output/convert/phem.py @@ -88,7 +88,7 @@ def fcd2fzp(inpFCD, outSTRM, further): sIDm = further["phemStreetMap"] if outSTRM!=None: print("t,WeltX,WeltY,Veh. No,v,Gradient,veh.Typ-Id,Str-Id", file=outSTRM) - vIDm = sumolib._Running() + vIDm = sumolib._Running(further["orig-ids"], True) vtIDm = sumolib._Running() vtIDm.g("PKW") vtIDm.g("PKW_equipped") diff --git a/tools/sumolib/output/convert/shawn.py b/tools/sumolib/output/convert/shawn.py index a1e3c30725a..46991b10d64 100644 --- a/tools/sumolib/output/convert/shawn.py +++ b/tools/sumolib/output/convert/shawn.py @@ -26,7 +26,7 @@ def fcd2shawn(inpFCD, outSTRM, further): print('', file=outSTRM) print('\n' % (datetime.datetime.now(), further["app"]), file=outSTRM) print('', file=outSTRM) - vIDm = sumolib._Running() # is it necessary to convert the ids? + vIDm = sumolib._Running(further["orig-ids"]) # is it necessary to convert the ids? for timestep in inpFCD: print(' ' % timestep.time, file=outSTRM) if timestep.vehicle: diff --git a/tools/traceExporter.py b/tools/traceExporter.py index 30c7041224f..cbc8020ed2d 100755 --- a/tools/traceExporter.py +++ b/tools/traceExporter.py @@ -101,6 +101,7 @@ def procFCDStream(fcdstream, options): def runMethod(inputFile, outputFile, writer, options, further={}): further["app"] = os.path.split(__file__)[1] + further["orig-ids"] = options.orig_ids if options.base >= 0: further["base-date"] = datetime.datetime.fromtimestamp(options.base) else: @@ -134,6 +135,8 @@ def main(args=None): optParser.add_option("-s", "--seed", dest="seed", default=42, type="float", help="Defines the randomizer seed") optParser.add_option("--base-date", dest="base", default=-1, type="int", help="Defines the base date") + optParser.add_option("--orig-ids", dest="orig_ids", default=False, action="store_true", + help="Write original vehicle IDs instead of a running index") # PHEM optParser.add_option("--dri-output", dest="dri", metavar="FILE", help="Defines the name of the PHEM .dri-file to generate")