Skip to content

Fixes issue 2101 #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2025
Merged

Fixes issue 2101 #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/EPPlus/FormulaParsing/Excel/Functions/MathFunctions/AverageIf.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ public override void GetNewParameterAddress(IList<CompileResult> args, int index
{
if (index == 2)
{
if (args[0].Result is IRangeInfo rangeInfo)
if (args[0].Result is IRangeInfo rangeInfo && args[2].Result is IRangeInfo valueRange)
{
var rv = new RangeOrValue { Range = rangeInfo };
var mi = GetMatchIndexes(rv, args[1].Result, null);
addresses = EnqueueMatchingAddresses(args[2].Address, mi);
addresses = EnqueueMatchingAddresses(valueRange, mi);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/EPPlus/FormulaParsing/Excel/Functions/MathFunctions/AverageIfs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ internal class AverageIfs : RangeCriteriaFunction
}));
public override void GetNewParameterAddress(IList<CompileResult> args, int index, ref Queue<FormulaRangeAddress> addresses)
{
if (index == 0)
if (index == 0 && args[0].Result is IRangeInfo valueRange)
{
IEnumerable<int> matchIndexes = GetMatchingIndicesFromArguments(1, args);
addresses = EnqueueMatchingAddresses(args[0].Address, matchIndexes);
addresses = EnqueueMatchingAddresses(valueRange, matchIndexes);
}
}
public override CompileResult Execute(IList<FunctionArgument> arguments, ParsingContext context)
Expand Down
3 changes: 2 additions & 1 deletion src/EPPlus/FormulaParsing/Excel/Functions/MathFunctions/RangeCriteriaFunction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,11 @@ protected List<int> GetMatchIndexes(RangeOrValue rangeOrValue, object searched,
}
return result;
}
protected static Queue<FormulaRangeAddress> EnqueueMatchingAddresses(FormulaRangeAddress valueAddress, IEnumerable<int> matchIndexes)
protected static Queue<FormulaRangeAddress> EnqueueMatchingAddresses(IRangeInfo valueRange, IEnumerable<int> matchIndexes)
{
Queue<FormulaRangeAddress> addresses = new Queue<FormulaRangeAddress>();
var pIx = int.MinValue;
var valueAddress = valueRange.GetAddressDimensionAdjusted(0);
var extRef = valueAddress.ExternalReferenceIx;
var wsIx = valueAddress.WorksheetIx;
FormulaRangeAddress currentAddress=null;
Expand Down
6 changes: 3 additions & 3 deletions src/EPPlus/FormulaParsing/Excel/Functions/MathFunctions/SumIf.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ public override void GetNewParameterAddress(IList<CompileResult> args, int index
{
if(index == 2)
{
if (args[0].Result is IRangeInfo rangeInfo)
if (args[0].Result is IRangeInfo criteriaRange && args[2].Result is IRangeInfo valueRange)
{
var rv = new RangeOrValue { Range = rangeInfo };
var rv = new RangeOrValue { Range = criteriaRange };
var mi=GetMatchIndexes(rv, args[1].Result, null);
addresses = EnqueueMatchingAddresses(args[2].Address, mi);
addresses = EnqueueMatchingAddresses(valueRange, mi);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/EPPlus/FormulaParsing/Excel/Functions/MathFunctions/SumIfs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public override void ConfigureArrayBehaviour(ArrayBehaviourConfig config)
}));
public override void GetNewParameterAddress(IList<CompileResult> args, int index, ref Queue<FormulaRangeAddress> addresses)
{
if (index == 0)
if (index == 0 && args[0].Result is IRangeInfo valueRange)
{
IEnumerable<int> matchIndexes = GetMatchingIndicesFromArguments(1, args);
addresses = EnqueueMatchingAddresses(args[0].Address, matchIndexes);
addresses = EnqueueMatchingAddresses(valueRange, matchIndexes);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/EPPlus/FormulaParsing/Ranges/RangeInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ public FormulaRangeAddress GetAddressDimensionAdjusted(int index=0)
if (d._fromRow > a.FromRow || d._toRow < a.ToRow ||
d._fromCol > a.FromCol || d._toCol < a.ToCol)
{
return new FormulaRangeAddress(null, 0,
return new FormulaRangeAddress(null, a.WorksheetIx,
Math.Max(d._fromRow, a.FromRow),
Math.Max(d._fromCol, a.FromCol),
Math.Min(d._toRow, a.ToRow),
Expand Down
33 changes: 33 additions & 0 deletions src/EPPlusTest/FormulaParsing/Excel/Functions/SumIfTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,38 @@ public void ShouldHandleCriteriasInArray()
Assert.AreEqual(3d, sheet.Cells["A5"].Value);
}
}
[TestMethod]
public void CriteriaShouldHandleCircularReferencesOnOtherSheets()
{
using (var package = new ExcelPackage())
{
var sheet1 = package.Workbook.Worksheets.Add("Sheet1");
sheet1.Cells["A5"].Value = 1;
sheet1.Cells["A6"].Value = 2;
sheet1.Cells["A7"].Value = 3;
sheet1.Cells["A8"].Value = 3;
sheet1.Cells["A9"].Value = 3;

var sheet2 = package.Workbook.Worksheets.Add("Sheet2");

sheet2.Cells["B5"].Formula = "sheet1!A5";
sheet2.Cells["B6"].Formula = "sheet1!A6";
sheet2.Cells["B7"].Formula = "sheet1!A7";
sheet2.Cells["B8"].Formula = "sheet1!A8";
sheet2.Cells["B9"].Formula = "sheet1!A9";

sheet2.Cells["C5"].Value = 10;
sheet2.Cells["C6"].Value = 20;
sheet2.Cells["C7"].Value = 30;
sheet2.Cells["C8"].Value = 10;
sheet2.Cells["C9"].Value = 1;

sheet2.Cells["D10"].Formula = "Sumif(C5:C9,\">10\",B5:B9)";

package.Workbook.Calculate();

Assert.AreEqual(5D, sheet2.Cells["D10"].Value);
}
}
}
}
9 changes: 9 additions & 0 deletions src/EPPlusTest/Issues/FormulaCalculationIssues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,6 +1298,15 @@ public void TestNames()
SaveAndCleanup(origPck);
}
}
[TestMethod]
public void s927()
{
using var p = OpenTemplatePackage("s927.xlsx");
//using var p = OpenTemplatePackage("s927 - Calced.xlsx");
var ws = p.Workbook.Worksheets["Calculation sheet"];
ws.Calculate();
Assert.AreEqual(938643.13, ws.Cells["H10"].Value);
}
}
}