Skip to content
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

Jump to bottom

Run formatting on src projects #5937

Merged
merged 13 commits into from Oct 4, 2021
Merged

Run formatting on src projects #5937

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
71b0e5f
Merge from main repository (#1)
jwood803 Apr 21, 2021
0a2c0a0
Actually merge from main (#2)
jwood803 Apr 26, 2021
00ce635
Merge remote-tracking branch 'upstream/main'
jwood803 Apr 26, 2021
19a50c8
Merge branch 'master' of github.com:jwood803/machinelearning
jwood803 Apr 26, 2021
1db4b63
Merge branch 'dotnet:main' into master
jwood803 Jul 30, 2021
b90da27
Merge branch 'dotnet:main' into master
jwood803 Aug 25, 2021
9a1b402
Merge branch 'dotnet:main' into master
jwood803 Sep 17, 2021
ec4ef33
Initial formatting
jwood803 Sep 17, 2021
61fe667
More formatting
jwood803 Sep 17, 2021
ebc9122
More code formatting
jwood803 Sep 17, 2021
30ecef2
Finish code formatting
jwood803 Sep 17, 2021
b6dd5bc
Merge branch 'main' into src-formatting
jwood803 Oct 1, 2021
4320c8a
Merge branch 'main' into src-formatting
michaelgsharp Oct 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
112 changes: 56 additions & 56 deletions src/Microsoft.Data.Analysis/DataFrame.BinaryOperators.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/DataFrame.cs
View file
Open in desktop
Expand Up @@ -367,7 +367,7 @@ public GroupBy GroupBy(string columnName)
DataFrameColumn column = _columnCollection[columnIndex];
return column.GroupBy(columnIndex, this);
}

/// <summary>
/// Groups the rows of the <see cref="DataFrame"/> by unique values in the <paramref name="columnName"/> column.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/DataFrameColumn.BinaryOperators.cs
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ namespace Microsoft.Data.Analysis
{
public abstract partial class DataFrameColumn
{
#pragma warning disable 1591
#pragma warning disable 1591
public static DataFrameColumn operator +(DataFrameColumn left, DataFrameColumn right)
{
return left.Add(right);
Expand Down
120 changes: 60 additions & 60 deletions src/Microsoft.Data.Analysis/PrimitiveColumnContainer.BinaryOperations.cs
View file
Open in desktop
Expand Up @@ -118,117 +118,117 @@ public PrimitiveColumnContainer<T> RightShift(int value)
return this;
}

public PrimitiveColumnContainer<T> ElementwiseEquals(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseEquals(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseEquals(this, right, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseEquals(T scalar, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseEquals(T scalar, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseEquals(this, scalar, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseNotEquals(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseNotEquals(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseNotEquals(this, right, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseNotEquals(T scalar, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseNotEquals(T scalar, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseNotEquals(this, scalar, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseGreaterThanOrEqual(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseGreaterThanOrEqual(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseGreaterThanOrEqual(this, right, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseGreaterThanOrEqual(T scalar, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseGreaterThanOrEqual(T scalar, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseGreaterThanOrEqual(this, scalar, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseLessThanOrEqual(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseLessThanOrEqual(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseLessThanOrEqual(this, right, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseLessThanOrEqual(T scalar, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseLessThanOrEqual(T scalar, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseLessThanOrEqual(this, scalar, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseGreaterThan(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseGreaterThan(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseGreaterThan(this, right, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseGreaterThan(T scalar, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseGreaterThan(T scalar, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseGreaterThan(this, scalar, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseLessThan(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseLessThan(PrimitiveColumnContainer<T> right, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseLessThan(this, right, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ElementwiseLessThan(T scalar, PrimitiveColumnContainer<bool> ret)
{
public PrimitiveColumnContainer<T> ElementwiseLessThan(T scalar, PrimitiveColumnContainer<bool> ret)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.ElementwiseLessThan(this, scalar, ret);
return this;
}
}

public PrimitiveColumnContainer<T> ReverseAdd(T scalar)
{
public PrimitiveColumnContainer<T> ReverseAdd(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.Add(scalar, this);
return this;
}
public PrimitiveColumnContainer<T> ReverseSubtract(T scalar)
{
}
public PrimitiveColumnContainer<T> ReverseSubtract(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.Subtract(scalar, this);
return this;
}
public PrimitiveColumnContainer<T> ReverseMultiply(T scalar)
{
}
public PrimitiveColumnContainer<T> ReverseMultiply(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.Multiply(scalar, this);
return this;
}
public PrimitiveColumnContainer<T> ReverseDivide(T scalar)
{
}
public PrimitiveColumnContainer<T> ReverseDivide(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.Divide(scalar, this);
return this;
}
public PrimitiveColumnContainer<T> ReverseModulo(T scalar)
{
}
public PrimitiveColumnContainer<T> ReverseModulo(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.Modulo(scalar, this);
return this;
}
public PrimitiveColumnContainer<T> ReverseAnd(T scalar)
{
}
public PrimitiveColumnContainer<T> ReverseAnd(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.And(scalar, this);
return this;
}
public PrimitiveColumnContainer<T> ReverseOr(T scalar)
{
}
public PrimitiveColumnContainer<T> ReverseOr(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.Or(scalar, this);
return this;
}
public PrimitiveColumnContainer<T> ReverseXor(T scalar)
{
}
public PrimitiveColumnContainer<T> ReverseXor(T scalar)
{
PrimitiveDataFrameColumnArithmetic<T>.Instance.Xor(scalar, this);
return this;
}
}
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.Data.Analysis/PrimitiveColumnContainer.cs
View file
Open in desktop
Expand Up @@ -103,7 +103,7 @@ public PrimitiveColumnContainer(ReadOnlyMemory<byte> buffer, ReadOnlyMemory<byte
// Create a new bitMap with all the bits up to length set
var bitMap = new byte[bitMapBufferLength];
bitMap.AsSpan().Fill(255);
int lastByte = 1 << (length - (bitMapBufferLength - 1) * 8);
int lastByte = 1 << (length - (bitMapBufferLength - 1) * 8);
bitMap[bitMapBufferLength - 1] = (byte)(lastByte - 1);
nullDataFrameBuffer = new DataFrameBuffer<byte>(bitMap, bitMapBufferLength);
}
Expand Down