ParTable: getindex() returns NamedTuple

so the downstream code doesn't rely on the order of tuple elements

Author: alyst

src/frontend/specification/ParameterTable.jl

@@ -126,12 +126,12 @@ ParameterTableRow = @NamedTuple begin
 end
 
 Base.getindex(partable::ParameterTable, i::Integer) = (
-    partable.columns[:from][i],
-    partable.columns[:parameter_type][i],
-    partable.columns[:to][i],
-    partable.columns[:free][i],
-    partable.columns[:value_fixed][i],
-    partable.columns[:param][i],
+    from = partable.columns[:from][i],
+    parameter_type = partable.columns[:parameter_type][i],
+    to = partable.columns[:to][i],
+    free = partable.columns[:free][i],
+    value_fixed = partable.columns[:value_fixed][i],
+    param = partable.columns[:param][i],
 )
 
 Base.length(partable::ParameterTable) = length(partable.columns[:param])

src/frontend/specification/RAMMatrices.jl

@@ -172,41 +172,39 @@ function RAMMatrices(
     # handle constants
     constants = Vector{RAMConstant}()
 
-    for i in 1:length(partable)
-        from, parameter_type, to, free, value_fixed, param = partable[i]
-
-        row_ind = positions[to]
-        col_ind = from != Symbol("1") ? positions[from] : nothing
-
-        if !free
-            if (parameter_type == :→) && (from == Symbol("1"))
-                push!(constants, RAMConstant(:M, row_ind, value_fixed))
-            elseif (parameter_type == :→)
+    for r in partable
+        row_ind = positions[r.to]
+        col_ind = r.from != Symbol("1") ? positions[r.from] : nothing
+
+        if !r.free
+            if (r.parameter_type == :→) && (r.from == Symbol("1"))
+                push!(constants, RAMConstant(:M, row_ind, r.value_fixed))
+            elseif r.parameter_type == :→
                 push!(
                     constants,
-                    RAMConstant(:A, CartesianIndex(row_ind, col_ind), value_fixed),
+                    RAMConstant(:A, CartesianIndex(row_ind, col_ind), r.value_fixed),
                 )
-            elseif (parameter_type == :↔)
+            elseif r.parameter_type == :↔
                 push!(
                     constants,
-                    RAMConstant(:S, CartesianIndex(row_ind, col_ind), value_fixed),
+                    RAMConstant(:S, CartesianIndex(row_ind, col_ind), r.value_fixed),
                 )
             else
-                error("Unsupported parameter type: $(parameter_type)")
+                error("Unsupported parameter type: $(r.parameter_type)")
             end
         else
-            par_ind = params_index[param]
-            if (parameter_type == :→) && (from == Symbol("1"))
+            par_ind = params_index[r.param]
+            if (r.parameter_type == :→) && (r.from == Symbol("1"))
                 push!(M_ind[par_ind], row_ind)
-            elseif parameter_type == :→
+            elseif r.parameter_type == :→
                 push!(A_ind[par_ind], row_ind + (col_ind - 1) * n_node)
-            elseif parameter_type == :↔
+            elseif r.parameter_type == :↔
                 push!(S_ind[par_ind], row_ind + (col_ind - 1) * n_node)
                 if row_ind != col_ind
                     push!(S_ind[par_ind], col_ind + (row_ind - 1) * n_node)
                 end
             else
-                error("Unsupported parameter type: $(parameter_type)")
+                error("Unsupported parameter type: $(r.parameter_type)")
             end
         end
     end