Skip to content

Fix DataFrame Null Math #6661

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 6 commits into from
May 8, 2023
Merged

Fix DataFrame Null Math #6661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa92f11
JakeRadMSFT May 6, 2023
e6c8aa0
JakeRadMSFT May 6, 2023
e2d5de7
JakeRadMSFT May 7, 2023
a5618ee
JakeRadMSFT May 7, 2023
b90aa44
JakeRadMSFT May 7, 2023
55f01d3
JakeRadMSFT May 7, 2023
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/Microsoft.Data.Analysis/DataFrame.BinaryOperators.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Microsoft.Data.Analysis
{
public partial class DataFrame
{
#pragma warning disable 1591
#pragma warning disable 1591
<# foreach (MethodConfiguration method in methodConfiguration) { #>
<# if (method.MethodType == MethodType.BinaryScalar) { #>
<# if (method.IsBitwise == true) { #>
Expand All @@ -32,7 +32,7 @@ namespace Microsoft.Data.Analysis
{
return df.<#=method.MethodName#>(value);
}

public static DataFrame operator <#=method.Operator#>(<#=type.TypeName#> value, DataFrame df)
{
return df.Reverse<#=method.MethodName#>(value);
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperators.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace Microsoft.Data.Analysis
{
public abstract partial class DataFrameColumn
{
#pragma warning disable 1591
#pragma warning disable 1591
<# foreach (MethodConfiguration method in methodConfiguration) { #>
<# if (method.MethodType == MethodType.BinaryScalar) { #>
<# if (method.IsBitwise == true) { #>
Expand Down
12 changes: 6 additions & 6 deletions src/Microsoft.Data.Analysis/PrimitiveColumnContainer.BinaryOperations.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ namespace Microsoft.Data.Analysis
{
<# foreach (MethodConfiguration method in methodConfiguration) { #>
<# if (method.MethodType == MethodType.Comparison || method.MethodType == MethodType.ComparisonScalar) { #>
public <#= method.GetSingleArgumentMethodSignature("PrimitiveColumnContainer", "T") #>
{
public <#= method.GetSingleArgumentMethodSignature("PrimitiveColumnContainer", "T") #>
{
<# if (method.MethodType == MethodType.ComparisonScalar ) { #>
PrimitiveDataFrameColumnArithmetic<T>.Instance.<#=method.MethodName#>(this, scalar, ret);
<# } else { #>
PrimitiveDataFrameColumnArithmetic<T>.Instance.<#=method.MethodName#>(this, right, ret);
<# } #>
return this;
}
}

<# } else { #>
public <#= method.GetSingleArgumentMethodSignature("PrimitiveColumnContainer", "T")#>
Expand All @@ -45,11 +45,11 @@ namespace Microsoft.Data.Analysis
<# } #>
<# foreach (MethodConfiguration method in methodConfiguration) { #>
<# if (method.MethodType == MethodType.BinaryScalar) { #>
public PrimitiveColumnContainer<T> Reverse<#=method.MethodName#>(T scalar)
{
public PrimitiveColumnContainer<T> Reverse<#=method.MethodName#>(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.<#=method.MethodName#>(scalar, this);
return this;
}
}
<# } #>
<# } #>
}
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.Analysis/PrimitiveDataFrameColumn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public override double Median()
PrimitiveDataFrameColumn<long> sortIndices = GetAscendingSortIndices(out Int64DataFrameColumn _);
long middle = sortIndices.Length / 2;
double middleValue = (double)Convert.ChangeType(this[sortIndices[middle].Value].Value, typeof(double));
if (Length % 2 == 0)
if (sortIndices.Length % 2 == 0)
{
double otherMiddleValue = (double)Convert.ChangeType(this[sortIndices[middle - 1].Value].Value, typeof(double));
return (middleValue + otherMiddleValue) / 2;
Expand All @@ -243,7 +243,7 @@ public override double Mean()
{
if (Length == 0)
return 0;
return (double)Convert.ChangeType((T)Sum(), typeof(double)) / Length;
return (double)Convert.ChangeType((T)Sum(), typeof(double)) / (Length - NullCount);
}

protected internal override void Resize(long length)
Expand Down
Loading