read_esdl now outputs graph; assets read separate

NOTE: asset-to-graph conversion is currently very lenient with
incomplete connections. Test cases have also not yet been updated
to be complete & valid

src/io.jl

@@ -1,5 +1,5 @@
 export create_parameters_and_sets_from_file,
-    create_graph, save_solution_to_file, compute_rp_partitions, read_esdl
+    create_graph, save_solution_to_file, compute_rp_partitions, read_esdl, read_esdl_assets
 
 using EzXML
 
@@ -385,6 +385,43 @@ An ESDL file can contain multiple instances. If multiple instances
 are present in the file, a specific instance has to be selected.
 """
 function read_esdl(file_path; instance_name = nothing)
+    esdl_assets = read_esdl_assets(file_path; instance_name = instance_name)
+
+    # Gather all in-ports
+    id_to_index = Dict{String,Int}()
+    for (to_id, asset) in enumerate(esdl_assets)
+        for port in eachelement(asset)
+            if port.name != "port" || port["xsi:type"] != "esdl:InPort"
+                continue
+            end
+            id_to_index[port["id"]] = to_id
+        end
+    end
+
+    # Create graph based on out-ports and previously gathered in-ports
+    graph = Graphs.DiGraph(length(esdl_assets))
+    for (from_id, asset) in enumerate(esdl_assets)
+        for port in eachelement(asset)
+            if port.name != "port" || port["xsi:type"] != "esdl:OutPort"
+                continue
+            end
+            flows = eachsplit(port["connectedTo"], " ")
+            for flow in flows
+                if !haskey(id_to_index, flow)
+                    # throw(ErrorException("No InPort with id '$flow' was found"))
+                    println("No InPort with id '$flow' was found, ignoring...")
+                    continue
+                end
+                to_id = id_to_index[flow]
+                Graphs.add_edge!(graph, from_id, to_id)
+            end
+        end
+    end
+
+    return graph
+end
+
+function read_esdl_assets(file_path; instance_name = nothing)
     doc = readxml(file_path)
     doc_root = root(doc)
     if countelements(doc_root) == 0 || firstelement(doc_root).name != "instance"

test/test-io.jl

@@ -61,29 +61,31 @@ end
 @testset "ESDL parsing" begin
     @testset "instance detection error handling" begin
         @testset "no instance" begin
-            @test_throws ErrorException read_esdl(joinpath(ESDL_FOLDER, "no_instance.esdl"))
+            @test_throws ErrorException read_esdl_assets(
+                joinpath(ESDL_FOLDER, "no_instance.esdl"),
+            )
         end
 
         @testset "two instances" begin
-            @test_throws ErrorException read_esdl(
+            @test_throws ErrorException read_esdl_assets(
                 joinpath(ESDL_FOLDER, "two_instances.esdl"),
             )
         end
     end
 
     @testset "instance asset parsing" begin
         @testset "unnamed single instance" begin
-            assets = read_esdl(joinpath(ESDL_FOLDER, "one_instance.esdl"))
+            assets = read_esdl_assets(joinpath(ESDL_FOLDER, "one_instance.esdl"))
             @test length(assets) == 8
         end
 
         @testset "named instance out of multiple" begin
-            flat_assets = read_esdl(
+            flat_assets = read_esdl_assets(
                 joinpath(ESDL_FOLDER, "two_instances.esdl");
                 instance_name = "Flat",
             )
             @test length(flat_assets) == 4
-            nested_assets = read_esdl(
+            nested_assets = read_esdl_assets(
                 joinpath(ESDL_FOLDER, "two_instances.esdl");
                 instance_name = "Nested",
             )