Merge pull request #284 from isaacsas/jumpproblem-fix

Spatial JumpProblem validation check fix
SciML · Jan 5, 2023 · e7b8752 · e7b8752
2 parents 2afd123 + 32cda2c
commit e7b8752
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/problem.jl b/src/problem.jl
@@ -184,17 +184,15 @@ function JumpProblem(prob, aggregator::AbstractAggregatorAlgorithm, jumps::JumpS
     end
 
     ## Spatial jumps handling
-    if spatial_system !== nothing && hopping_constants !== nothing &&
-       !is_spatial(aggregator)
+    if spatial_system !== nothing && hopping_constants !== nothing
         (num_crjs(jumps) == num_vrjs(jumps) == 0) ||
             error("Spatial aggregators only support MassActionJumps currently.")
-        prob, maj = flatten(maj, prob, spatial_system, hopping_constants; kwargs...)
-    end
 
-    if is_spatial(aggregator)
-        (num_crjs(jumps) == num_vrjs(jumps) == 0) ||
-            error("Spatial aggregators only support MassActionJumps currently.")
-        kwargs = merge((; hopping_constants, spatial_system), kwargs)
+        if is_spatial(aggregator)
+            kwargs = merge((; hopping_constants, spatial_system), kwargs)
+        else
+            prob, maj = flatten(maj, prob, spatial_system, hopping_constants; kwargs...)
+        end
     end
 
     ndiscjumps = get_num_majumps(maj) + num_crjs(jumps)