fix: correct code generation for cases involving multiple dimensions that resolve to same family

models/arrays/arrays_spec.json

@@ -1,5 +1,4 @@
 {
-  "name": "Arrays test model (where the spec file contains Vensim variable names)",
-  "inputVarNames": ["inputA[A1]", "inputA[A2]", "inputA[A3]"],
-  "outputVarNames": ["Time", "a[A1]", "a[A2]", "a[A3]", "f[A1,B1]", "f[A1,B2]", "f[A1,B3]", "h", "ndim4[A3,B3,C3,D4]"]
+  "name": "Arrays test model",
+  "inputVarNames": ["inputA[A1]", "inputA[A2]", "inputA[A3]"]
 }

models/same_family_179/same_family_179.dat

@@ -0,0 +1,132 @@
+FINAL TIME
+0	1
+Fractional Increase[A1,A1]
+0	0
+1	0
+Fractional Increase[A1,A2]
+0	1
+1	1
+Fractional Increase[A1,A3]
+0	1
+1	1
+Fractional Increase[A2,A1]
+0	0
+1	0
+Fractional Increase[A2,A2]
+0	1
+1	1
+Fractional Increase[A2,A3]
+0	0
+1	0
+Fractional Increase[A3,A1]
+0	0
+1	0
+Fractional Increase[A3,A2]
+0	0
+1	0
+Fractional Increase[A3,A3]
+0	1
+1	1
+INITIAL TIME
+0	0
+Intensity[A1]
+0	1000
+Intensity[A2]
+0	1000
+Intensity[A3]
+0	1000
+Intensity[B1]
+0	1000
+Intensity[B2]
+0	1000
+Intensity[B3]
+0	1000
+Intensity Diff[A1,A1]
+0	990
+1	990
+Intensity Diff[A1,A2]
+0	666
+1	666
+Intensity Diff[A1,A3]
+0	666
+1	666
+Intensity Diff[A2,A1]
+0	990
+1	990
+Intensity Diff[A2,A2]
+0	600
+1	600
+Intensity Diff[A2,A3]
+0	666
+1	666
+Intensity Diff[A3,A1]
+0	990
+1	990
+Intensity Diff[A3,A2]
+0	600
+1	600
+Intensity Diff[A3,A3]
+0	100
+1	100
+Intensity Diff[B1,B1]
+0	990
+1	990
+Intensity Diff[B1,B2]
+0	777
+1	777
+Intensity Diff[B1,B3]
+0	777
+1	777
+Intensity Diff[B2,B1]
+0	990
+1	990
+Intensity Diff[B2,B2]
+0	600
+1	600
+Intensity Diff[B2,B3]
+0	777
+1	777
+Intensity Diff[B3,B1]
+0	990
+1	990
+Intensity Diff[B3,B2]
+0	600
+1	600
+Intensity Diff[B3,B3]
+0	100
+1	100
+Other[A1]
+0	10
+Other[A2]
+0	400
+Other[A3]
+0	900
+Other[B1]
+0	10
+Other[B2]
+0	400
+Other[B3]
+0	900
+Rank[A1]
+0	1
+Rank[A2]
+0	2
+Rank[A3]
+0	3
+Rank[B1]
+0	1
+Rank[B2]
+0	2
+Rank[B3]
+0	3
+SAVEPER
+0	1
+1	1
+Something[A1]
+0	100
+Something[A2]
+0	200
+Something[A3]
+0	300
+TIME STEP
+0	1

models/same_family_179/same_family_179.mdl

@@ -0,0 +1,59 @@
+{UTF-8}
+
+DimA: A1, A2, A3
+  ~~|
+DimA' <-> DimA
+  ~~|
+
+DimB: B1, B2, B3
+  ~~|
+DimB' <-> DimB
+  ~~|
+
+DimAB1: A1, B1
+  ~~|
+DimAB2: A2, B2
+  ~~|
+DimAB3: A3, B3
+  ~~|
+
+DimAB: DimAB1, DimAB2, DimAB3
+  ~~|
+
+DimABC: A1, A2, A3, B1, B2, B3, C1, C2, C3
+  ~~|
+
+Rank[DimA] = 1, 2, 3
+  ~~|
+Rank[DimB] = 1, 2, 3
+  ~~|
+
+Intensity[DimAB] = 1000 ~~|
+
+Something[A1] = 100 ~~|
+Something[A2] = 200 ~~|
+Something[A3] = 300 ~~|
+
+Other[DimAB1] = 10 ~~|
+Other[DimAB2] = INITIAL ( Something[A2] * 2 ) ~~|
+Other[DimAB3] = INITIAL ( Something[A3] * 3 ) ~~|
+
+Intensity Diff[DimA,DimA']  =
+  IF THEN ELSE (
+    Rank[DimA] >= Rank[DimA'] ,
+    ABS ( Intensity[DimA] - Other[DimA'] ),
+    666
+  )
+  ~~|
+Intensity Diff[DimB,DimB']  =
+  IF THEN ELSE (
+    Rank[DimB] >= Rank[DimB'] ,
+    ABS ( Intensity[DimB] - Other[DimB'] ),
+    777
+  )
+  ~~|
+
+INITIAL TIME = 0 ~~|
+FINAL TIME = 1 ~~|
+TIME STEP = 1 ~~|
+SAVEPER = TIME STEP ~~|

models/same_family_278/same_family_278.dat

@@ -0,0 +1,67 @@
+FINAL TIME
+0	1
+INITIAL TIME
+0	0
+SAVEPER
+0	1
+1	1
+TIME STEP
+0	1
+U[A1,A1]
+0	106
+1	106
+U[A1,A2]
+0	107
+1	107
+U[A2,A1]
+0	206
+1	206
+U[A2,A2]
+0	207
+1	207
+V[S1,A1,A1]
+0	1101
+1	1101
+V[S1,A1,A2]
+0	1102
+1	1102
+V[S1,A2,A1]
+0	1201
+1	1201
+V[S1,A2,A2]
+0	1202
+1	1202
+V[S2,A1,A1]
+0	2101
+1	2101
+V[S2,A1,A2]
+0	2102
+1	2102
+V[S2,A2,A1]
+0	2201
+1	2201
+V[S2,A2,A2]
+0	2202
+1	2202
+X[A1,A1]
+0	101
+X[A1,A2]
+0	102
+X[A1,A3]
+0	103
+X[A2,A1]
+0	201
+X[A2,A2]
+0	202
+X[A2,A3]
+0	203
+X[A3,A1]
+0	301
+X[A3,A2]
+0	302
+X[A3,A3]
+0	303
+Y[S1]
+0	1000
+Y[S2]
+0	2000

models/same_family_278/same_family_278.mdl

@@ -0,0 +1,47 @@
+{UTF-8}
+
+Scenario : S1, S2
+  ~~|
+
+Sector : A1, A2, A3
+  ~~|
+
+Supplying Sector : A1, A2
+  -> Producing Sector
+  ~~|
+
+Producing Sector : A1, A2
+  -> Supplying Sector
+  ~~|
+
+X[A1,A1] = 101 ~~|
+X[A1,A2] = 102 ~~|
+X[A1,A3] = 103 ~~|
+X[A2,A1] = 201 ~~|
+X[A2,A2] = 202 ~~|
+X[A2,A3] = 203 ~~|
+X[A3,A1] = 301 ~~|
+X[A3,A2] = 302 ~~|
+X[A3,A3] = 303 ~~|
+
+Y[S1] = 1000 ~~|
+Y[S2] = 2000 ~~|
+
+U[Supplying Sector, Producing Sector] =
+  X[Supplying Sector, Producing Sector] + 5
+  ~
+  ~
+  ~ :SUPPLEMENTARY
+  |
+
+V[Scenario, Supplying Sector, Producing Sector] =
+  Y[Scenario] + X[Supplying Sector, Producing Sector]
+  ~
+  ~
+  ~ :SUPPLEMENTARY
+  |
+
+INITIAL TIME = 0 ~~|
+FINAL TIME = 1 ~~|
+TIME STEP = 1 ~~|
+SAVEPER = TIME STEP ~~|