Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Shorten names. Implement string columns and computations #2660

Merged
merged 13 commits into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
139 changes: 137 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# EditorConfig is awesome:
http://EditorConfig.org
# editorconfig.org

# top-most EditorConfig file
root = true
Expand All @@ -12,14 +11,150 @@ insert_final_newline = true
indent_style = space
indent_size = 4

[project.json]
indent_size = 2

# C# files
[*.cs]
# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true

# Indentation preferences
csharp_indent_block_contents = true
csharp_indent_braces = false
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = one_less_than_current

# avoid this. unless absolutely necessary
dotnet_style_qualification_for_field = false:suggestion
dotnet_style_qualification_for_property = false:suggestion
dotnet_style_qualification_for_method = false:suggestion
dotnet_style_qualification_for_event = false:suggestion

# only use var when it's obvious what the variable type is
csharp_style_var_for_built_in_types = false:none
csharp_style_var_when_type_is_apparent = false:none
csharp_style_var_elsewhere = false:suggestion

# use language keywords instead of BCL types
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# name all constant fields using PascalCase
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style

dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.required_modifiers = const

dotnet_naming_style.pascal_case_style.capitalization = pascal_case

# static fields should have s_ prefix
dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style

dotnet_naming_symbols.static_fields.applicable_kinds = field
dotnet_naming_symbols.static_fields.required_modifiers = static

dotnet_naming_style.static_prefix_style.required_prefix = s_
dotnet_naming_style.static_prefix_style.capitalization = camel_case

# internal and private fields should be _camelCase
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style

dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal

dotnet_naming_style.camel_case_underscore_style.required_prefix = _
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case

# Code style defaults
dotnet_sort_system_directives_first = true
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false

# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion

# Expression-bodied members
csharp_style_expression_bodied_methods = false:none
csharp_style_expression_bodied_constructors = false:none
csharp_style_expression_bodied_operators = false:none
csharp_style_expression_bodied_properties = true:none
csharp_style_expression_bodied_indexers = true:none
csharp_style_expression_bodied_accessors = true:none

# Pattern matching
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion

# Null checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion

# Space preferences
csharp_space_after_cast = false
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_around_declaration_statements = do_not_ignore
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false

# C++ Files
[*.{cpp,h,in}]
curly_bracket_next_line = true
indent_brace_style = Allman

# Xml project files
[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
indent_size = 2

# Xml build files
[*.builds]
indent_size = 2

# Xml files
[*.{xml,stylecop,resx,ruleset}]
indent_size = 2

# Xml config files
[*.{props,targets,config,nuspec}]
indent_size = 2

# Shell scripts
[*.sh]
end_of_line = lf
[*.{cmd, bat}]
end_of_line = crlf
5 changes: 3 additions & 2 deletions corefxlab.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28810.153
VisualStudioVersion = 16.0.28827.37
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5E7EB061-B9BC-4DA2-B5E5-859AA7C67695}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
global.json = global.json
NuGet.Config = NuGet.Config
EndProjectSection
Expand Down Expand Up @@ -108,7 +109,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Experimenta
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.DataFrame", "src\Microsoft.Data\Microsoft.Data.DataFrame.csproj", "{AD22AAD4-FCB0-4DB4-BC38-AB6ACD153899}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.DataFrame.Tests", "tests\Microsoft.Data.Tests\Microsoft.Data.DataFrame.Tests.csproj", "{485FC567-4AEC-4335-B767-283173F64C42}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Data.DataFrame.Tests", "tests\Microsoft.Data.DataFrame.Tests\Microsoft.Data.DataFrame.Tests.csproj", "{485FC567-4AEC-4335-B767-283173F64C42}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
180 changes: 180 additions & 0 deletions src/Microsoft.Data/BaseColumn.BinaryOperations.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@

// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

// Generated from BaseColumn.BinaryOperations.tt. Do not modify directly

using System;
using System.Collections.Generic;

namespace Microsoft.Data
{
public abstract partial class BaseColumn
{
public virtual BaseColumn Add(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Add<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn Subtract(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Subtract<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn Multiply(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Multiply<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn Divide(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Divide<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn Modulo(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Modulo<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn And(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn And<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn Or(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Or<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn Xor(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Xor<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn LeftShift(int value)
{
throw new NotImplementedException();
}

public virtual BaseColumn RightShift(int value)
{
throw new NotImplementedException();
}

public virtual BaseColumn Equals(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn Equals<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn NotEquals(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn NotEquals<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn GreaterThanOrEqual(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn GreaterThanOrEqual<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn LessThanOrEqual(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn LessThanOrEqual<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn GreaterThan(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn GreaterThan<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

public virtual BaseColumn LessThan(BaseColumn column)
{
throw new NotImplementedException();
}

public virtual BaseColumn LessThan<T>(T value)
where T : unmanaged
{
throw new NotImplementedException();
}

}
}
38 changes: 38 additions & 0 deletions src/Microsoft.Data/BaseColumn.BinaryOperations.tt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<#@ template debug="false" hostspecific="false" language="C#" #>
<#@ assembly name="System.Core" #>
<#@ import namespace="System.Linq" #>
<#@ import namespace="System.Text" #>
<#@ import namespace="System.Collections.Generic" #>
<#@ output extension=".cs" #>
<#@ include file="ColumnArithmeticTemplate.ttinclude"#>
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

// Generated from BaseColumn.BinaryOperations.tt. Do not modify directly

using System;
using System.Collections.Generic;

namespace Microsoft.Data
{
public abstract partial class BaseColumn
{
<# foreach (MethodConfiguration method in methodConfiguration) { #>
<# if (method.MethodType == MethodType.BinaryScalar || method.MethodType == MethodType.ComparisonScalar) { #>
public virtual BaseColumn <#=method.MethodName#><T>(T value)
where T : unmanaged
<# } #>
<# if (method.MethodType == MethodType.Binary || method.MethodType == MethodType.Comparison) {#>
public virtual BaseColumn <#=method.MethodName#>(BaseColumn column)
<# } #>
<# if (method.MethodType == MethodType.BinaryInt ) {#>
public virtual BaseColumn <#=method.MethodName#>(int value)
<# } #>
{
throw new NotImplementedException();
}

<# } #>
}
}
Loading