Skip to content

Commit c8de339

Browse files
JolanrensenJolanrensen
committed
bumping ktlint engine version to 1.4.1, disabled new when-entry-bracing rule as it was a bit too aggressive
1 parent 05e0993 commit c8de339

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

‎.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_e
3232
ktlint_standard_chain-method-continuation = disabled
3333
ktlint_ignore_back_ticked_identifier = true
3434
ktlint_standard_multiline-expression-wrapping = disabled
35+
ktlint_standard_when-entry-bracing = disabled
3536

3637
[{*/build/**/*,**/*keywords*/**,**/*.Generated.kt,**/*$Extensions.kt}]
3738
ktlint = disabled

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ allprojects {
153153
afterEvaluate {
154154
try {
155155
configure<KtlintExtension> {
156-
version = "1.3.0"
156+
version = "1.4.1"
157157
// rules are set up through .editorconfig
158158
}
159159
} catch (_: UnknownDomainObjectException) {

‎core/api/core.api

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2691,7 +2691,7 @@ public abstract interface class org/jetbrains/kotlinx/dataframe/api/ColumnDescri
26912691
public abstract fun getPath ()Lorg/jetbrains/kotlinx/dataframe/columns/ColumnPath;
26922692
public abstract fun getStd ()D
26932693
public abstract fun getTop ()Ljava/lang/Object;
2694-
public abstract fun getType ()Lkotlin/reflect/KType;
2694+
public abstract fun getType ()Ljava/lang/String;
26952695
public abstract fun getUnique ()I
26962696
}
26972697

@@ -2719,7 +2719,7 @@ public final class org/jetbrains/kotlinx/dataframe/api/ColumnDescription_Extensi
27192719
public static final fun ColumnDescription_top (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
27202720
public static final fun ColumnDescription_top (Lorg/jetbrains/kotlinx/dataframe/DataRow;)Ljava/lang/Object;
27212721
public static final fun ColumnDescription_type (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
2722-
public static final fun ColumnDescription_type (Lorg/jetbrains/kotlinx/dataframe/DataRow;)Lkotlin/reflect/KType;
2722+
public static final fun ColumnDescription_type (Lorg/jetbrains/kotlinx/dataframe/DataRow;)Ljava/lang/String;
27232723
public static final fun ColumnDescription_unique (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
27242724
public static final fun ColumnDescription_unique (Lorg/jetbrains/kotlinx/dataframe/DataRow;)I
27252725
public static final fun NullableColumnDescription_count (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
@@ -2745,7 +2745,7 @@ public final class org/jetbrains/kotlinx/dataframe/api/ColumnDescription_Extensi
27452745
public static final fun NullableColumnDescription_top (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
27462746
public static final fun NullableColumnDescription_top (Lorg/jetbrains/kotlinx/dataframe/DataRow;)Ljava/lang/Object;
27472747
public static final fun NullableColumnDescription_type (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
2748-
public static final fun NullableColumnDescription_type (Lorg/jetbrains/kotlinx/dataframe/DataRow;)Lkotlin/reflect/KType;
2748+
public static final fun NullableColumnDescription_type (Lorg/jetbrains/kotlinx/dataframe/DataRow;)Ljava/lang/String;
27492749
public static final fun NullableColumnDescription_unique (Lorg/jetbrains/kotlinx/dataframe/ColumnsContainer;)Lorg/jetbrains/kotlinx/dataframe/DataColumn;
27502750
public static final fun NullableColumnDescription_unique (Lorg/jetbrains/kotlinx/dataframe/DataRow;)Ljava/lang/Integer;
27512751
}
@@ -4146,9 +4146,11 @@ public final class org/jetbrains/kotlinx/dataframe/api/DataColumnArithmeticsKt {
41464146
}
41474147

41484148
public final class org/jetbrains/kotlinx/dataframe/api/DataColumnTypeKt {
4149+
public static final fun isBigNumber (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
41494150
public static final fun isColumnGroup (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
41504151
public static final fun isComparable (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
41514152
public static final fun isFrameColumn (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
4153+
public static final fun isInterComparable (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
41524154
public static final fun isList (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
41534155
public static final fun isNumber (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
41544156
public static final fun isPrimitive (Lorg/jetbrains/kotlinx/dataframe/DataColumn;)Z
@@ -10771,6 +10773,7 @@ public final class org/jetbrains/kotlinx/dataframe/math/BasicStats {
1077110773

1077210774
public final class org/jetbrains/kotlinx/dataframe/math/MeanKt {
1077310775
public static final fun bigDecimalMean (Ljava/lang/Iterable;)D
10776+
public static final fun bigIntegerMean (Ljava/lang/Iterable;)D
1077410777
public static final fun byteMean (Ljava/lang/Iterable;)D
1077510778
public static final fun doubleMean (Ljava/lang/Iterable;Z)D
1077610779
public static synthetic fun doubleMean$default (Ljava/lang/Iterable;ZILjava/lang/Object;)D
@@ -10794,6 +10797,8 @@ public final class org/jetbrains/kotlinx/dataframe/math/MedianKt {
1079410797
public final class org/jetbrains/kotlinx/dataframe/math/StdKt {
1079510798
public static final fun bigDecimalStd (Ljava/lang/Iterable;I)D
1079610799
public static synthetic fun bigDecimalStd$default (Ljava/lang/Iterable;IILjava/lang/Object;)D
10800+
public static final fun bigIntegerStd (Ljava/lang/Iterable;I)D
10801+
public static synthetic fun bigIntegerStd$default (Ljava/lang/Iterable;IILjava/lang/Object;)D
1079710802
public static final fun doubleStd (Ljava/lang/Iterable;ZI)D
1079810803
public static synthetic fun doubleStd$default (Ljava/lang/Iterable;ZIILjava/lang/Object;)D
1079910804
public static final fun floatStd (Ljava/lang/Iterable;ZI)D
@@ -10808,6 +10813,7 @@ public final class org/jetbrains/kotlinx/dataframe/math/StdKt {
1080810813

1080910814
public final class org/jetbrains/kotlinx/dataframe/math/StdMeanKt {
1081010815
public static final fun bigDecimalVarianceAndMean (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
10816+
public static final fun bigIntegerVarianceAndMean (Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
1081110817
public static final fun doubleVarianceAndMean (Ljava/lang/Iterable;Z)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
1081210818
public static synthetic fun doubleVarianceAndMean$default (Ljava/lang/Iterable;ZILjava/lang/Object;)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
1081310819
public static final fun floatVarianceAndMean (Ljava/lang/Iterable;Z)Lorg/jetbrains/kotlinx/dataframe/math/BasicStats;
@@ -10818,8 +10824,10 @@ public final class org/jetbrains/kotlinx/dataframe/math/StdMeanKt {
1081810824

1081910825
public final class org/jetbrains/kotlinx/dataframe/math/SumKt {
1082010826
public static final fun sum (Ljava/lang/Iterable;)Ljava/math/BigDecimal;
10827+
public static final fun sum (Ljava/lang/Iterable;)Ljava/math/BigInteger;
1082110828
public static final fun sum (Ljava/lang/Iterable;Lkotlin/reflect/KType;)Ljava/lang/Number;
1082210829
public static final fun sum (Lkotlin/sequences/Sequence;)Ljava/math/BigDecimal;
10830+
public static final fun sum (Lkotlin/sequences/Sequence;)Ljava/math/BigInteger;
1082310831
public static final fun sumNullableT (Ljava/lang/Iterable;Lkotlin/reflect/KType;)Ljava/lang/Number;
1082410832
public static final fun sumOf (Ljava/lang/Iterable;Lkotlin/reflect/KType;Lkotlin/jvm/functions/Function1;)Ljava/lang/Number;
1082510833
}

‎core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/math/mean.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import kotlin.reflect.full.withNullability
1111
internal fun <T : Number> Iterable<T>.mean(type: KType, skipNA: Boolean = skipNA_default): Double =
1212
asSequence().mean(type, skipNA)
1313

14+
@Suppress("UNCHECKED_CAST")
1415
internal fun <T : Number> Sequence<T>.mean(type: KType, skipNA: Boolean = skipNA_default): Double {
1516
if (type.isMarkedNullable) {
1617
return filterNotNull().mean(type.withNullability(false), skipNA)

‎core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/statistics/sum.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,4 @@ class SumTests {
6161
df.sum { value2 } shouldBe expected2
6262
df.sum { value3 } shouldBe expected3
6363
}
64-
65-
6664
}

0 commit comments

Comments
 (0)