Merge pull request #20 from ORNL-AMO/fix-chaining

Added '@' syntax for dynamic array formula
ORNL-AMO · Jun 11, 2020 · 279e1bb · 279e1bb
2 parents 74ba6c2 + 1515c4c
commit 279e1bb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/AMO.EnPI-5.0/AMO.EnPI.AddIn/EnPISheet.cs b/AMO.EnPI-5.0/AMO.EnPI.AddIn/EnPISheet.cs
@@ -443,8 +443,8 @@ internal void AddSubtotalColumns()
 
                 //Caclulate Annual Savings
                 string unadjustedTotalColName = ((isSEnPI == false) ? Globals.ThisAddIn.rsc.GetString("unadjustedTotalColName") : Globals.ThisAddIn.rsc.GetString("unadjustedSEPTotalColName"));
-                string before = "OFFSET(INDIRECT(ADDRESS(ROW(), COLUMN())),0,-1,1,1) + ((INDEX(" + SummaryData.Name + ",MATCH(\"" + unadjustedTotalColName + "\"," + SummaryData.Name + "[[ ]],0),COLUMN()-1)-INDEX(" + SummaryData.Name + ",MATCH(\"" + Globals.ThisAddIn.rsc.GetString("totalAdjValuesColName") + "\"," + SummaryData.Name + "[[ ]],0),COLUMN()-1))-(INDEX(" + SummaryData.Name + ",MATCH(\"" + unadjustedTotalColName + "\"," + SummaryData.Name + "[[ ]],0),)-INDEX(" + SummaryData.Name + ",MATCH(\"" + Globals.ThisAddIn.rsc.GetString("totalAdjValuesColName") + "\"," + SummaryData.Name + "[[ ]],0),)))";
-                string after = "INDEX(" + SummaryData.Name + ",MATCH(\"" + Globals.ThisAddIn.rsc.GetString("totalAdjValuesColName") + "\"," + SummaryData.Name + "[[ ]],0),)-INDEX(" + SummaryData.Name + ",MATCH(\"" + unadjustedTotalColName + "\"," + SummaryData.Name + "[[ ]],0),)";
+                string before = "OFFSET(INDIRECT(ADDRESS(ROW(), COLUMN())),0,-1,1,1) + ((@INDEX(" + SummaryData.Name + ",MATCH(\"" + unadjustedTotalColName + "\"," + SummaryData.Name + "[[ ]],0),COLUMN()-1)-@INDEX(" + SummaryData.Name + ",MATCH(\"" + Globals.ThisAddIn.rsc.GetString("totalAdjValuesColName") + "\"," + SummaryData.Name + "[[ ]],0),COLUMN()-1))-(@INDEX(" + SummaryData.Name + ",MATCH(\"" + unadjustedTotalColName + "\"," + SummaryData.Name + "[[ ]],0),)-@INDEX(" + SummaryData.Name + ",MATCH(\"" + Globals.ThisAddIn.rsc.GetString("totalAdjValuesColName") + "\"," + SummaryData.Name + "[[ ]],0),)))";
+                string after = "@INDEX(" + SummaryData.Name + ",MATCH(\"" + Globals.ThisAddIn.rsc.GetString("totalAdjValuesColName") + "\"," + SummaryData.Name + "[[ ]],0),)-@INDEX(" + SummaryData.Name + ",MATCH(\"" + unadjustedTotalColName + "\"," + SummaryData.Name + "[[ ]],0),)";
                 Excel.ListRow annualSavingsRow = SummaryData.ListRows.Add(System.Type.Missing);
                 if (modelIndex.Equals(2) || modelIndex.Equals(SummaryData.ListColumns.Count))
                     annualSavingsRow.Range.Formula = VaryingRowFormula(modelIndex, annualSavingsRow, before, after);