From a3991b4308fc895fa2d30b906265615389cfd3b6 Mon Sep 17 00:00:00 2001 From: James Corbett Date: Wed, 4 Sep 2024 16:38:24 -0700 Subject: [PATCH] test: update expected JGF Problem: flux-framework/flux-sched/pull/1286 changed the way edges are represented in JGF. Update the expected JGF output of flux-dws2jgf. --- t/data/dws2jgf/expected-compute-01-04.jgf | 392 ++++---------- t/data/dws2jgf/expected-compute-01-nodws.jgf | 536 +++++-------------- t/data/dws2jgf/expected-compute-01.jgf | 304 +++-------- t/data/dws2jgf/expected-properties.jgf | 340 +++--------- 4 files changed, 393 insertions(+), 1179 deletions(-) diff --git a/t/data/dws2jgf/expected-compute-01-04.jgf b/t/data/dws2jgf/expected-compute-01-04.jgf index 9067090..a434878 100644 --- a/t/data/dws2jgf/expected-compute-01-04.jgf +++ b/t/data/dws2jgf/expected-compute-01-04.jgf @@ -1886,9 +1886,7 @@ "target": "1", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1896,9 +1894,7 @@ "target": "2", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1906,9 +1902,7 @@ "target": "3", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1916,9 +1910,7 @@ "target": "4", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1926,9 +1918,7 @@ "target": "5", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1936,9 +1926,7 @@ "target": "6", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1946,9 +1934,7 @@ "target": "7", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1956,9 +1942,7 @@ "target": "8", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1966,9 +1950,7 @@ "target": "9", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1976,9 +1958,7 @@ "target": "10", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1986,9 +1966,7 @@ "target": "11", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1996,9 +1974,7 @@ "target": "12", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2006,9 +1982,7 @@ "target": "13", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2016,9 +1990,7 @@ "target": "14", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2026,9 +1998,7 @@ "target": "15", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2036,9 +2006,7 @@ "target": "16", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2046,9 +2014,7 @@ "target": "17", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2056,9 +2022,7 @@ "target": "18", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2066,9 +2030,7 @@ "target": "19", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2076,9 +2038,7 @@ "target": "20", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2086,9 +2046,7 @@ "target": "21", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2096,9 +2054,7 @@ "target": "22", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2106,9 +2062,7 @@ "target": "23", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2116,9 +2070,7 @@ "target": "24", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2126,9 +2078,7 @@ "target": "25", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2136,9 +2086,7 @@ "target": "26", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2146,9 +2094,7 @@ "target": "27", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2156,9 +2102,7 @@ "target": "28", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2166,9 +2110,7 @@ "target": "29", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2176,9 +2118,7 @@ "target": "30", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2186,9 +2126,7 @@ "target": "31", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2196,9 +2134,7 @@ "target": "32", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2206,9 +2142,7 @@ "target": "33", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2216,9 +2150,7 @@ "target": "34", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2226,9 +2158,7 @@ "target": "35", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2236,9 +2166,7 @@ "target": "36", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2246,9 +2174,7 @@ "target": "37", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2256,9 +2182,7 @@ "target": "38", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2266,9 +2190,7 @@ "target": "39", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2276,9 +2198,7 @@ "target": "40", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2286,9 +2206,7 @@ "target": "41", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2296,9 +2214,7 @@ "target": "42", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2306,9 +2222,7 @@ "target": "43", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2316,9 +2230,7 @@ "target": "44", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2326,9 +2238,7 @@ "target": "45", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2336,9 +2246,7 @@ "target": "46", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2346,9 +2254,7 @@ "target": "47", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2356,9 +2262,7 @@ "target": "48", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2366,9 +2270,7 @@ "target": "49", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2376,9 +2278,7 @@ "target": "50", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2386,9 +2286,7 @@ "target": "51", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2396,9 +2294,7 @@ "target": "52", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2406,9 +2302,7 @@ "target": "53", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2416,9 +2310,7 @@ "target": "54", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2426,9 +2318,7 @@ "target": "55", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2436,9 +2326,7 @@ "target": "56", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2446,9 +2334,7 @@ "target": "57", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2456,9 +2342,7 @@ "target": "58", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2466,9 +2350,7 @@ "target": "59", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2476,9 +2358,7 @@ "target": "60", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2486,9 +2366,7 @@ "target": "61", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2496,9 +2374,7 @@ "target": "62", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2506,9 +2382,7 @@ "target": "63", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2516,9 +2390,7 @@ "target": "64", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2526,9 +2398,7 @@ "target": "65", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2536,9 +2406,7 @@ "target": "66", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2546,9 +2414,7 @@ "target": "67", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2556,9 +2422,7 @@ "target": "68", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2566,9 +2430,7 @@ "target": "69", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2576,9 +2438,7 @@ "target": "70", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2586,9 +2446,7 @@ "target": "71", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2596,9 +2454,7 @@ "target": "72", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2606,9 +2462,7 @@ "target": "73", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2616,9 +2470,7 @@ "target": "74", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2626,9 +2478,7 @@ "target": "75", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2636,9 +2486,7 @@ "target": "76", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2646,9 +2494,7 @@ "target": "77", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2656,9 +2502,7 @@ "target": "78", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2666,9 +2510,7 @@ "target": "79", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2676,9 +2518,7 @@ "target": "80", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2686,9 +2526,7 @@ "target": "81", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2696,9 +2534,7 @@ "target": "82", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2706,9 +2542,7 @@ "target": "83", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2716,9 +2550,7 @@ "target": "84", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2726,9 +2558,7 @@ "target": "85", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2736,9 +2566,7 @@ "target": "86", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2746,9 +2574,7 @@ "target": "87", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2756,9 +2582,7 @@ "target": "88", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2766,9 +2590,7 @@ "target": "89", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2776,9 +2598,7 @@ "target": "90", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2786,9 +2606,7 @@ "target": "91", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2796,9 +2614,7 @@ "target": "92", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2806,9 +2622,7 @@ "target": "93", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2816,9 +2630,7 @@ "target": "94", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2826,9 +2638,7 @@ "target": "95", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2836,9 +2646,7 @@ "target": "96", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2846,9 +2654,7 @@ "target": "97", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2856,9 +2662,7 @@ "target": "98", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } } ] diff --git a/t/data/dws2jgf/expected-compute-01-nodws.jgf b/t/data/dws2jgf/expected-compute-01-nodws.jgf index be48c7e..b9d0ea9 100644 --- a/t/data/dws2jgf/expected-compute-01-nodws.jgf +++ b/t/data/dws2jgf/expected-compute-01-nodws.jgf @@ -2534,9 +2534,7 @@ "target": "1", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2544,9 +2542,7 @@ "target": "2", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2554,9 +2550,7 @@ "target": "3", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2564,9 +2558,7 @@ "target": "4", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2574,9 +2566,7 @@ "target": "5", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2584,9 +2574,7 @@ "target": "6", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2594,9 +2582,7 @@ "target": "7", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2604,9 +2590,7 @@ "target": "8", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2614,9 +2598,7 @@ "target": "9", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2624,9 +2606,7 @@ "target": "10", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2634,9 +2614,7 @@ "target": "11", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2644,9 +2622,7 @@ "target": "12", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2654,9 +2630,7 @@ "target": "13", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2664,9 +2638,7 @@ "target": "14", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2674,9 +2646,7 @@ "target": "15", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2684,9 +2654,7 @@ "target": "16", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2694,9 +2662,7 @@ "target": "17", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2704,9 +2670,7 @@ "target": "18", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2714,9 +2678,7 @@ "target": "19", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2724,9 +2686,7 @@ "target": "20", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2734,9 +2694,7 @@ "target": "21", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2744,9 +2702,7 @@ "target": "22", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2754,9 +2710,7 @@ "target": "23", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2764,9 +2718,7 @@ "target": "24", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2774,9 +2726,7 @@ "target": "25", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2784,9 +2734,7 @@ "target": "26", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2794,9 +2742,7 @@ "target": "27", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2804,9 +2750,7 @@ "target": "28", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2814,9 +2758,7 @@ "target": "29", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2824,9 +2766,7 @@ "target": "30", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2834,9 +2774,7 @@ "target": "31", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2844,9 +2782,7 @@ "target": "32", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2854,9 +2790,7 @@ "target": "33", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2864,9 +2798,7 @@ "target": "34", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2874,9 +2806,7 @@ "target": "35", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2884,9 +2814,7 @@ "target": "36", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2894,9 +2822,7 @@ "target": "37", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2904,9 +2830,7 @@ "target": "38", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2914,9 +2838,7 @@ "target": "39", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2924,9 +2846,7 @@ "target": "40", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2934,9 +2854,7 @@ "target": "41", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2944,9 +2862,7 @@ "target": "42", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2954,9 +2870,7 @@ "target": "43", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2964,9 +2878,7 @@ "target": "44", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2974,9 +2886,7 @@ "target": "45", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2984,9 +2894,7 @@ "target": "46", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2994,9 +2902,7 @@ "target": "47", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3004,9 +2910,7 @@ "target": "48", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3014,9 +2918,7 @@ "target": "49", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3024,9 +2926,7 @@ "target": "50", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3034,9 +2934,7 @@ "target": "51", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3044,9 +2942,7 @@ "target": "52", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3054,9 +2950,7 @@ "target": "53", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3064,9 +2958,7 @@ "target": "54", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3074,9 +2966,7 @@ "target": "55", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3084,9 +2974,7 @@ "target": "56", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3094,9 +2982,7 @@ "target": "57", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3104,9 +2990,7 @@ "target": "58", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3114,9 +2998,7 @@ "target": "59", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3124,9 +3006,7 @@ "target": "60", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3134,9 +3014,7 @@ "target": "61", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3144,9 +3022,7 @@ "target": "62", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3154,9 +3030,7 @@ "target": "63", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3164,9 +3038,7 @@ "target": "64", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3174,9 +3046,7 @@ "target": "65", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3184,9 +3054,7 @@ "target": "66", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3194,9 +3062,7 @@ "target": "67", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3204,9 +3070,7 @@ "target": "68", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3214,9 +3078,7 @@ "target": "69", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3224,9 +3086,7 @@ "target": "70", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3234,9 +3094,7 @@ "target": "71", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3244,9 +3102,7 @@ "target": "72", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3254,9 +3110,7 @@ "target": "73", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3264,9 +3118,7 @@ "target": "74", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3274,9 +3126,7 @@ "target": "75", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3284,9 +3134,7 @@ "target": "76", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3294,9 +3142,7 @@ "target": "77", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3304,9 +3150,7 @@ "target": "78", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3314,9 +3158,7 @@ "target": "79", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3324,9 +3166,7 @@ "target": "80", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3334,9 +3174,7 @@ "target": "81", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3344,9 +3182,7 @@ "target": "82", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3354,9 +3190,7 @@ "target": "83", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3364,9 +3198,7 @@ "target": "84", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3374,9 +3206,7 @@ "target": "85", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3384,9 +3214,7 @@ "target": "86", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3394,9 +3222,7 @@ "target": "87", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3404,9 +3230,7 @@ "target": "88", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3414,9 +3238,7 @@ "target": "89", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3424,9 +3246,7 @@ "target": "90", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3434,9 +3254,7 @@ "target": "91", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3444,9 +3262,7 @@ "target": "92", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3454,9 +3270,7 @@ "target": "93", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3464,9 +3278,7 @@ "target": "94", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3474,9 +3286,7 @@ "target": "95", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3484,9 +3294,7 @@ "target": "96", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3494,9 +3302,7 @@ "target": "97", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3504,9 +3310,7 @@ "target": "98", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3514,9 +3318,7 @@ "target": "99", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3524,9 +3326,7 @@ "target": "100", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3534,9 +3334,7 @@ "target": "101", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3544,9 +3342,7 @@ "target": "102", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3554,9 +3350,7 @@ "target": "103", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3564,9 +3358,7 @@ "target": "104", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3574,9 +3366,7 @@ "target": "105", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3584,9 +3374,7 @@ "target": "106", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3594,9 +3382,7 @@ "target": "107", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3604,9 +3390,7 @@ "target": "108", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3614,9 +3398,7 @@ "target": "109", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3624,9 +3406,7 @@ "target": "110", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3634,9 +3414,7 @@ "target": "111", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3644,9 +3422,7 @@ "target": "112", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3654,9 +3430,7 @@ "target": "113", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3664,9 +3438,7 @@ "target": "114", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3674,9 +3446,7 @@ "target": "115", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3684,9 +3454,7 @@ "target": "116", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3694,9 +3462,7 @@ "target": "117", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3704,9 +3470,7 @@ "target": "118", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3714,9 +3478,7 @@ "target": "119", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3724,9 +3486,7 @@ "target": "120", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3734,9 +3494,7 @@ "target": "121", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3744,9 +3502,7 @@ "target": "122", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3754,9 +3510,7 @@ "target": "123", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3764,9 +3518,7 @@ "target": "124", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3774,9 +3526,7 @@ "target": "125", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3784,9 +3534,7 @@ "target": "126", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3794,9 +3542,7 @@ "target": "127", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3804,9 +3550,7 @@ "target": "128", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3814,9 +3558,7 @@ "target": "129", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3824,9 +3566,7 @@ "target": "130", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3834,9 +3574,7 @@ "target": "131", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3844,9 +3582,7 @@ "target": "132", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3854,9 +3590,7 @@ "target": "133", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -3864,9 +3598,7 @@ "target": "134", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } } ] diff --git a/t/data/dws2jgf/expected-compute-01.jgf b/t/data/dws2jgf/expected-compute-01.jgf index 4db2a21..771ab1b 100644 --- a/t/data/dws2jgf/expected-compute-01.jgf +++ b/t/data/dws2jgf/expected-compute-01.jgf @@ -1490,9 +1490,7 @@ "target": "1", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1500,9 +1498,7 @@ "target": "2", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1510,9 +1506,7 @@ "target": "3", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1520,9 +1514,7 @@ "target": "4", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1530,9 +1522,7 @@ "target": "5", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1540,9 +1530,7 @@ "target": "6", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1550,9 +1538,7 @@ "target": "7", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1560,9 +1546,7 @@ "target": "8", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1570,9 +1554,7 @@ "target": "9", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1580,9 +1562,7 @@ "target": "10", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1590,9 +1570,7 @@ "target": "11", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1600,9 +1578,7 @@ "target": "12", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1610,9 +1586,7 @@ "target": "13", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1620,9 +1594,7 @@ "target": "14", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1630,9 +1602,7 @@ "target": "15", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1640,9 +1610,7 @@ "target": "16", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1650,9 +1618,7 @@ "target": "17", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1660,9 +1626,7 @@ "target": "18", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1670,9 +1634,7 @@ "target": "19", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1680,9 +1642,7 @@ "target": "20", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1690,9 +1650,7 @@ "target": "21", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1700,9 +1658,7 @@ "target": "22", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1710,9 +1666,7 @@ "target": "23", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1720,9 +1674,7 @@ "target": "24", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1730,9 +1682,7 @@ "target": "25", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1740,9 +1690,7 @@ "target": "26", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1750,9 +1698,7 @@ "target": "27", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1760,9 +1706,7 @@ "target": "28", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1770,9 +1714,7 @@ "target": "29", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1780,9 +1722,7 @@ "target": "30", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1790,9 +1730,7 @@ "target": "31", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1800,9 +1738,7 @@ "target": "32", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1810,9 +1746,7 @@ "target": "33", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1820,9 +1754,7 @@ "target": "34", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1830,9 +1762,7 @@ "target": "35", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1840,9 +1770,7 @@ "target": "36", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1850,9 +1778,7 @@ "target": "37", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1860,9 +1786,7 @@ "target": "38", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1870,9 +1794,7 @@ "target": "39", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1880,9 +1802,7 @@ "target": "40", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1890,9 +1810,7 @@ "target": "41", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1900,9 +1818,7 @@ "target": "42", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1910,9 +1826,7 @@ "target": "43", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1920,9 +1834,7 @@ "target": "44", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1930,9 +1842,7 @@ "target": "45", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1940,9 +1850,7 @@ "target": "46", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1950,9 +1858,7 @@ "target": "47", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1960,9 +1866,7 @@ "target": "48", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1970,9 +1874,7 @@ "target": "49", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1980,9 +1882,7 @@ "target": "50", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1990,9 +1890,7 @@ "target": "51", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2000,9 +1898,7 @@ "target": "52", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2010,9 +1906,7 @@ "target": "53", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2020,9 +1914,7 @@ "target": "54", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2030,9 +1922,7 @@ "target": "55", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2040,9 +1930,7 @@ "target": "56", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2050,9 +1938,7 @@ "target": "57", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2060,9 +1946,7 @@ "target": "58", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2070,9 +1954,7 @@ "target": "59", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2080,9 +1962,7 @@ "target": "60", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2090,9 +1970,7 @@ "target": "61", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2100,9 +1978,7 @@ "target": "62", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2110,9 +1986,7 @@ "target": "63", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2120,9 +1994,7 @@ "target": "64", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2130,9 +2002,7 @@ "target": "65", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2140,9 +2010,7 @@ "target": "66", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2150,9 +2018,7 @@ "target": "67", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2160,9 +2026,7 @@ "target": "68", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2170,9 +2034,7 @@ "target": "69", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2180,9 +2042,7 @@ "target": "70", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2190,9 +2050,7 @@ "target": "71", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2200,9 +2058,7 @@ "target": "72", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2210,9 +2066,7 @@ "target": "73", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2220,9 +2074,7 @@ "target": "74", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2230,9 +2082,7 @@ "target": "75", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2240,9 +2090,7 @@ "target": "76", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } } ] diff --git a/t/data/dws2jgf/expected-properties.jgf b/t/data/dws2jgf/expected-properties.jgf index fa87e60..6356ec0 100644 --- a/t/data/dws2jgf/expected-properties.jgf +++ b/t/data/dws2jgf/expected-properties.jgf @@ -1657,9 +1657,7 @@ "target": "1", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1667,9 +1665,7 @@ "target": "2", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1677,9 +1673,7 @@ "target": "3", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1687,9 +1681,7 @@ "target": "4", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1697,9 +1689,7 @@ "target": "5", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1707,9 +1697,7 @@ "target": "6", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1717,9 +1705,7 @@ "target": "7", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1727,9 +1713,7 @@ "target": "8", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1737,9 +1721,7 @@ "target": "9", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1747,9 +1729,7 @@ "target": "10", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1757,9 +1737,7 @@ "target": "11", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1767,9 +1745,7 @@ "target": "12", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1777,9 +1753,7 @@ "target": "13", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1787,9 +1761,7 @@ "target": "14", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1797,9 +1769,7 @@ "target": "15", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1807,9 +1777,7 @@ "target": "16", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1817,9 +1785,7 @@ "target": "17", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1827,9 +1793,7 @@ "target": "18", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1837,9 +1801,7 @@ "target": "19", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1847,9 +1809,7 @@ "target": "20", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1857,9 +1817,7 @@ "target": "21", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1867,9 +1825,7 @@ "target": "22", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1877,9 +1833,7 @@ "target": "23", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1887,9 +1841,7 @@ "target": "24", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1897,9 +1849,7 @@ "target": "25", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1907,9 +1857,7 @@ "target": "26", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1917,9 +1865,7 @@ "target": "27", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1927,9 +1873,7 @@ "target": "28", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1937,9 +1881,7 @@ "target": "29", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1947,9 +1889,7 @@ "target": "30", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1957,9 +1897,7 @@ "target": "31", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1967,9 +1905,7 @@ "target": "32", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1977,9 +1913,7 @@ "target": "33", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1987,9 +1921,7 @@ "target": "34", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -1997,9 +1929,7 @@ "target": "35", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2007,9 +1937,7 @@ "target": "36", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2017,9 +1945,7 @@ "target": "37", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2027,9 +1953,7 @@ "target": "38", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2037,9 +1961,7 @@ "target": "39", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2047,9 +1969,7 @@ "target": "40", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2057,9 +1977,7 @@ "target": "41", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2067,9 +1985,7 @@ "target": "42", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2077,9 +1993,7 @@ "target": "43", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2087,9 +2001,7 @@ "target": "44", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2097,9 +2009,7 @@ "target": "45", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2107,9 +2017,7 @@ "target": "46", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2117,9 +2025,7 @@ "target": "47", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2127,9 +2033,7 @@ "target": "48", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2137,9 +2041,7 @@ "target": "49", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2147,9 +2049,7 @@ "target": "50", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2157,9 +2057,7 @@ "target": "51", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2167,9 +2065,7 @@ "target": "52", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2177,9 +2073,7 @@ "target": "53", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2187,9 +2081,7 @@ "target": "54", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2197,9 +2089,7 @@ "target": "55", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2207,9 +2097,7 @@ "target": "56", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2217,9 +2105,7 @@ "target": "57", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2227,9 +2113,7 @@ "target": "58", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2237,9 +2121,7 @@ "target": "59", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2247,9 +2129,7 @@ "target": "60", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2257,9 +2137,7 @@ "target": "61", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2267,9 +2145,7 @@ "target": "62", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2277,9 +2153,7 @@ "target": "63", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2287,9 +2161,7 @@ "target": "64", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2297,9 +2169,7 @@ "target": "65", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2307,9 +2177,7 @@ "target": "66", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2317,9 +2185,7 @@ "target": "67", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2327,9 +2193,7 @@ "target": "68", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2337,9 +2201,7 @@ "target": "69", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2347,9 +2209,7 @@ "target": "70", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2357,9 +2217,7 @@ "target": "71", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2367,9 +2225,7 @@ "target": "72", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2377,9 +2233,7 @@ "target": "73", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2387,9 +2241,7 @@ "target": "74", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2397,9 +2249,7 @@ "target": "75", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2407,9 +2257,7 @@ "target": "76", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2417,9 +2265,7 @@ "target": "77", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2427,9 +2273,7 @@ "target": "78", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2437,9 +2281,7 @@ "target": "79", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2447,9 +2289,7 @@ "target": "80", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2457,9 +2297,7 @@ "target": "81", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2467,9 +2305,7 @@ "target": "82", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2477,9 +2313,7 @@ "target": "83", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2487,9 +2321,7 @@ "target": "84", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } }, { @@ -2497,9 +2329,7 @@ "target": "85", "directed": true, "metadata": { - "name": { - "containment": "contains" - } + "subsystem": "containment" } } ]