up

Author: TorkelE

src/reactionsystem.jl

@@ -186,8 +186,9 @@ function Reaction(rate, subs, prods, substoich, prodstoich;
         convert.(stoich_type, netstoich) : netstoich
     end
 
-    # Check that all metadata entries are unique.
-    if any(metadata[i] in metadata[i+1:end] for i in eachindex(metadata))
+    # Check that all metadata entries are unique. (cannot use `in` since some entries may be symbolics).
+    if any(any(isequal(metadata[i][1], entry[1]) for entry in metadata[i+1:end]) 
+                                                 for i in eachindex(metadata))
         error("Repeated entries for the same metadata encountered in the following metadata set: $([entry[1] for entry in metadata]).")
     end
 

test/reactionsystem_structure/reactions.jl

@@ -16,10 +16,10 @@ let
     metadata = [:noise_scaling => 0.0]
     r = Reaction(k, [X], [X2], [2], [1]; metadata=metadata)
 
-    @test get_metadata_dict(r) == [:noise_scaling => 0.0]
-    @test has_metadata(r, :noise_scaling)
-    @test !has_metadata(r, :nonexisting_metadata)
-    @test get_metadata(r, :noise_scaling) == 0.0
+    @test Catalyst.get_metadata_dict(r) == [:noise_scaling => 0.0]
+    @test Catalyst.has_metadata(r, :noise_scaling)
+    @test !Catalyst.has_metadata(r, :nonexisting_metadata)
+    @test Catalyst.get_metadata(r, :noise_scaling) == 0.0
 
     metadata_repeated = [:noise_scaling => 0.0, :noise_scaling => 1.0, :metadata_entry => "unused"]
     @test_throws Exception Reaction(k, [X], [X2], [2], [1]; metadata=metadata_repeated)
@@ -36,8 +36,8 @@ let
     r2 = Reaction(k, [X], [X2], [2], [1]; metadata=metadata)
 
     @test isequal(r1, r2)
-    @test get_metadata_dict(r1) == Pair{Symbol,Any}[]
-    @test !has_metadata(r1, :md)
+    @test Catalyst.get_metadata_dict(r1) == Pair{Symbol,Any}[]
+    @test !Catalyst.has_metadata(r1, :md)
 end
 
 # Tests creation.
@@ -57,19 +57,34 @@ let
     push!(metadata, :md_6 => (0.1, 2.0))
     r = Reaction(k, [X], [X2], [2], [1]; metadata=metadata)
 
-    @test get_metadata_dict(r) isa Vector{Pair{Symbol,Any}}
-    @test has_metadata(r, :md_1)
-    @test has_metadata(r, :md_2)
-    @test has_metadata(r, :md_3)
-    @test has_metadata(r, :md_4)
-    @test has_metadata(r, :md_5)
-    @test has_metadata(r, :md_6)
-    @test !has_metadata(r, :md_8)
+    @test Catalyst.get_metadata_dict(r) isa Vector{Pair{Symbol,Any}}
+    @test Catalyst.has_metadata(r, :md_1)
+    @test Catalyst.has_metadata(r, :md_2)
+    @test Catalyst.has_metadata(r, :md_3)
+    @test Catalyst.has_metadata(r, :md_4)
+    @test Catalyst.has_metadata(r, :md_5)
+    @test Catalyst.has_metadata(r, :md_6)
+    @test !Catalyst.has_metadata(r, :md_8)
 
-    @test isequal(get_metadata(r, :md_1), 1.0)
-    @test isequal(get_metadata(r, :md_2), false)
-    @test isequal(get_metadata(r, :md_3), "Hello world")
-    @test isequal(get_metadata(r, :md_4), :sym)
-    @test isequal(get_metadata(r, :md_5), X + X2^k -1)
-    @test isequal(get_metadata(r, :md_6), (0.1, 2.0))
+    @test isequal(Catalyst.get_metadata(r, :md_1), 1.0)
+    @test isequal(Catalyst.get_metadata(r, :md_2), false)
+    @test isequal(Catalyst.get_metadata(r, :md_3), "Hello world")
+    @test isequal(Catalyst.get_metadata(r, :md_4), :sym)
+    @test isequal(Catalyst.get_metadata(r, :md_5), X + X2^k -1)
+    @test isequal(Catalyst.get_metadata(r, :md_6), (0.1, 2.0))
+end
+
+# Noise scaling metadata.
+let
+    @variables t
+    @parameters k η  
+    @species X(t) X2(t)
+
+    metadata = Pair{Symbol,Any}[]
+    push!(metadata, :noise_scaling => η)
+    r1 = Reaction(k, [X], [X2], [2], [1])
+    r2 = Reaction(k, [X], [X2], [2], [1]; metadata=metadata)
+
+    @test isequal(Catalyst.getnoisescaling(r1), 1.0)
+    @test isequal(Catalyst.getnoisescaling(r2), η)
 end