disallow SymblolicStateIndex{?, Int} for p indexing

when using int to specify the symbol it musst be SymbolicParameterIndex

Author: hexaeder

src/symbolicindexing.jl

@@ -220,6 +220,7 @@ SII.all_symbols(nw::Network) = vcat(SII.all_variable_symbols(nw), SII.parameter_
 ####
 #### variable indexing
 ####
+const POTENTIAL_SCALAR_SIDX = Union{SymbolicStateIndex{<:Union{Symbol,Int},<:Union{Int,Symbol}}}
 function SII.is_variable(nw::Network, sni)
     if _hascolon(sni)
         SII.is_variable(nw, _resolve_colon(nw,sni))
@@ -230,7 +231,7 @@ function SII.is_variable(nw::Network, sni)
     end
 end
 _is_variable(nw::Network, sni) = false
-function _is_variable(nw::Network, sni::SymbolicStateIndex{<:Union{Symbol,Int},<:Union{Int,Symbol}})
+function _is_variable(nw::Network, sni::POTENTIAL_SCALAR_SIDX)
     cf = getcomp(nw, sni)
     return subsym_has_idx(sni.subidx, sym(cf))
 end
@@ -244,7 +245,7 @@ function SII.variable_index(nw::Network, sni)
         _variable_index(nw, sni)
     end
 end
-function _variable_index(nw::Network, sni::SymbolicStateIndex{<:Union{Symbol,Int},<:Union{Int,Symbol}})
+function _variable_index(nw::Network, sni::POTENTIAL_SCALAR_SIDX)
     cf = getcomp(nw, sni)
     range = getcomprange(nw, sni)
     range[subsym_to_idx(sni.subidx, sym(cf))]
@@ -265,6 +266,11 @@ end
 ####
 #### parameter indexing
 ####
+# when using an number instead of symbol only PIndex is valid
+const POTENTIAL_SCALAR_PIDX = Union{
+    SymbolicParameterIndex{<:Union{Symbol,Int},<:Union{Int,Symbol}},
+    SymbolicIndex{<:Union{Symbol,Int},Symbol}
+}
 function SII.is_parameter(nw::Network, sni)
     if _hascolon(sni)
         SII.is_parameter(nw, _resolve_colon(nw,sni))
@@ -275,8 +281,7 @@ function SII.is_parameter(nw::Network, sni)
     end
 end
 _is_parameter(nw::Network, sni) = false
-function _is_parameter(nw::Network,
-                          sni::SymbolicIndex{<:Union{Symbol,Int},<:Union{Int,Symbol}})
+function _is_parameter(nw::Network, sni::POTENTIAL_SCALAR_PIDX)
     cf = getcomp(nw, sni)
     return subsym_has_idx(sni.subidx, psym(cf))
 end
@@ -290,15 +295,14 @@ function SII.parameter_index(nw::Network, sni)
         _parameter_index(nw, sni)
     end
 end
-function _parameter_index(nw::Network,
-                             sni::SymbolicIndex{<:Union{Symbol,Int},<:Union{Int,Symbol}})
+function _parameter_index(nw::Network, sni::POTENTIAL_SCALAR_PIDX)
     cf = getcomp(nw, sni)
     range = getcompprange(nw, sni)
     range[subsym_to_idx(sni.subidx, psym(cf))]
 end
 
 function SII.parameter_symbols(nw::Network)
-    syms = Vector{SymbolicIndex{Int,Symbol}}(undef, pdim(nw))
+    syms = Vector{SymbolicParameterIndex{Int,Symbol}}(undef, pdim(nw))
     for (ci, cf) in pairs(nw.im.vertexm)
         syms[nw.im.v_para[ci]] .= VPIndex.(ci, psym(cf))
     end
@@ -388,7 +392,7 @@ function SII.is_observed(nw::Network, sni)
     end
 end
 _is_observed(nw::Network, _) = false
-function _is_observed(nw::Network, sni::SymbolicStateIndex{<:Union{Symbol,Int},<:Union{Int,Symbol}})
+function _is_observed(nw::Network, sni::SymbolicStateIndex{<:Union{Symbol,Int},Symbol})
     cf = getcomp(nw, sni)
     return sni.subidx ∈ obssym_all(cf)
 end

test/symbolicindexing_test.jl

@@ -103,11 +103,12 @@ _uflat = copy(sol(t))
 _pflat = copy(sol.prob.p)
 s = NWState(nw, _uflat, _pflat)
 
-SII.getu(s, EIndex(1,:e_dst))(s)
-SII.getp(s, VPIndex(1,:M))(s)
+@test SII.getu(s, EIndex(1,:e_dst))(s) == uflat(s)[7]
+@test SII.getp(s, VPIndex(1,:M))(s) ==pflat(s)[1]
+@test SII.getp(s, VIndex(1,:M))(s) ==pflat(s)[1]
 
-SII.is_variable(nw, EIndex(1,:e_dst))
-SII.variable_index(nw, EIndex(1,:e_dst))
+@test SII.is_variable(nw, EIndex(1,:e_dst))
+@test SII.variable_index(nw, EIndex(1,:e_dst)) == 7
 
 @test map(idx->s[idx], SII.variable_symbols(nw)) == _uflat
 @test map(idx->s[idx], SII.parameter_symbols(nw)) == _pflat
@@ -185,10 +186,10 @@ for et in [VIndex, EIndex, VPIndex, EPIndex]
     repr.(et(1,:δ))
 end
 
-@test s[[VIndex(1,1), VPIndex(1,2)]] == [s[VIndex(1,1)], s[VPIndex(1,2)]]
-@test s[(VIndex(1,1), VPIndex(1,2))] == (s[VIndex(1,1)], s[VPIndex(1,2)])
-@test s[[VIndex(1,1), VIndex(1,2)]] == [s[VIndex(1,1)], s[VIndex(1,2)]]
-@test s[(VIndex(1,1), VIndex(1,2))] == (s[VIndex(1,1)], s[VIndex(1,2)])
+@test s[[VIndex(1,1), VPIndex(1,2)]] == [s[VIndex(1,1)], s[VPIndex(1,2)]] == [uflat(s)[1], pflat(s)[2]]
+@test s[(VIndex(1,1), VPIndex(1,2))] == (s[VIndex(1,1)], s[VPIndex(1,2)]) == (uflat(s)[1], pflat(s)[2])
+@test s[[VIndex(1,1), VIndex(1,2)]] == [s[VIndex(1,1)], s[VIndex(1,2)]] == [uflat(s)[1], uflat(s)[2]]
+@test s[(VIndex(1,1), VIndex(1,2))] == (s[VIndex(1,1)], s[VIndex(1,2)]) == (uflat(s)[1], uflat(s)[2])
 
 @test s[VIndex(:,1)] == s[VIndex(1:4,1)]
 @test_broken s[EIndex(:,1)] == s[EIndex(1:6,1)]