Re-enable edge validation (#888)

This validation was inadvertently not called anymore. This now adds a
test to make sure that doesn't happen again.

@SouthEndMusic tests fail since an invalid connection slipped in since,
do you want to take over this PR to fix that?

```
┌ Error: Cannot connect a basin to a basin.
│   edge_id = 0
│   id_src = #2
│   id_dst = #4
└ @ Ribasim D:\Ribasim\core\src\validation.jl:450
Error in testset "Allocation objective types" on worker 24444:
Error During Test at D:\Ribasim\core\test\allocation_test.jl:27
```

---------

Co-authored-by: Bart de Koning <[email protected]>

core/src/create.jl

@@ -794,6 +794,10 @@ function Parameters(db::DB, config::Config)::Parameters
     graph = create_graph(db, config, chunk_sizes)
     allocation_models = Vector{AllocationModel}()
 
+    if !valid_edges(graph)
+        error("Invalid edge(s) found.")
+    end
+
     linear_resistance = LinearResistance(db, config)
     manning_resistance = ManningResistance(db, config)
     tabulated_rating_curve = TabulatedRatingCurve(db, config)

core/src/utils.jl

@@ -104,6 +104,7 @@ function create_graph(db::DB, config::Config, chunk_sizes::Vector{Int})::MetaGra
         flow_vertical,
     )
     graph = @set graph.graph_data = graph_data
+
     return graph
 end
 

core/src/validation.jl

@@ -447,7 +447,7 @@ function valid_edges(graph::MetaGraph)::Bool
         if !(type_dst in neighbortypes(type_src))
             errors = true
             edge_id = graph[id_src, id_dst].id
-            @error "Cannot connect a $type_src to a $type_dst (edge #$edge_id from node $id_src to $id_dst)."
+            @error "Cannot connect a $type_src to a $type_dst." edge_id id_src id_dst
         end
     end
     return !errors

core/test/validation_test.jl

@@ -219,8 +219,8 @@ end
     config = Ribasim.Config(toml_path)
     db_path = Ribasim.input_path(config, config.database)
     db = SQLite.DB(db_path)
-    p = Ribasim.Parameters(db, config)
-    (; graph, fractional_flow) = p
+    graph = Ribasim.create_graph(db, config, [1, 1])
+    fractional_flow = Ribasim.FractionalFlow(db, config)
 
     logger = TestLogger()
     with_logger(logger) do
@@ -229,9 +229,10 @@ end
             fractional_flow.node_id,
             fractional_flow.control_mapping,
         )
+        @test !Ribasim.valid_edges(graph)
     end
 
-    @test length(logger.logs) == 3
+    @test length(logger.logs) == 4
     @test logger.logs[1].level == Error
     @test logger.logs[1].message ==
           "Node #7 combines fractional flow outneighbors with other outneigbor types."
@@ -247,6 +248,11 @@ end
     @test logger.logs[3].kwargs[:node_id] == NodeID(7)
     @test logger.logs[3].kwargs[:fraction_sum] ≈ 0.4
     @test logger.logs[3].kwargs[:control_state] == ""
+    @test logger.logs[4].level == Error
+    @test logger.logs[4].message == "Cannot connect a basin to a fractional_flow."
+    @test logger.logs[4].kwargs[:edge_id] == 7
+    @test logger.logs[4].kwargs[:id_src] == NodeID(2)
+    @test logger.logs[4].kwargs[:id_dst] == NodeID(8)
 end
 
 @testitem "DiscreteControl logic validation" begin

python/ribasim_testmodels/ribasim_testmodels/invalid.py

@@ -108,6 +108,7 @@ def invalid_fractional_flow_model():
             (0.0, -2.0),  # 5: Terminal
             (0.0, 2.0),  # 6: Terminal
             (0.0, 0.0),  # 7: TabulatedRatingCurve
+            (-1.0, -1.0),  # 8: FractionalFlow
         ]
     )
     node_xy = gpd.points_from_xy(x=xy[:, 0], y=xy[:, 1])
@@ -120,6 +121,7 @@ def invalid_fractional_flow_model():
         "Terminal",
         "Terminal",
         "TabulatedRatingCurve",
+        "FractionalFlow",
     ]
 
     # Make sure the feature id starts at 1: explicitly give an index.
@@ -134,8 +136,8 @@ def invalid_fractional_flow_model():
 
     # Setup the edges:
     # Invalid: Node #7 combines fractional flow outneighbors with other outneigbor types.
-    from_id = np.array([1, 7, 7, 3, 7, 4], dtype=np.int64)
-    to_id = np.array([7, 2, 3, 5, 4, 6], dtype=np.int64)
+    from_id = np.array([1, 7, 7, 3, 7, 4, 2], dtype=np.int64)
+    to_id = np.array([7, 2, 3, 5, 4, 6, 8], dtype=np.int64)
     lines = node.geometry_from_connectivity(from_id, to_id)
     edge = ribasim.Edge(
         df=gpd.GeoDataFrame(
@@ -177,7 +179,8 @@ def invalid_fractional_flow_model():
     # Setup the fractional flow:
     fractional_flow = ribasim.FractionalFlow(
         # Invalid: fractions must be non-negative and add up to approximately 1
-        static=pd.DataFrame(data={"node_id": [3, 4], "fraction": [-0.1, 0.5]})
+        # Invalid: #8 comes from a Basin
+        static=pd.DataFrame(data={"node_id": [3, 4, 8], "fraction": [-0.1, 0.5, 1.0]})
     )
 
     # Setup the tabulated rating curve: